From 4ac0681a9aea6d0b133ab693bfbc1260f5619d5b Mon Sep 17 00:00:00 2001
From: Hendrik Rauh <114620133+HendrikRauh@users.noreply.github.com>
Date: Sun, 15 Dec 2024 21:02:37 +0100
Subject: [PATCH] switched status logic to separate file

---
 src/main.cpp          |  1 +
 src/routes/config.cpp | 36 ------------------------------------
 src/routes/config.h   |  2 --
 src/routes/status.cpp | 37 +++++++++++++++++++++++++++++++++++++
 src/routes/status.h   |  4 ++++
 5 files changed, 42 insertions(+), 38 deletions(-)
 create mode 100644 src/routes/status.cpp
 create mode 100644 src/routes/status.h

diff --git a/src/main.cpp b/src/main.cpp
index 0d489aa..d35bfbd 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -16,6 +16,7 @@
 #include "ESPDMX.h"
 #include <LittleFS.h>
 #include "routes/config.h"
+#include "routes/status.h"
 
 DMXESPSerial dmx1;
 DMXESPSerial dmx2;
diff --git a/src/routes/config.cpp b/src/routes/config.cpp
index 39d2b90..5ca6107 100644
--- a/src/routes/config.cpp
+++ b/src/routes/config.cpp
@@ -69,18 +69,6 @@ Direction parseDirection(uint8_t direction)
     throw ::std::invalid_argument("Invalid direction value: " + direction);
 }
 
-int8_t getWiFiStrength()
-{
-    try
-    {
-        return WiFi.RSSI();
-    }
-    catch (...)
-    {
-        return NULL;
-    }
-}
-
 #pragma endregion
 
 void onGetConfig(AsyncWebServerRequest *request)
@@ -202,27 +190,3 @@ void onGetNetworks(AsyncWebServerRequest *request)
     serializeJson(doc, jsonString);
     request->send(200, "application/json", jsonString);
 }
-
-void onGetStatus(AsyncWebServerRequest *request)
-{
-    JsonDocument doc;
-
-    doc["uptime"] = millis();
-    doc["chip"]["model"] = ESP.getChipModel();
-    doc["chip"]["mac"] = ESP.getEfuseMac();
-    doc["chip"]["revision"] = ESP.getChipRevision();
-    doc["chip"]["cpuFreqMHz"] = ESP.getCpuFreqMHz();
-    doc["chip"]["cycleCount"] = ESP.getCycleCount();
-    doc["sdkVersion"] = ESP.getSdkVersion();
-    doc["sketch"]["size"] = ESP.getSketchSize();
-    doc["sketch"]["md5"] = ESP.getSketchMD5();
-    doc["heap"]["free"] = ESP.getFreeHeap();
-    doc["heap"]["total"] = ESP.getHeapSize();
-    doc["psram"]["free"] = ESP.getFreePsram();
-    doc["psram"]["total"] = ESP.getPsramSize();
-    doc["connection"]["signalStrength"] = getWiFiStrength();
-
-    String jsonString;
-    serializeJson(doc, jsonString);
-    request->send(200, "application/json", jsonString);
-}
diff --git a/src/routes/config.h b/src/routes/config.h
index 85ca5eb..54c1a03 100644
--- a/src/routes/config.h
+++ b/src/routes/config.h
@@ -37,6 +37,4 @@ void onPutConfig(AsyncWebServerRequest *request, uint8_t *data, size_t len, size
 
 void onGetNetworks(AsyncWebServerRequest *request);
 
-void onGetStatus(AsyncWebServerRequest *request);
-
 // #endif
\ No newline at end of file
diff --git a/src/routes/status.cpp b/src/routes/status.cpp
new file mode 100644
index 0000000..b21cf8d
--- /dev/null
+++ b/src/routes/status.cpp
@@ -0,0 +1,37 @@
+#include "status.h"
+
+int8_t getWiFiStrength()
+{
+    try
+    {
+        return WiFi.RSSI();
+    }
+    catch (...)
+    {
+        return 0;
+    }
+}
+
+void onGetStatus(AsyncWebServerRequest *request)
+{
+    JsonDocument doc;
+
+    doc["uptime"] = millis();
+    doc["chip"]["model"] = ESP.getChipModel();
+    doc["chip"]["mac"] = ESP.getEfuseMac();
+    doc["chip"]["revision"] = ESP.getChipRevision();
+    doc["chip"]["cpuFreqMHz"] = ESP.getCpuFreqMHz();
+    doc["chip"]["cycleCount"] = ESP.getCycleCount();
+    doc["sdkVersion"] = ESP.getSdkVersion();
+    doc["sketch"]["size"] = ESP.getSketchSize();
+    doc["sketch"]["md5"] = ESP.getSketchMD5();
+    doc["heap"]["free"] = ESP.getFreeHeap();
+    doc["heap"]["total"] = ESP.getHeapSize();
+    doc["psram"]["free"] = ESP.getFreePsram();
+    doc["psram"]["total"] = ESP.getPsramSize();
+    doc["connection"]["signalStrength"] = getWiFiStrength();
+
+    String jsonString;
+    serializeJson(doc, jsonString);
+    request->send(200, "application/json", jsonString);
+}
\ No newline at end of file
diff --git a/src/routes/status.h b/src/routes/status.h
new file mode 100644
index 0000000..3d3d204
--- /dev/null
+++ b/src/routes/status.h
@@ -0,0 +1,4 @@
+#include <AsyncWebServer_ESP32_W5500.h>
+#include <ArduinoJson.h>
+
+void onGetStatus(AsyncWebServerRequest *request);
\ No newline at end of file