Use new Default:: methods

meshtastic · Mar 21, 2024 · 952b757 · 952b757
1 parent d6a1fc7
commit 952b757
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp
@@ -195,10 +195,10 @@ MQTT::MQTT() : concurrency::OSThread("mqtt"), mqttQueue(MAX_MQTT_QUEUE)
         }
 
         if (moduleConfig.mqtt.map_reporting_enabled && moduleConfig.mqtt.has_map_report_settings) {
-            if (moduleConfig.mqtt.map_report_settings.position_precision > 0)
-                map_position_precision = moduleConfig.mqtt.map_report_settings.position_precision;
-            if (moduleConfig.mqtt.map_report_settings.publish_interval_secs > 0)
-                map_publish_interval_secs = moduleConfig.mqtt.map_report_settings.publish_interval_secs;
+            map_position_precision = Default::getConfiguredOrDefault(moduleConfig.mqtt.map_report_settings.position_precision,
+                                                                     default_map_position_precision);
+            map_publish_interval_msecs = Default::getConfiguredOrDefaultMs(
+                moduleConfig.mqtt.map_report_settings.publish_interval_secs, default_map_publish_interval_secs);
         }
 
 #ifdef HAS_NETWORKING
@@ -542,7 +542,7 @@ void MQTT::perhapsReportToMap()
     if (!moduleConfig.mqtt.map_reporting_enabled || !(moduleConfig.mqtt.proxy_to_client_enabled || isConnectedDirectly()))
         return;
 
-    if (millis() - last_report_to_map < map_publish_interval_secs * 1000) {
+    if (millis() - last_report_to_map < map_publish_interval_msecs) {
         return;
     } else {
         if (map_position_precision == 0 || (localPosition.latitude_i == 0 && localPosition.longitude_i == 0)) {

diff --git a/src/mqtt/MQTT.h b/src/mqtt/MQTT.h
@@ -89,9 +89,11 @@ class MQTT : private concurrency::OSThread
     std::string mapTopic = "/2/map/";     // For protobuf-encoded MapReport messages
 
     // For map reporting (only applies when enabled)
+    const uint32_t default_map_position_precision = 14;         // defaults to max. offset of ~1459m
+    const uint32_t default_map_publish_interval_secs = 60 * 15; // defaults to 15 minutes
     uint32_t last_report_to_map = 0;
-    uint32_t map_position_precision = 14;         // defaults to max. offset of ~1459m
-    uint32_t map_publish_interval_secs = 60 * 15; // defaults to 15 minutes
+    uint32_t map_position_precision = default_map_position_precision;
+    uint32_t map_publish_interval_msecs = default_map_publish_interval_secs * 1000;
 
     /** return true if we have a channel that wants uplink/downlink or map reporting is enabled
      */