version bump

.vscode/extensions.json

@@ -1,4 +1,6 @@
 {
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
     "recommendations": [
         "pioarduino.pioarduino-ide",
         "platformio.platformio-ide"

platformio.ini

@@ -11,7 +11,7 @@
 [platformio]
 default_envs = ESP32_INA233, ESP32_INA226
 
-[env]
+[env:esp32_base]
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.32/platform-espressif32.zip
 board = esp32dev
 framework = arduino
@@ -30,19 +30,21 @@ build_src_flags = -Wall -Wextra
 
 
 [env:ESP32_INA233]
+extends = env:esp32_base
 lib_deps = 
-	${env.lib_deps}
+	${env:esp32_base.lib_deps}
 	INA233
 upload_protocol = espota
-upload_port = 192.168.5.205
+upload_port = 192.168.18.18
 
 [env:ESP32_INA226]
+extends = env:esp32_base
 lib_deps = 
-	${env.lib_deps}
+	${env:esp32_base.lib_deps}
 	robtillaart/INA226@ ~0.6.4
 upload_protocol = espota
-upload_port = 192.168.6.47
+upload_port = 192.168.6.45
-build_flags = ${env.build_flags} -DUSE_INA226
+build_flags = ${env:esp32_base.build_flags} -DUSE_INA226
 
 [env:native]
 platform = native
@@ -50,3 +52,4 @@ build_flags = -DUNIT_TEST -Ilib/fetchOTA/
 lib_deps = 
 	fetchOTA
 	arduino-libraries/ArduinoHttpClient@^0.6.1
+

src/external_interfacing/leds.cpp

@@ -3,9 +3,9 @@
 #include <Elog.h>
 #include "../tools/tools.h"
 #include <tools/log.h>
+#include "../global_data/water_data_queue.h"
 
 extern ActiveErrors active_errors;
-extern WaterData water_data;
 
 void display_task(void* parameter)
 {

src/global_data/defines.h

@@ -7,7 +7,7 @@
 #define water_level_min_key "water_level_min"
 #define water_level_max_key "water_level_max"
 #define water_volume_key "water_volume"
-#define current_software_version Version{2, 1, 0}
+#define current_software_version Version{2, 5, 0}
 #define REQUIRED_SPIFFS_VERSION Version{9, 0, 0}
 
 #define RESISTOR_VALUE 4

src/global_data/global_data.cpp

@@ -5,7 +5,6 @@ NetworkData ethernet_data;
 DeviceTelemetry telemetry;
 
 SensorData shunt_data;
-WaterData water_data;
 
 OTAStatus ota_status;
 

src/global_data/water_data_queue.cpp

@@ -0,0 +1,39 @@
+#include "water_data_queue.h"
+#include <Arduino.h>
+
+SemaphoreHandle_t waterDataMutex = nullptr;
+WaterData latestWaterDataCache = {0.0f, 0.0f, 0.0f};
+
+void initWaterDataSync() {
+    // Create mutex for thread-safe access to latest data cache
+    waterDataMutex = xSemaphoreCreateMutex();
+    
+    if (waterDataMutex == nullptr) {
+        Serial.println("Failed to create water data mutex");
+    }
+}
+
+void updateLatestWaterData(const WaterData& newData) {
+    // Update the cache with new data (called by producer)
+    if (xSemaphoreTake(waterDataMutex, pdMS_TO_TICKS(10)) == pdTRUE) {
+        latestWaterDataCache = newData;
+        xSemaphoreGive(waterDataMutex);
+    }
+}
+
+WaterData getLatestWaterData() {
+    WaterData result;
+    
+    // Always return the latest cached data
+    if (xSemaphoreTake(waterDataMutex, pdMS_TO_TICKS(10)) == pdTRUE) {
+        result = latestWaterDataCache;  // Copy the latest data
+        xSemaphoreGive(waterDataMutex);
+        return result;
+    }
+    
+    // Fallback: if mutex fails, return default values
+    result.level = 0.0f;
+    result.liters = 0.0f;
+    result.percentage = 0.0f;
+    return result;
+}

src/global_data/water_data_queue.h

@@ -0,0 +1,16 @@
+#pragma once
+#include "global_data.h"
+#include "freertos/semphr.h"
+
+// Mutex and cache for thread-safe water data access
+extern SemaphoreHandle_t waterDataMutex;
+extern WaterData latestWaterDataCache;
+
+// Initialize the water data synchronization
+void initWaterDataSync();
+
+// Helper function to get latest water data (always returns most recent)
+WaterData getLatestWaterData();
+
+// Internal function for producer to update latest data
+void updateLatestWaterData(const WaterData& newData);

src/main.cpp

@@ -13,6 +13,7 @@
 #include <ArduinoOTA.h>
 
 #include "global_data/defines.h"
+#include "global_data/water_data_queue.h"
 
 #include "networking/networking.h"
 
@@ -32,7 +33,6 @@
 
 Preferences prefs;
 
-extern WaterData water_data;
 extern DeviceTelemetry telemetry;
 extern NetworkData wifi_data;
 extern NetworkData ethernet_data;
@@ -60,6 +60,9 @@ void setup()
     LOG(ELOG_LEVEL_DEBUG, "Init Sensor");
     init_sensor();
 
+    LOG(ELOG_LEVEL_DEBUG, "Init Water Data Sync");
+    initWaterDataSync();
+
     LOG(ELOG_LEVEL_DEBUG, "Beginning LittleFS");
     LittleFS.begin(FORMAT_LITTLEFS_IF_FAILED);
 

src/networking/json_builder.cpp

@@ -1,7 +1,7 @@
 #include "json_builder.h"
 #include <Elog.h>
+#include "../global_data/water_data_queue.h"
 
-extern WaterData water_data;
 extern DeviceTelemetry telemetry;
 extern NetworkData wifi_data;
 extern NetworkData ethernet_data;

src/networking/responses.cpp

@@ -8,8 +8,8 @@
 #include "json_builder.h"
 #include "../tools/tools.h"
 #include <SPIFFS.h>
+#include "../global_data/water_data_queue.h"
 
-extern WaterData water_data;
 extern DeviceTelemetry telemetry;
 extern NetworkData wifi_data;
 extern NetworkData ethernet_data;
@@ -25,18 +25,21 @@ void setup_api_endpoints(){
       request->send(200, "application/json", output); });
 
     server.on("/water_data", HTTP_GET, [](AsyncWebServerRequest* request) {
+      WaterData current_water_data = getLatestWaterData();
       String output;
-      serializeJson(build_water_data_json(water_data), output);
+      serializeJson(build_water_data_json(current_water_data), output);
       request->send(200, "application/json", output); });
 
     server.on("/raw_percent", HTTP_GET, [](AsyncWebServerRequest* request) {
+      WaterData current_water_data = getLatestWaterData();
       String output;
-      output = water_data.percentage;
+      output = String(current_water_data.percentage);
       request->send(200, "text/raw", output); });
 
     server.on("/raw_level", HTTP_GET, [](AsyncWebServerRequest* request) {
+      WaterData current_water_data = getLatestWaterData();
       String output;
-      output = water_data.level;
+      output = String(current_water_data.level);
       request->send(200, "text/raw", output); });
   
 
@@ -71,6 +74,6 @@ void setup_api_endpoints(){
       };
 
       xTaskCreate(run_ota_update_task, "RunOTAUpdate", 1024 * 8, (void *)&args, 1, NULL);
-      request->send(SPIFFS, "/update_progress.html", "text/html", false, processor);
+      request->send(LittleFS, "/update_progress.html", "text/html", false, processor);
     });
 }

src/networking/responses.h

@@ -1,3 +1,4 @@
 #include <ESPAsyncWebServer.h>
+#include <LittleFS.h>
 
 void setup_api_endpoints();

src/sensor/sensor.cpp

@@ -3,6 +3,7 @@
 #include <Elog.h>
 #include "Wire.h"
 #include "../global_data/global_data.h"
+#include "../global_data/water_data_queue.h"
 
 
 #ifdef USE_INA226
@@ -18,7 +19,6 @@ INA233 ina_sensor(0x40);
 #include "freertos/task.h"
 
 extern Preferences prefs;
-extern WaterData water_data;
 extern ActiveErrors active_errors;
 extern SensorData shunt_data;
 
@@ -106,9 +106,14 @@ void read_sensor_task(void* parameter)
         shunt_data.shunt_voltage = shunt_voltage;
         shunt_data.shunt_current = shunt_current;
 
-        water_data.level = cm_over_zero;
+        // Create water data structure and update latest data
-        water_data.liters = liters;
+        WaterData current_water_data;
-        water_data.percentage = percentage_rounded;
+        current_water_data.level = cm_over_zero;
+        current_water_data.liters = liters;
+        current_water_data.percentage = percentage_rounded;
+        
+        // Update the latest water data (thread-safe)
+        updateLatestWaterData(current_water_data);
 
         delay(20000);
     }