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

Merge branch 'master' into esp-idf5

Browse Source
This commit is contained in:
Mike 2025-03-28 16:25:19 +03:00 committed by GitHub
commit bfef356c9b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesh/Channels.cpp
View File

@ -347,7 +347,7 @@ bool Channels::anyMqttEnabled()
{ {
#if USERPREFS_EVENT_MODE #if USERPREFS_EVENT_MODE
// Don't publish messages on the public MQTT broker if we are in event mode // Don't publish messages on the public MQTT broker if we are in event mode
if (mqtt && mqtt.isUsingDefaultServer()) { if (mqtt && mqtt->isUsingDefaultServer()) {
return false; return false;
} }
#endif #endif

2
src/platform/nrf52/architecture.h
View File

@ -75,6 +75,8 @@
#define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW #define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW
#elif defined(HELTEC_T114) #elif defined(HELTEC_T114)
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_NODE_T114 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_NODE_T114
#elif defined(MESHLINK)
#define HW_VENDOR meshtastic_HardwareModel_MESHLINK
#elif defined(SEEED_XIAO_NRF52840_KIT) #elif defined(SEEED_XIAO_NRF52840_KIT)
#define HW_VENDOR meshtastic_HardwareModel_XIAO_NRF52_KIT #define HW_VENDOR meshtastic_HardwareModel_XIAO_NRF52_KIT
#else #else