pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-10-03 13:55:45 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Modification conflict

Browse Source
This commit is contained in:
Junhuang 2024-08-22 17:28:05 +08:00
parent 81d087162d
commit c1a0546575
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.cpp
View File

@ -111,6 +111,10 @@ AccelerometerThread *accelerometerThread = nullptr;
#include "AudioThread.h" #include "AudioThread.h"
AudioThread *audioThread = nullptr; AudioThread *audioThread = nullptr;
#endif #endif
#if defined(M5STACK_COREBASIC) #if defined(M5STACK_COREBASIC)
#include <M5Unified.h> #include <M5Unified.h>
#endif #endif

4
src/mesh/generated/meshtastic/mesh.pb.h
View File

@ -187,8 +187,10 @@ typedef enum _meshtastic_HardwareModel {
/* RadioMaster 900 Bandit, https://www.radiomasterrc.com/products/bandit-expresslrs-rf-module /* RadioMaster 900 Bandit, https://www.radiomasterrc.com/products/bandit-expresslrs-rf-module
SSD1306 OLED and No GPS */ SSD1306 OLED and No GPS */
meshtastic_HardwareModel_RADIOMASTER_900_BANDIT = 74, meshtastic_HardwareModel_RADIOMASTER_900_BANDIT = 74,
/* M5 esp32 based MCU modules with enclosure, TFT and LORA Shields. All Variants (Basic, Core, Fire, Core2, Paper) https://m5stack.com/ */ /* M5 esp32 based MCU modules with enclosure, TFT and LORA Shields. All Variants (Basic, Core, Fire, Core2, Paper) https://m5stack.com/ */
meshtastic_HardwareModel_M5STACK_COREBASIC=75, meshtastic_HardwareModel_M5STACK_COREBASIC=76,
/* ------------------------------------------------------------------------------------------------------------------------------------------ /* ------------------------------------------------------------------------------------------------------------------------------------------
Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits. Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
------------------------------------------------------------------------------------------------------------------------------------------ */ ------------------------------------------------------------------------------------------------------------------------------------------ */