Merge branch 'master' into 2.5-changes

meshtastic · Aug 19, 2024 · 48dc222 · 48dc222
2 parents ab9268c + 6de3ca4
commit 48dc222
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/modules/NeighborInfoModule.cpp b/src/modules/NeighborInfoModule.cpp
@@ -120,7 +120,7 @@ int32_t NeighborInfoModule::runOnce()
     if (airTime->isTxAllowedChannelUtil(true) && airTime->isTxAllowedAirUtil()) {
         sendNeighborInfo(NODENUM_BROADCAST, false);
     }
-    return Default::getConfiguredOrDefault(moduleConfig.neighbor_info.update_interval, default_neighbor_info_broadcast_secs);
+    return Default::getConfiguredOrDefaultMs(moduleConfig.neighbor_info.update_interval, default_neighbor_info_broadcast_secs);
 }
 
 /*

diff --git a/src/modules/Telemetry/Sensor/OPT3001Sensor.cpp b/src/modules/Telemetry/Sensor/OPT3001Sensor.cpp
@@ -25,10 +25,10 @@ void OPT3001Sensor::setup()
 {
     OPT3001_Config newConfig;
 
-    newConfig.RangeNumber = B1100;
-    newConfig.ConvertionTime = B0;
-    newConfig.Latch = B1;
-    newConfig.ModeOfConversionOperation = B11;
+    newConfig.RangeNumber = 0b1100;
+    newConfig.ConvertionTime = 0b0;
+    newConfig.Latch = 0b1;
+    newConfig.ModeOfConversionOperation = 0b11;
 
     OPT3001_ErrorCode errorConfig = opt3001.writeConfig(newConfig);
     if (errorConfig != NO_ERROR) {