Cleanup

Author: CelliesProjects

src/dimmerTask.hpp

@@ -8,8 +8,8 @@
 #include <mutex>
 #include <moonPhase.h>
 
-#include "lightTime_t.h"
-#include "lcdMessage_t.h"
+#include "lightTimer.h"
+#include "lcdMessage.h"
 
 extern float mapf(const float x, const float in_min, const float in_max, const float out_min, const float out_max);
 

src/lcdMessage_t.h renamed to src/lcdMessage.h

@@ -1,5 +1,5 @@
 #include "lcdTask.hpp"
-#include "lcdMessage_t.h"
+#include "lcdMessage.h"
 
 float mapf(const float x, const float in_min, const float in_max, const float out_min, const float out_max)
 {

src/lcdTask.cpp

@@ -4,7 +4,7 @@
 #define LGFX_AUTODETECT
 #include <LGFX_AUTODETECT.hpp>
 
-#include "lcdMessage_t.h"
+#include "lcdMessage.h"
 #include "fonts/DejaVu24-modded.h" /* contains percent sign and superscript 2*/
 
 extern float currentPercentage[NUMBER_OF_CHANNELS];

src/lcdTask.hpp

@@ -7,8 +7,8 @@
 #include <mutex>
 
 #include "secrets.h"
-#include "lcdMessage_t.h"
-#include "lightTime_t.h"
+#include "lcdMessage.h"
+#include "lightTimer.h"
 
 extern QueueHandle_t lcdQueue;
 extern void lcdTask(void *parameter);

src/lightTime_t.h renamed to src/lightTimer.h

@@ -1,5 +1,19 @@
 #include <sensorTask.hpp>
 
+static bool updateTemperature(float temperatureC, float &lastTemperatureC)
+{
+    lcdMessage_t msg;
+    msg.type = TEMPERATURE;
+    msg.float1 = temperatureC;
+
+    const BaseType_t result = xQueueSend(lcdQueue, &msg, 0);
+
+    lastTemperatureC = result ? temperatureC : lastTemperatureC;
+
+    log_d("%s lcd temperature %.2f°C", result ? "Updated" : "Could not update", temperatureC);
+    return result == pdTRUE;
+}
+
 void sensorTask(void *parameter)
 {
     pinMode(ONE_WIRE_PIN, INPUT_PULLUP);
@@ -10,7 +24,6 @@ void sensorTask(void *parameter)
     sensor.begin();
 
     DeviceAddress sensorAddress;
-
     if (!sensor.getAddress(sensorAddress, 0))
     {
         log_d("No DS18B20 sensor found. Deleting task.");
@@ -19,7 +32,7 @@ void sensorTask(void *parameter)
     sensor.setResolution(sensorAddress, 12);
 
     float lastTemperatureC = DEVICE_DISCONNECTED_C;
-    static int errorCount = 0;
+    int errorCount = 0;
 
     while (1)
     {
@@ -32,27 +45,20 @@ void sensorTask(void *parameter)
         if (temperatureC == DEVICE_DISCONNECTED_C)
         {
             log_w("Sensor disconnected or error reading temperature.");
-            if (++errorCount >= 10)
+
+            if (++errorCount >= MAX_ERROR_COUNT)
             {
-                log_e("Persistent sensor error after 10 retries. Deleting task.");
+                log_e("Persistent sensor error after %d retries. Deleting task.", MAX_ERROR_COUNT);
                 vTaskDelete(NULL);
             }
         }
         else
         {
             errorCount = 0;
 
-            if (fabs(temperatureC - lastTemperatureC) > TEMPERATURE_THRESHOLD)
-            {
-                lcdMessage_t msg;
-                msg.type = TEMPERATURE;
-                msg.float1 = temperatureC;
-
-                const BaseType_t result = xQueueSend(lcdQueue, &msg, 0);
-
-                log_d("%s lcd temperature %.2f°C", result ? "Updated" : "Could not update", temperatureC);
-                lastTemperatureC = result ? temperatureC : lastTemperatureC;
-            }
+            if (fabs(temperatureC - lastTemperatureC) > TEMPERATURE_THRESHOLD &&
+                !updateTemperature(temperatureC, lastTemperatureC))
+                log_w("Dropped temperature update");
         }
     }
 }

src/main.cpp

@@ -4,12 +4,12 @@
 #include <OneWire.h>
 #include <DallasTemperature.h>
 
-#include "lcdMessage_t.h"
+#include "lcdMessage.h"
 
-#define TEMPERATURE_THRESHOLD (0.05f)
+static constexpr int ONE_WIRE_PIN = 26;
+static constexpr float TEMPERATURE_THRESHOLD = (0.05f);
+static constexpr int MAX_ERROR_COUNT = 10;
 
 extern QueueHandle_t lcdQueue;
 
-static constexpr int ONE_WIRE_PIN = 26;
-
 #endif