Fix braces and remove unused now variables.

There was a brace in src/mesh/RadioLibInterface.cpp that was breaking compile on some architectures. Additionally, there were some brace errors in src/modules/Telemetry/AirQualityTelemetry.cpp src/modules/Telemetry/EnvironmentTelemetry.cpp src/mesh/wifi/WiFiAPClient.cpp Move throttle include in WifiAPClient.cpp to top. Add Default.h to sleep.cpp rest of files just remove unused now variables.
meshtastic · Sep 23, 2024 · d2e32d9 · d2e32d9
1 parent 6ad7510
commit d2e32d9
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 44 deletions.
diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp
@@ -1421,7 +1421,6 @@ bool GPS::lookForTime()
 
 #ifdef GNSS_AIROHA
     uint8_t fix = reader.fixQuality();
-    uint32_t now = millis();
     if (fix > 0) {
         if (lastFixStartMsec > 0) {
             if (Throttle::isWithinTimespanMs(lastFixStartMsec, GPS_FIX_HOLD_TIME)) {
@@ -1430,7 +1429,7 @@ bool GPS::lookForTime()
                 clearBuffer();
             }
         } else {
-            lastFixStartMsec = now;
+            lastFixStartMsec = millis();
             return false;
         }
     } else {
@@ -1474,7 +1473,6 @@ bool GPS::lookForLocation()
 #ifdef GNSS_AIROHA
     if ((config.position.gps_update_interval * 1000) >= (GPS_FIX_HOLD_TIME * 2)) {
         uint8_t fix = reader.fixQuality();
-        uint32_t now = millis();
         if (fix > 0) {
             if (lastFixStartMsec > 0) {
                 if (Throttle::isWithinTimespanMs(lastFixStartMsec, GPS_FIX_HOLD_TIME)) {
@@ -1483,7 +1481,7 @@ bool GPS::lookForLocation()
                     clearBuffer();
                 }
             } else {
-                lastFixStartMsec = now;
+                lastFixStartMsec = millis();
                 return false;
             }
         } else {
@@ -1713,4 +1711,4 @@ void GPS::toggleGpsMode()
         enable();
     }
 }
-#endif // Exclude GPS
+#endif // Exclude GPS
diff --git a/src/graphics/EInkDynamicDisplay.cpp b/src/graphics/EInkDynamicDisplay.cpp
@@ -232,10 +232,8 @@ void EInkDynamicDisplay::checkForPromotion()
 // Is it too soon for another frame of this type?
 void EInkDynamicDisplay::checkRateLimiting()
 {
-    uint32_t now = millis();
-
     // Sanity check: millis() overflow - just let the update run..
-    if (previousRunMs > now)
+    if (previousRunMs > millis())
         return;
 
     // Skip update: too soon for BACKGROUND

diff --git a/src/input/ExpressLRSFiveWay.cpp b/src/input/ExpressLRSFiveWay.cpp
@@ -1,4 +1,3 @@
-
 #include "ExpressLRSFiveWay.h"
 #include "Throttle.h"
 
@@ -77,11 +76,10 @@ void ExpressLRSFiveWay::update(int *keyValue, bool *keyLongPressed)
     *keyValue = NO_PRESS;
 
     int newKey = readKey();
-    uint32_t now = millis();
     if (keyInProcess == NO_PRESS) {
         // New key down
         if (newKey != NO_PRESS) {
-            keyDownStart = now;
+            keyDownStart = millis();
             // DBGLN("down=%u", newKey);
         }
     } else {

diff --git a/src/mesh/LR11x0Interface.cpp b/src/mesh/LR11x0Interface.cpp
@@ -277,9 +277,8 @@ template <typename T> bool LR11x0Interface<T>::isActivelyReceiving()
     bool detected = (irq & (RADIOLIB_LR11X0_IRQ_SYNC_WORD_HEADER_VALID | RADIOLIB_LR11X0_IRQ_PREAMBLE_DETECTED));
     // Handle false detections
     if (detected) {
-        uint32_t now = millis();
         if (!activeReceiveStart) {
-            activeReceiveStart = now;
+            activeReceiveStart = millis();
         } else if (!Throttle::isWithinTimespanMs(activeReceiveStart, 2 * preambleTimeMsec) &&
                    !(irq & RADIOLIB_LR11X0_IRQ_SYNC_WORD_HEADER_VALID)) {
             // The HEADER_VALID flag should be set by now if it was really a packet, so ignore PREAMBLE_DETECTED flag

diff --git a/src/mesh/PacketHistory.cpp b/src/mesh/PacketHistory.cpp
@@ -23,12 +23,10 @@ bool PacketHistory::wasSeenRecently(const meshtastic_MeshPacket *p, bool withUpd
         return false; // Not a floodable message ID, so we don't care
     }
 
-    uint32_t now = millis();
-
     PacketRecord r;
     r.id = p->id;
     r.sender = getFrom(p);
-    r.rxTimeMsec = now;
+    r.rxTimeMsec = millis();
 
     auto found = recentPackets.find(r);
     bool seenRecently = (found != recentPackets.end()); // found not equal to .end() means packet was seen recently
@@ -66,8 +64,6 @@ bool PacketHistory::wasSeenRecently(const meshtastic_MeshPacket *p, bool withUpd
  */
 void PacketHistory::clearExpiredRecentPackets()
 {
-    uint32_t now = millis();
-
     LOG_DEBUG("recentPackets size=%ld\n", recentPackets.size());
 
     for (auto it = recentPackets.begin(); it != recentPackets.end();) {

diff --git a/src/mesh/RadioLibInterface.cpp b/src/mesh/RadioLibInterface.cpp
@@ -42,7 +42,7 @@ void LockingArduinoHal::spiTransfer(uint8_t *out, size_t len, uint8_t *in)
 
             uint32_t start = millis();
             while (digitalRead(busy)) {
-                if (!Throttle::isWithinTimespanMs(start, 2000) {
+                if (!Throttle::isWithinTimespanMs(start, 2000)) {
                     LOG_ERROR("GPIO mid-transfer timeout, is it connected?");
                     return;
                 }

diff --git a/src/mesh/SX126xInterface.cpp b/src/mesh/SX126xInterface.cpp
@@ -321,9 +321,8 @@ template <typename T> bool SX126xInterface<T>::isActivelyReceiving()
     bool detected = (irq & (RADIOLIB_SX126X_IRQ_HEADER_VALID | RADIOLIB_SX126X_IRQ_PREAMBLE_DETECTED));
     // Handle false detections
     if (detected) {
-        uint32_t now = millis();
         if (!activeReceiveStart) {
-            activeReceiveStart = now;
+            activeReceiveStart = millis();
         } else if (!Throttle::isWithinTimespanMs(activeReceiveStart, 2 * preambleTimeMsec) &&
                    !(irq & RADIOLIB_SX126X_IRQ_HEADER_VALID)) {
             // The HEADER_VALID flag should be set by now if it was really a packet, so ignore PREAMBLE_DETECTED flag
@@ -362,4 +361,4 @@ template <typename T> bool SX126xInterface<T>::sleep()
 #endif
 
     return true;
-}
+}
diff --git a/src/mesh/SX128xInterface.cpp b/src/mesh/SX128xInterface.cpp
@@ -295,9 +295,8 @@ template <typename T> bool SX128xInterface<T>::isActivelyReceiving()
 
     // Handle false detections
     if (detected) {
-        uint32_t now = millis();
         if (!activeReceiveStart) {
-            activeReceiveStart = now;
+            activeReceiveStart = millis();
         } else if (!Throttle::isWithinTimespanMs(activeReceiveStart, 2 * preambleTimeMsec) &&
                    !(irq & RADIOLIB_SX128X_IRQ_HEADER_VALID)) {
             // The HEADER_VALID flag should be set by now if it was really a packet, so ignore PREAMBLE_DETECTED flag

diff --git a/src/mesh/StreamAPI.cpp b/src/mesh/StreamAPI.cpp
@@ -21,7 +21,6 @@ int32_t StreamAPI::runOncePart()
  */
 int32_t StreamAPI::readStream()
 {
-    uint32_t now = millis();
     if (!stream->available()) {
         // Nothing available this time, if the computer has talked to us recently, poll often, otherwise let CPU sleep a long time
         bool recentRx = Throttle::isWithinTimespanMs(lastRxMsec, 2000);
@@ -72,7 +71,7 @@ int32_t StreamAPI::readStream()
         }
 
         // we had bytes available this time, so assume we might have them next time also
-        lastRxMsec = now;
+        lastRxMsec = millis();
         return 0;
     }
 }

diff --git a/src/mesh/wifi/WiFiAPClient.cpp b/src/mesh/wifi/WiFiAPClient.cpp
@@ -23,6 +23,7 @@ static void WiFiEvent(WiFiEvent_t event);
 #endif
 
 #ifndef DISABLE_NTP
+#include "Throttle.h"
 #include <NTPClient.h>
 #endif
 
@@ -142,8 +143,7 @@ static int32_t reconnectWiFi()
     }
 
 #ifndef DISABLE_NTP
-#include "Throttle.h"
-    if (WiFi.isConnected() && !Throttle::isWithinTimespanMs(lastrun_ntp, 43200000) || (lastrun_ntp == 0)) { // every 12 hours
+    if (WiFi.isConnected() && (!Throttle::isWithinTimespanMs(lastrun_ntp, 43200000) || (lastrun_ntp == 0))) { // every 12 hours
         LOG_DEBUG("Updating NTP time from %s\n", config.network.ntp_server);
         if (timeClient.update()) {
             LOG_DEBUG("NTP Request Success - Setting RTCQualityNTP if needed\n");
@@ -421,4 +421,4 @@ uint8_t getWifiDisconnectReason()
 {
     return wifiDisconnectReason;
 }
-#endif
+#endif
diff --git a/src/modules/NodeInfoModule.cpp b/src/modules/NodeInfoModule.cpp
@@ -68,7 +68,6 @@ meshtastic_MeshPacket *NodeInfoModule::allocReply()
         LOG_DEBUG("Skip sending NodeInfo due to > 40 percent channel util.\n");
         return NULL;
     }
-    uint32_t now = millis();
     // If we sent our NodeInfo less than 5 min. ago, don't send it again as it may be still underway.
     if (!shorterTimeout && lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, 5 * 60 * 1000)) {
         LOG_DEBUG("Skip sending NodeInfo since we just sent it less than 5 minutes ago.\n");
@@ -83,7 +82,7 @@ meshtastic_MeshPacket *NodeInfoModule::allocReply()
         meshtastic_User &u = owner;
 
         LOG_INFO("sending owner %s/%s/%s\n", u.id, u.long_name, u.short_name);
-        lastSentToMesh = now;
+        lastSentToMesh = millis();
         return allocDataProtobuf(u);
     }
 }

diff --git a/src/modules/RemoteHardwareModule.cpp b/src/modules/RemoteHardwareModule.cpp
@@ -119,11 +119,10 @@ bool RemoteHardwareModule::handleReceivedProtobuf(const meshtastic_MeshPacket &r
 int32_t RemoteHardwareModule::runOnce()
 {
     if (moduleConfig.remote_hardware.enabled && watchGpios) {
-        uint32_t now = millis();
 
         if (!Throttle::isWithinTimespanMs(lastWatchMsec, WATCH_INTERVAL_MSEC)) {
             uint64_t curVal = digitalReads(watchGpios);
-            lastWatchMsec = now;
+            lastWatchMsec = millis();
 
             if (curVal != previousWatch) {
                 previousWatch = curVal;

diff --git a/src/modules/SerialModule.cpp b/src/modules/SerialModule.cpp
@@ -98,7 +98,6 @@ SerialModuleRadio::SerialModuleRadio() : MeshModule("SerialModuleRadio")
  */
 bool SerialModule::checkIsConnected()
 {
-    uint32_t now = millis();
     return Throttle::isWithinTimespanMs(lastContactMsec, SERIAL_CONNECTION_TIMEOUT);
 }
 

diff --git a/src/modules/Telemetry/AirQualityTelemetry.cpp b/src/modules/Telemetry/AirQualityTelemetry.cpp
@@ -61,15 +61,14 @@ int32_t AirQualityTelemetryModule::runOnce()
         if (!moduleConfig.telemetry.air_quality_enabled)
             return disable();
 
-        uint32_t now = millis();
-        if ((lastSentToMesh == 0) ||
-            (!Throttle::isWithinTimespanMs(lastSentToMesh, Default::getConfiguredOrDefaultMsScaled(
+        if (((lastSentToMesh == 0) ||
+             !Throttle::isWithinTimespanMs(lastSentToMesh, Default::getConfiguredOrDefaultMsScaled(
                                                                moduleConfig.telemetry.air_quality_interval,
                                                                default_telemetry_broadcast_interval_secs, numOnlineNodes))) &&
-                airTime->isTxAllowedChannelUtil(config.device.role != meshtastic_Config_DeviceConfig_Role_SENSOR) &&
-                airTime->isTxAllowedAirUtil()) {
+            airTime->isTxAllowedChannelUtil(config.device.role != meshtastic_Config_DeviceConfig_Role_SENSOR) &&
+            airTime->isTxAllowedAirUtil()) {
             sendTelemetry();
-            lastSentToMesh = now;
+            lastSentToMesh = millis();
         } else if (service->isToPhoneQueueEmpty()) {
             // Just send to phone when it's not our time to send to mesh yet
             // Only send while queue is empty (phone assumed connected)

diff --git a/src/modules/Telemetry/EnvironmentTelemetry.cpp b/src/modules/Telemetry/EnvironmentTelemetry.cpp
@@ -157,12 +157,12 @@ int32_t EnvironmentTelemetryModule::runOnce()
         }
 
         uint32_t now = millis();
-        if ((lastSentToMesh == 0) ||
-            (!Throttle::isWithinTimespanMs(lastSentToMesh, Default::getConfiguredOrDefaultMsScaled(
+        if (((lastSentToMesh == 0) ||
+             !Throttle::isWithinTimespanMs(lastSentToMesh, Default::getConfiguredOrDefaultMsScaled(
                                                                moduleConfig.telemetry.environment_update_interval,
                                                                default_telemetry_broadcast_interval_secs, numOnlineNodes))) &&
-                airTime->isTxAllowedChannelUtil(config.device.role != meshtastic_Config_DeviceConfig_Role_SENSOR) &&
-                airTime->isTxAllowedAirUtil()) {
+            airTime->isTxAllowedChannelUtil(config.device.role != meshtastic_Config_DeviceConfig_Role_SENSOR) &&
+            airTime->isTxAllowedAirUtil()) {
             sendTelemetry();
             lastSentToMesh = now;
         } else if (((lastSentToPhone == 0) || !Throttle::isWithinTimespanMs(lastSentToPhone, sendToPhoneIntervalMs)) &&

diff --git a/src/sleep.cpp b/src/sleep.cpp
@@ -5,6 +5,7 @@
 #endif
 
 #include "ButtonThread.h"
+#include "Default.h"
 #include "Led.h"
 #include "MeshRadio.h"
 #include "MeshService.h"