Add a ds18b20 sensor task and libraries (#1)

* Added  ds18b20 sensor task and libraries
* Fixed SS pin issue. See espressif/arduino-esp32#10610

Author: CelliesProjects

Diff for: platformio.ini

@@ -28,6 +28,8 @@ build_flags =
 lib_deps =
     celliesprojects/MoonPhase@^1.0.3
     https://github.com/lovyan03/LovyanGFX#develop
+    https://github.com/PaulStoffregen/OneWire#dae0fca
+    https://github.com/milesburton/Arduino-Temperature-Control-Library/archive/refs/tags/3.9.1.zip
 
 upload_speed = 921600
 monitor_speed = 115200
@@ -46,7 +48,7 @@ build_flags =
     -D LEDPIN_2=40
     -D LEDPIN_3=41
     -D LEDPIN_4=42
-    -D SDCARD_SS=10
+    -D ONE_WIRE_PIN=21
     ${user.build_flags}
     ${env.build_flags}
 
@@ -63,7 +65,7 @@ build_flags =
     -D LEDPIN_2=17
     -D LEDPIN_3=2
     -D LEDPIN_4=5
-    -D SDCARD_SS=4
+    -D ONE_WIRE_PIN=26
     ${user.build_flags}
     ${env.build_flags}
     -D BOARD_HAS_PSRAM

Diff for: 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);
 

Diff for: src/fonts/DejaVu24-modded.h

@@ -6,7 +6,8 @@ enum lcdMessageType
     SET_BRIGHTNESS,
     LCD_SYSTEM_MESSAGE,
     UPDATE_LIGHTS,
-    MOON_PHASE
+    MOON_PHASE,
+    TEMPERATURE
 };
 
 struct lcdMessage_t

Diff for: src/lcdMessage_t.h renamed to src/lcdMessage.h

@@ -1,5 +1,4 @@
 #include "lcdTask.hpp"
-#include "lcdMessage_t.h"
 
 float mapf(const float x, const float in_min, const float in_max, const float out_min, const float out_max)
 {
@@ -113,6 +112,26 @@ static void updateClock(const struct tm &timeinfo)
     clock.pushSprite(0, lcd.height() - font.yAdvance);
 }
 
+static void showTemp(const float temperature)
+{
+    const GFXfont &font = DejaVu24Modded;
+    static LGFX_Sprite temp(&lcd);
+    if (temp.width() == 0 || temp.height() == 0)
+    {
+        temp.setColorDepth(lgfx::palette_2bit);
+        if (!temp.createSprite(lcd.width(), font.yAdvance))
+        {
+            log_e("could not create sprite");
+            return;
+        }
+    }    
+    char buffer[10];
+    snprintf(buffer, sizeof(buffer), "%.2f°C", temperature);
+    temp.drawCenterString(buffer, temp.width() >> 1, 6, &font);
+    temp.pushSprite(0, 15);
+
+}
+
 void lcdTask(void *parameter)
 {
     lcd.init();
@@ -140,6 +159,10 @@ void lcdTask(void *parameter)
                 showMoon(msg.float1, msg.int1);
                 break;
 
+            case lcdMessageType::TEMPERATURE:
+                showTemp(msg.float1);
+                break;
+
             default:
                 break;
             }

Diff for: src/lcdTask.cpp

@@ -4,7 +4,9 @@
 #define LGFX_AUTODETECT
 #include <LGFX_AUTODETECT.hpp>
 
-#include "lcdMessage_t.h"
+#include "lcdMessage.h"
+#include "fonts/DejaVu24-modded.h" /* contains percent sign and a modified superscript 2 - to subscript*/
+                                   /* modded with https://tchapi.github.io/Adafruit-GFX-Font-Customiser/ */
 
 extern float currentPercentage[NUMBER_OF_CHANNELS];
 

Diff for: src/lcdTask.hpp

@@ -7,13 +7,15 @@
 #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);
 extern void messageOnLcd(const char *str);
 
+extern void sensorTask(void *parameter);
+
 extern void dimmerTask(void *parameter);
 extern std::vector<lightTimer_t> channel[NUMBER_OF_CHANNELS];
 extern std::mutex channelMutex;
@@ -30,7 +32,7 @@ static void startDimmerTask()
                                         NULL,
                                         4096 * 2,
                                         NULL,
-                                        tskIDLE_PRIORITY + 2,
+                                        tskIDLE_PRIORITY + 5,
                                         &dimmerTaskHandle);
     if (taskResult != pdPASS)
     {
@@ -46,6 +48,7 @@ static void ntpCb(void *cb_arg)
     sntp_set_time_sync_notification_cb(NULL);
     startDimmerTask();
 }
+
 static void parseTimerFile(File &file)
 {
     log_i("parsing '%s'", file.path());
@@ -192,7 +195,7 @@ void setup(void)
     SPI.begin(SCK, MISO, MOSI);
     SPI.setHwCs(true);
 
-    if (!SD.begin(SDCARD_SS))
+    if (!SD.begin(SS))
         log_w("could not mount SD");
     else
     {
@@ -230,7 +233,7 @@ void setup(void)
                                     NULL,
                                     4096,
                                     NULL,
-                                    tskIDLE_PRIORITY,
+                                    tskIDLE_PRIORITY + 1,
                                     NULL);
     if (result != pdPASS)
     {
@@ -239,6 +242,19 @@ void setup(void)
             delay(100);
     }
 
+    result = xTaskCreate(sensorTask,
+                         NULL,
+                         4096,
+                         NULL,
+                         tskIDLE_PRIORITY + 1,
+                         NULL);
+    if (result != pdPASS)
+    {
+        log_e("could not start sensorTask. system halted!");
+        while (1)
+            delay(100);
+    }
+
     messageOnLcd("Wifi connecting...");
 
     while (!WiFi.isConnected())

Diff for: src/lightTime_t.h renamed to src/lightTimer.h

@@ -0,0 +1,64 @@
+#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);
+
+    OneWire oneWire(ONE_WIRE_PIN);
+    DallasTemperature sensor(&oneWire);
+
+    sensor.begin();
+
+    DeviceAddress sensorAddress;
+    if (!sensor.getAddress(sensorAddress, 0))
+    {
+        log_i("No DS18B20 sensor found. Deleting task.");
+        vTaskDelete(NULL);
+    }
+    sensor.setResolution(sensorAddress, 12);
+
+    float lastTemperatureC = DEVICE_DISCONNECTED_C;
+    int errorCount = 0;
+
+    while (1)
+    {
+        sensor.requestTemperatures();
+
+        vTaskDelay(pdMS_TO_TICKS(750));
+
+        const float temperatureC = sensor.getTempC(sensorAddress);
+
+        if (temperatureC == DEVICE_DISCONNECTED_C)
+        {
+            log_w("Sensor disconnected or error reading temperature.");
+
+            if (++errorCount >= MAX_ERROR_COUNT)
+            {
+                log_e("Persistent sensor error after %d retries. Deleting task.", MAX_ERROR_COUNT);
+                vTaskDelete(NULL);
+            }
+        }
+        else
+        {
+            errorCount = 0;
+
+            if (fabs(temperatureC - lastTemperatureC) > TEMPERATURE_THRESHOLD &&
+                !updateTemperature(temperatureC, lastTemperatureC))
+                log_w("Dropped temperature update");
+        }
+    }
+}

Diff for: src/main.cpp

@@ -0,0 +1,14 @@
+#ifndef _SENSOR_TASK_
+#define _SENSOR_TASK_
+
+#include <OneWire.h>
+#include <DallasTemperature.h>
+
+#include "lcdMessage.h"
+
+static constexpr float TEMPERATURE_THRESHOLD = (0.05f);
+static constexpr int MAX_ERROR_COUNT = 10;
+
+extern QueueHandle_t lcdQueue;
+
+#endif