From 949452dbc2bc997f487d1dc752dca1e2f83fc9fa Mon Sep 17 00:00:00 2001
From: Bert Melis <bertmelis@users.noreply.github.com>
Date: Mon, 27 May 2024 22:35:42 +0200
Subject: [PATCH] raw RSSI

---
 examples/simple-esp32/simple-esp32.ino     |  8 ++++----
 examples/simple-esp8266/simple-esp8266.ino |  8 ++++----
 examples/tls-esp32/tls-esp32.ino           |  8 ++++----
 src/Helpers/Helpers.cpp                    | 13 -------------
 src/Helpers/Helpers.h                      |  3 ---
 5 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/examples/simple-esp32/simple-esp32.ino b/examples/simple-esp32/simple-esp32.ino
index 4dc6516..b6ddb64 100644
--- 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
index 85480d1..24840f4 100644
--- 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
index 83ae7bf..4c3d99a 100644
--- 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/Helpers.cpp b/src/Helpers/Helpers.cpp
index e7384c2..df69de2 100644
--- 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) {
diff --git a/src/Helpers/Helpers.h b/src/Helpers/Helpers.h
index a32693a..de44626 100644
--- a/src/Helpers/Helpers.h
+++ b/src/Helpers/Helpers.h
@@ -13,10 +13,8 @@ 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
@@ -24,7 +22,6 @@ the LICENSE file.
 
 namespace espMqttManagerHelpers {
 
-uint8_t signalQuality();
 void handleUpdate(const uint8_t* payload, size_t length, size_t index, size_t total);
 extern bool updated;