Simplification

* simplify business logic * update to current Arduino core * raw RSSI
bertmelis · May 27, 2024 · accbead · accbead
1 parent 62d4e53
commit accbead
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 188 deletions.
diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
@@ -19,4 +19,4 @@ jobs:
         pip install platformio
     - name: Cppcheck
       run: |
-        pio check --fail-on-defect=low --flags "--enable=warning --enable=style --enable=performance --suppress=unusedFunction --suppress=preprocessorErrorDirective" --skip-packages
+        pio check --fail-on-defect=low --flags "--enable=warning --enable=style --enable=performance --suppress=unusedFunction --suppress=preprocessorErrorDirective --inline-suppr" --skip-packages
diff --git a/examples/simple-esp32/simple-esp32.ino b/examples/simple-esp32/simple-esp32.ino
@@ -13,10 +13,10 @@ void loop() {
   static uint32_t lastMillis = 0;
   if (millis() - lastMillis > 10000) {
     lastMillis = millis();
-    uint8_t signalQuality = espMqttManagerHelpers::signalQuality();
-    char sqStr[4];
-    snprintf(sqStr, sizeof(sqStr), "%d", signalQuality);
-    espMqttManager::mqttClient.publish("test/topic", 0, false, sqStr);
+    int8_t signalQuality = WiFi.RSSI();
+    char buf[5];
+    snprintf(buf, sizeof(buf), "%d", signalQuality);
+    espMqttManager::mqttClient.publish("test/topic", 0, false, buf);
   }
   espMqttManager::loop();
 }
diff --git a/examples/simple-esp8266/simple-esp8266.ino b/examples/simple-esp8266/simple-esp8266.ino
@@ -13,10 +13,10 @@ void loop() {
   static uint32_t lastMillis = 0;
   if (millis() - lastMillis > 10000) {
     lastMillis = millis();
-    uint8_t signalQuality = espMqttManagerHelpers::signalQuality();
-    char sqStr[4];
-    snprintf(sqStr, sizeof(sqStr), "%d", signalQuality);
-    espMqttManager::mqttClient.publish("test/topic", 0, false, sqStr);
+    int8_t signalQuality = WiFi.RSSI();
+    char buf[5];
+    snprintf(buf, sizeof(buf), "%d", signalQuality);
+    espMqttManager::mqttClient.publish("test/topic", 0, false, buf);
   }
   espMqttManager::loop();
 }
diff --git a/examples/tls-esp32/tls-esp32.ino b/examples/tls-esp32/tls-esp32.ino
@@ -21,10 +21,10 @@ void loop() {
   static uint32_t lastMillis = 0;
   if (millis() - lastMillis > 10000) {
     lastMillis = millis();
-    uint8_t signalQuality = espMqttManagerHelpers::signalQuality();
-    char sqStr[4];
-    snprintf(sqStr, sizeof(sqStr), "%d", signalQuality);
-    espMqttManager::mqttClient.publish("test/topic", 0, false, sqStr);
+    int8_t signalQuality = WiFi.RSSI();
+    char buf[5];
+    snprintf(buf, sizeof(buf), "%d", signalQuality);
+    espMqttManager::mqttClient.publish("test/topic", 0, false, buf);
   }
   espMqttManager::loop();
 }
diff --git a/src/Helpers/Config.cpp b/src/Helpers/Config.cpp
@@ -39,10 +39,10 @@ bool Config::getConfig() {
           doc["PSK"] | "",
           sizeof(PSK));
   JsonArray hostIPArray = doc["IPAddress"];
-  uint8_t IPAddress_0 = hostIPArray[0] | 0;
-  uint8_t IPAddress_1 = hostIPArray[1] | 0;
-  uint8_t IPAddress_2 = hostIPArray[2] | 0;
-  uint8_t IPAddress_3 = hostIPArray[3] | 0;
+  uint8_t IPAddress_0 = hostIPArray[0] | 0;  // cppcheck-suppress badBitmaskCheck
+  uint8_t IPAddress_1 = hostIPArray[1] | 0;  // cppcheck-suppress badBitmaskCheck
+  uint8_t IPAddress_2 = hostIPArray[2] | 0;  // cppcheck-suppress badBitmaskCheck
+  uint8_t IPAddress_3 = hostIPArray[3] | 0;  // cppcheck-suppress badBitmaskCheck
   hostIP = IPAddress(IPAddress_0, IPAddress_1, IPAddress_2, IPAddress_3);
   strlcpy(hostname,
           doc["hostname"] | "",

diff --git a/src/Helpers/Helpers.cpp b/src/Helpers/Helpers.cpp
@@ -10,19 +10,6 @@ the LICENSE file.
 
 namespace espMqttManagerHelpers {
 
-uint8_t signalQuality() {
-  uint8_t signal = 0;
-  int32_t rssi = WiFi.RSSI();
-  if (rssi <= -100) {
-    signal = 0;
-  } else if (rssi >= -50) {
-    signal = 100;
-  } else {
-    signal = 2 * (rssi + 100);
-  }
-  return signal;
-}
-
 bool updated = false;
 
 void handleUpdate(const uint8_t* payload, size_t length, size_t index, size_t total) {
@@ -44,6 +31,7 @@ void handleUpdate(const uint8_t* payload, size_t length, size_t index, size_t to
     if (!Update.isRunning()) return;
     written += Update.write(data, length);
   }
+  espMqttManagerHelpers::updated = false;
   if (Update.isFinished()) {
     if (Update.end()) {
       espMqttManagerHelpers::updated = true;

diff --git a/src/Helpers/Helpers.h b/src/Helpers/Helpers.h
@@ -13,18 +13,15 @@ the LICENSE file.
 
 #include <Arduino.h>  // millis()
 #if defined(ARDUINO_ARCH_ESP8266)
-#include <ESP8266WiFi.h>  //  WiFi.RSSI()
 #include <Updater.h>
 #elif defined(ARDUINO_ARCH_ESP32)
-#include <WiFi.h>
 #include <Update.h>
 #else
 #error Platform not supported
 #endif
 
 namespace espMqttManagerHelpers {
 
-uint8_t signalQuality();
 void handleUpdate(const uint8_t* payload, size_t length, size_t index, size_t total);
 extern bool updated;