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

Removed magic numbers

Browse Source
This commit is contained in:
ford-jones 2025-10-02 10:24:32 +13:00
parent dae9b1c024
commit f82667d71e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/draw/MenuHandler.cpp
View File

@ -145,11 +145,11 @@ void menuHandler::LoraRegionPicker(uint32_t duration)
config.lora.ignore_mqtt = true; // Ignore MQTT by default if region has a duty cycle limit config.lora.ignore_mqtt = true; // Ignore MQTT by default if region has a duty cycle limit
} }
if (strncmp(moduleConfig.mqtt.root, default_mqtt_root, 3) == 0) { if (strncmp(moduleConfig.mqtt.root, default_mqtt_root, strlen(default_mqtt_root)) == 0) {
// Default broker is in use, so subscribe to the appropriate MQTT root topic for this region // Default broker is in use, so subscribe to the appropriate MQTT root topic for this region
sprintf(moduleConfig.mqtt.root, "%s/%s", default_mqtt_root, myRegion->name); sprintf(moduleConfig.mqtt.root, "%s/%s", default_mqtt_root, myRegion->name);
changes |= SEGMENT_MODULECONFIG; changes |= SEGMENT_MODULECONFIG;
}; }
service->reloadConfig(changes); service->reloadConfig(changes);
rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000); rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);

4
src/modules/AdminModule.cpp
View File

@ -776,8 +776,8 @@ 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();
if (strncmp(moduleConfig.mqtt.root, default_mqtt_root, 3) == 0) { if (strncmp(moduleConfig.mqtt.root, default_mqtt_root, strlen(default_mqtt_root)) == 0) {
// Default broker is in use, so subscribe to the appropriate MQTT root topic for this region // Default root is in use, so subscribe to the appropriate MQTT topic for this region
sprintf(moduleConfig.mqtt.root, "%s/%s", default_mqtt_root, myRegion->name); sprintf(moduleConfig.mqtt.root, "%s/%s", default_mqtt_root, myRegion->name);
} }