From d212216c26fb4a802f9cfd6c2a73f01945e9f53f Mon Sep 17 00:00:00 2001
From: Tobias Maier <me@maiertobi.de>
Date: Tue, 17 Dec 2024 22:59:49 +0100
Subject: [PATCH] CLeanup

---
 src/main.cpp                | 30 +-----------------------------
 src/telemetry/telemetry.cpp | 17 +++++++++++++++++
 src/telemetry/telemetry.h   |  1 +
 src/tools/tools.cpp         | 19 +++++++++++++++++++
 src/tools/tools.h           |  3 ++-
 5 files changed, 40 insertions(+), 30 deletions(-)
 create mode 100644 src/telemetry/telemetry.cpp
 create mode 100644 src/telemetry/telemetry.h

diff --git a/src/main.cpp b/src/main.cpp
index 12698a6..9c73bd2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,6 +22,7 @@
 #include <Preferences.h>
 #include "sensor/sensor.h"
 #include "external_interfacing/leds.h"
+#include "telemetry/telemetry.h"
 #include "tools/tools.h"
 
 Preferences prefs;
@@ -39,35 +40,6 @@ AsyncWebServer server(80);
 #define FORMAT_LITTLEFS_IF_FAILED true
 
 
-void collect_internal_telemetry_task(void* parameter)
-{
-    while (true) {
-        float heap_usage = (float(ESP.getFreeHeap()) / float(ESP.getHeapSize())) * 100;
-        uint64_t uptime_seconds = millis() / 1000;
-
-        telemetry.heap_used_percent = heap_usage;
-        telemetry.uptime_seconds = uptime_seconds;
-        delay(60000);
-    }
-}
-
-
-String processor(const String& var)
-{
-  if (var == level_sensor_range_key) {
-    return String(prefs.getFloat(level_sensor_range_key, -1));
-  } else if (var == water_level_min_key) {
-    return String(prefs.getFloat(water_level_min_key, -1));
-  } else if (var == water_level_max_key) {
-    return String(prefs.getFloat(water_level_max_key, -1));
-  } else if (var == water_volume_key) {
-    return String(prefs.getFloat(water_volume_key, -1));
-  }
-    
-  return String("Test");
-}
-
-
 void setup()
 {
     prefs.begin("waterlevel", false);
diff --git a/src/telemetry/telemetry.cpp b/src/telemetry/telemetry.cpp
new file mode 100644
index 0000000..1fa7922
--- /dev/null
+++ b/src/telemetry/telemetry.cpp
@@ -0,0 +1,17 @@
+#include "telemetry.h"
+#include <Arduino.h>
+#include "../global_data/global_data.h"
+
+extern DeviceTelemetry telemetry;
+
+void collect_internal_telemetry_task(void* parameter)
+{
+    while (true) {
+        float heap_usage = (float(ESP.getFreeHeap()) / float(ESP.getHeapSize())) * 100;
+        uint64_t uptime_seconds = millis() / 1000;
+
+        telemetry.heap_used_percent = heap_usage;
+        telemetry.uptime_seconds = uptime_seconds;
+        delay(60000);
+    }
+}
\ No newline at end of file
diff --git a/src/telemetry/telemetry.h b/src/telemetry/telemetry.h
new file mode 100644
index 0000000..8833253
--- /dev/null
+++ b/src/telemetry/telemetry.h
@@ -0,0 +1 @@
+void collect_internal_telemetry_task(void* parameter);
\ No newline at end of file
diff --git a/src/tools/tools.cpp b/src/tools/tools.cpp
index 113104d..2948aab 100644
--- a/src/tools/tools.cpp
+++ b/src/tools/tools.cpp
@@ -1,6 +1,10 @@
 #include <Arduino.h>
 #include "tools.h"
 #include <ArduinoLog.h>
+#include "../global_data/defines.h"
+#include <Preferences.h>
+
+extern Preferences prefs;
 
 void printSuffix(Print* _logOutput, int logLevel)
 {
@@ -18,4 +22,19 @@ void print_prefix(Print* _logOutput, int logLevel)
 
 bool is_error(ActiveErrors active_errors) {
     return active_errors.current_high || active_errors.current_low || active_errors.level_high || active_errors.level_low || active_errors.voltage_high || active_errors.voltage_low;
+}
+
+String processor(const String& var)
+{
+  if (var == level_sensor_range_key) {
+    return String(prefs.getFloat(level_sensor_range_key, -1));
+  } else if (var == water_level_min_key) {
+    return String(prefs.getFloat(water_level_min_key, -1));
+  } else if (var == water_level_max_key) {
+    return String(prefs.getFloat(water_level_max_key, -1));
+  } else if (var == water_volume_key) {
+    return String(prefs.getFloat(water_volume_key, -1));
+  }
+    
+  return String("Test");
 }
\ No newline at end of file
diff --git a/src/tools/tools.h b/src/tools/tools.h
index f82f2ad..b5f3618 100644
--- a/src/tools/tools.h
+++ b/src/tools/tools.h
@@ -3,4 +3,5 @@
 
 void printSuffix(Print* _logOutput, int logLevel);
 void print_prefix(Print* _logOutput, int logLevel);
-bool is_error(ActiveErrors active_errors);
\ No newline at end of file
+bool is_error(ActiveErrors active_errors);
+String processor(const String& var);
\ No newline at end of file