Merge branch 'develop' into nrf52-power-saving-1

This commit is contained in:
Ben Meadors
2025-12-04 07:16:47 -06:00
committed by GitHub
88 changed files with 977 additions and 147 deletions

View File

@@ -101,8 +101,6 @@
#define HW_VENDOR meshtastic_HardwareModel_T_WATCH_S3
#elif defined(GENIEBLOCKS)
#define HW_VENDOR meshtastic_HardwareModel_GENIEBLOCKS
#elif defined(PRIVATE_HW)
#define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW
#elif defined(NANO_G1)
#define HW_VENDOR meshtastic_HardwareModel_NANO_G1
#elif defined(M5STACK)
@@ -205,6 +203,8 @@
#define HW_VENDOR meshtastic_HardwareModel_M5STACK_C6L
#elif defined(HELTEC_WIRELESS_TRACKER_V2)
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_WIRELESS_TRACKER_V2
#else
#define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW
#endif
// -----------------------------------------------------------------------------