version bump

data/version

@@ -1 +1 @@
-10
+9

lib/fetchOTA/fetchOTA.cpp

@@ -6,7 +6,6 @@
 #include <ArduinoJson.h>
 #include <HTTPClient.h>
 #include <WiFiClient.h>
-#include <WiFiClientSecure.h>
 #include <vector>
 #include <Elog.h>
 #include <HTTPUpdate.h>
@@ -98,11 +97,11 @@ void run_ota_update(String url, std::function<void()> callback_started,  std::fu
     httpUpdate.onError(callback_error);
     Logger.log(0, ELOG_LEVEL_DEBUG, "Defined callbacks, Starting update now");
 
-    t_httpUpdate_return ret = HTTP_UPDATE_FAILED;
+    t_httpUpdate_return ret;
 
     if (url.startsWith("https")) {
         Logger.log(0, ELOG_LEVEL_DEBUG, "HTTPS URL");
-        WiFiClientSecure client;
+        WiFiClient client;
         // client.setInsecure();
         ret = httpUpdate.update(client, url);
     } else if (url.startsWith("http")) {
@@ -111,20 +110,15 @@ void run_ota_update(String url, std::function<void()> callback_started,  std::fu
         ret = httpUpdate.update(client, url);
     } else {
         Logger.log(0, ELOG_LEVEL_ERROR, "URL is not valid: \n%s", url.c_str());
-        if (callback_error) callback_error(-1);
-        return;
     }
 
     switch (ret) {
         case HTTP_UPDATE_FAILED:
             Logger.log(0, ELOG_LEVEL_ERROR, "HTTP_UPDATE_FAILED Error (%d): %s\n", httpUpdate.getLastError(), httpUpdate.getLastErrorString().c_str());
-            // Don't restart ESP on HTTP errors, just return
-            if (callback_error) callback_error(httpUpdate.getLastError());
             break;
   
         case HTTP_UPDATE_NO_UPDATES:
             Logger.log(0, ELOG_LEVEL_ERROR, "HTTP_UPDATE_NO_UPDATES");
-            if (callback_error) callback_error(-2);
             break;
   
         case HTTP_UPDATE_OK:
@@ -142,12 +136,12 @@ void run_ota_spiffs_update(String url, std::function<void()> callback_started,
     httpUpdate.onError(callback_error);
     Logger.log(0, ELOG_LEVEL_DEBUG, "Defined callbacks, Starting update now");
 
-    t_httpUpdate_return ret = HTTP_UPDATE_FAILED;
+    t_httpUpdate_return ret;
 
     if (url.startsWith("https")) {
         Logger.log(0, ELOG_LEVEL_DEBUG, "HTTPS URL");
-        WiFiClientSecure client;
-        client.setInsecure();
+        WiFiClient client;
+        // client.setInsecure();
         ret = httpUpdate.updateSpiffs(client, url);
     } else if (url.startsWith("http")) {
         Logger.log(0, ELOG_LEVEL_DEBUG, "HTTP URL");
@@ -155,20 +149,15 @@ void run_ota_spiffs_update(String url, std::function<void()> callback_started,
         ret = httpUpdate.updateSpiffs(client, url);
     } else {
         Logger.log(0, ELOG_LEVEL_ERROR, "URL is not valid: \n%s", url.c_str());
-        if (callback_error) callback_error(-1);
-        return;
     }
 
     switch (ret) {
         case HTTP_UPDATE_FAILED:
             Logger.log(0, ELOG_LEVEL_ERROR, "HTTP_UPDATE_FAILED Error (%d): %s\n", httpUpdate.getLastError(), httpUpdate.getLastErrorString().c_str());
-            // Don't restart ESP on HTTP errors, just return
-            if (callback_error) callback_error(httpUpdate.getLastError());
             break;
   
         case HTTP_UPDATE_NO_UPDATES:
             Logger.log(0, ELOG_LEVEL_ERROR, "HTTP_UPDATE_NO_UPDATES");
-            if (callback_error) callback_error(-2);
             break;
   
         case HTTP_UPDATE_OK:

platformio.ini

@@ -34,8 +34,8 @@ extends = env:esp32_base
 lib_deps = 
 	${env:esp32_base.lib_deps}
 	INA233
-; upload_protocol = espota
-; upload_port = 192.168.18.18
+upload_protocol = espota
+upload_port = 192.168.18.18
 
 [env:ESP32_INA226]
 extends = env:esp32_base
@@ -43,7 +43,7 @@ lib_deps =
 	${env:esp32_base.lib_deps}
 	robtillaart/INA226@ ~0.6.4
 upload_protocol = espota
-upload_port = 192.168.18.18
+upload_port = 192.168.6.45
 build_flags = ${env:esp32_base.build_flags} -DUSE_INA226
 
 [env:native]

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

@@ -8,6 +8,6 @@
 #define water_level_max_key "water_level_max"
 #define water_volume_key "water_volume"
 #define current_software_version Version{2, 5, 0}
-#define REQUIRED_SPIFFS_VERSION Version{10, 0, 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); });
   
 
@@ -51,7 +54,7 @@ void setup_api_endpoints(){
         request->send(200, "application/json", output);
     });
 
-    server.on("/ota_update_status", HTTP_GET, [](AsyncWebServerRequest* request) {
+    server.on("/ota_udpate_status", HTTP_GET, [](AsyncWebServerRequest* request) {
       String output;
       serializeJson(build_ota_json(ota_status), output);
       request->send(200, "application/json", output);

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;
 
@@ -33,8 +33,6 @@ void init_sensor(){
         ina_sensor.setBusVoltageConversionTime(7);
         ina_sensor.setShuntVoltageConversionTime(7);
         ina_sensor.setAverage(4);
-        // 111 - Shunt + Bus continous
-        ina_sensor.setMode(7);
     #else
         ina_sensor.begin(33, 32);
         ina_sensor.reset();
@@ -54,6 +52,7 @@ void read_sensor_task(void* parameter)
         String chip_id = ina_sensor.get_device_model();
         LOG(ELOG_LEVEL_DEBUG, "Chip Model: %s", chip_id.c_str());
         #endif
+
         float bus_voltage = ina_sensor.getBusVoltage();
         float shunt_voltage = ina_sensor.getShuntVoltage_mV() - zero_value;
 
@@ -107,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;
-        water_data.liters = liters;
-        water_data.percentage = percentage_rounded;
+        // Create water data structure and update latest data
+        WaterData current_water_data;
+        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);
     }

src/tools/tools.cpp

@@ -49,11 +49,9 @@ void update_started() {
 }
 
 void update_finished() {
-  LOG(ELOG_LEVEL_DEBUG, "OTA Update finished, rebooting after 2 seconds");
+  LOG(ELOG_LEVEL_DEBUG, "OTA Update finished");
   ota_status.update_progress = -1;
   webSocket.textAll(String(-1).c_str());
-  delay(2000);
-  ESP.restart();
 }
 
 void update_progress(int cur, int total) {
@@ -104,6 +102,7 @@ void check_and_update_littleFS(OTA littlefs) {
     if (isVersionNewer(current_spiffs_version, REQUIRED_SPIFFS_VERSION) && isVersionNewer(current_spiffs_version, latest_fs_version.version)) {
       LOG(ELOG_LEVEL_DEBUG, "New SPIFFS version, running update now");
       run_ota_spiffs_update(latest_fs_version.url, update_started, update_finished, update_progress, update_error);
+      ESP.restart();
 
     // If we do not need a new version but one is available on the server
     } else if (isVersionNewer(REQUIRED_SPIFFS_VERSION, latest_fs_version.version)) {