kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Assume previous root on topic change

Browse Source
This commit is contained in:
ford-jones
2025-10-01 11:14:27 +13:00
parent ee8fa9f328
commit 69c61f8247
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/AdminModule.cpp
+11 -6
View File
@@ -775,12 +775,17 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
// Additionally as a side-effect, assume a new value under myRegion // Additionally as a side-effect, assume a new value under myRegion
initRegion(); initRegion();
// subscribe to appropriate MQTT root topic for this region std::string current = moduleConfig.mqtt.root;
#ifdef USERPREFS_MQTT_ROOT_TOPIC size_t location = current.find_first_of('/');
sprintf(moduleConfig.mqtt.root, "%s/%s", USERPREFS_MQTT_ROOT_TOPIC, myRegion->name);
#else char root[location + 1];
sprintf(moduleConfig.mqtt.root, "%s/%s", default_mqtt_root, myRegion->name); memset(root, 0, location);
#endif memcpy(root, moduleConfig.mqtt.root, location);
root[location] = '\0';
// subscribe to the appropriate MQTT root topic for this region
sprintf(moduleConfig.mqtt.root, "%s/%s", root, myRegion->name);
changes = SEGMENT_CONFIG | SEGMENT_MODULECONFIG; changes = SEGMENT_CONFIG | SEGMENT_MODULECONFIG;
} }
break; break;