stuff

test
fix ota upload
2025-11-05 22:41:54 +01:00 · 2025-11-05 22:20:33 +01:00 · 2025-11-05 22:08:42 +01:00 · 2025-11-05 20:33:26 +01:00 · 2025-11-05 19:17:56 +01:00 · 2025-11-05 19:17:49 +01:00
18 changed files with 102 additions and 116 deletions
--- a/.gitea/workflows/on_push.yaml
+++ b/.gitea/workflows/on_push.yaml
@@ -49,4 +49,4 @@ jobs:
        curl -X PUT \
          -H "Content-Type: application/octet-stream" \
          --data-binary @.pio/build/ESP32_INA233/littlefs.bin \
-          https://iot.tobiasmaier.me/filesystem/waterlevel/generic/${VERSION}
+          https://iot.tobiasmaier.me/filesystem/waterlevel/generic/${VERSION}.0.0
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,6 +1,4 @@
 {
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
    "recommendations": [
        "pioarduino.pioarduino-ide",
        "platformio.platformio-ide"
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -22,6 +22,53 @@
        "text_encoding": "cpp",
        "thread": "cpp",
        "*.inc": "cpp",
-        "cstddef": "cpp"
+        "cstddef": "cpp",
+        "iomanip": "cpp",
+        "sstream": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "charconv": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "condition_variable": "cpp",
+        "cstdarg": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "map": "cpp",
+        "set": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory_resource": "cpp",
+        "netfwd": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "ratio": "cpp",
+        "source_location": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "iosfwd": "cpp",
+        "limits": "cpp",
+        "new": "cpp",
+        "numbers": "cpp",
+        "semaphore": "cpp",
+        "stdexcept": "cpp",
+        "stop_token": "cpp",
+        "streambuf": "cpp",
+        "cinttypes": "cpp",
+        "typeinfo": "cpp",
+        "variant": "cpp"
    }
 }
--- a/data/logic.js
+++ b/data/logic.js
@@ -49,7 +49,7 @@ function fetchWaterData(gauge) {
 }

 function fetchUpdateData(gauge) {
-    const apiUrl = '/ota_udpate_status';
+    const apiUrl = '/ota_update_status';
    // Fetching data from the API
    fetch(apiUrl)
        .then(response => response.json())
--- a/data/update_progress.html
+++ b/data/update_progress.html
@@ -5,20 +5,8 @@
 </head>

 <body>
-    <div class="container">
-        <div class="card bd-success">
-            <header class="is-center">
-                <h4>Update running</h4>
-            </header>
-            <div class="is-center" id="progress">
-                Running update...
-            </div>
-        </div>
-    </div>
-</body>
-
-<script>
-    const webSocket = new WebSocket('webSocket://' + window.location.host + '/webSocket');
+  <script>
+    const webSocket = new WebSocket('ws://' + window.location.host + '/webSocket');

    webSocket.onopen = function() {
      console.log('WebSocket connection opened.');
@@ -32,7 +20,7 @@
        document.getElementById('progress').textContent = "Upgrade Done, wait for reboot...";

        const checkStatus = setInterval(() => {
-          fetch('/ota_udpate_status')
+          fetch('/ota_update_status')
            .then(response => {
              if (response.ok) {
                clearInterval(checkStatus);
@@ -56,3 +44,15 @@
      console.log('WebSocket connection closed.');
    };
  </script>
+    <div class="container">
+        <div class="card bd-success">
+            <header class="is-center">
+                <h4>Update running</h4>
+            </header>
+            <div class="is-center" id="progress">
+                Running update...
+            </div>
+        </div>
+    </div>
+</body>
+
--- a/data/version
+++ b/data/version
@@ -1 +1 @@
-9
+10
--- a/lib/fetchOTA/fetchOTA.cpp
+++ b/lib/fetchOTA/fetchOTA.cpp
@@ -90,6 +90,7 @@ Firmware OTA::createErrorResponse(const String& errorMsg) {

 void run_ota_update(String url, std::function<void()> callback_started,  std::function<void()> callback_finished, std::function<void(int, int)> callback_progress, std::function<void(int)> callback_error) {
    Logger.log(0, ELOG_LEVEL_DEBUG, "Starting OTA upgrade");
+    Logger.log(0, ELOG_LEVEL_DEBUG, "URL: %s", url);
    HTTPUpdate httpUpdate;
    httpUpdate.onStart(callback_started);
    httpUpdate.onEnd(callback_finished);
@@ -101,13 +102,14 @@ void run_ota_update(String url, std::function<void()> callback_started,  std::fu

    if (url.startsWith("https")) {
        Logger.log(0, ELOG_LEVEL_DEBUG, "HTTPS URL");
-        WiFiClient client;
-        // client.setInsecure();
-        ret = httpUpdate.update(client, url);
+        HTTPClient http_client;
+        http_client.begin(url);
+        ret = httpUpdate.update(http_client, url);
    } else if (url.startsWith("http")) {
        Logger.log(0, ELOG_LEVEL_DEBUG, "HTTP URL");
-        WiFiClient client;
-        ret = httpUpdate.update(client, url);
+        HTTPClient http_client;
+        http_client.begin(url);
+        ret = httpUpdate.update(http_client, url);
    } else {
        Logger.log(0, ELOG_LEVEL_ERROR, "URL is not valid: \n%s", url.c_str());
    }
@@ -140,13 +142,15 @@ void run_ota_spiffs_update(String url, std::function<void()> callback_started,

    if (url.startsWith("https")) {
        Logger.log(0, ELOG_LEVEL_DEBUG, "HTTPS URL");
-        WiFiClient client;
+        HTTPClient http_client;
+        http_client.begin(url);
        // client.setInsecure();
-        ret = httpUpdate.updateSpiffs(client, url);
+        ret = httpUpdate.updateSpiffs(http_client, url);
    } else if (url.startsWith("http")) {
        Logger.log(0, ELOG_LEVEL_DEBUG, "HTTP URL");
-        WiFiClient client;
-        ret = httpUpdate.updateSpiffs(client, url);
+        HTTPClient http_client;
+        http_client.begin(url);
+        ret = httpUpdate.updateSpiffs(http_client, url);
    } else {
        Logger.log(0, ELOG_LEVEL_ERROR, "URL is not valid: \n%s", url.c_str());
    }
--- a/platformio.ini
+++ b/platformio.ini
@@ -35,7 +35,7 @@ lib_deps =
 	${env:esp32_base.lib_deps}
 	INA233
 upload_protocol = espota
-upload_port = 192.168.18.18
+upload_port = 192.168.5.205

 [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.6.45
+upload_port = 192.168.6.46
 build_flags = ${env:esp32_base.build_flags} -DUSE_INA226

 [env:native]
--- a/src/external_interfacing/leds.cpp
+++ b/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)
 {
--- a/src/global_data/defines.h
+++ b/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, 5, 0}
-#define REQUIRED_SPIFFS_VERSION Version{9, 0, 0}
+#define current_software_version Version{2, 4, 0}
+#define REQUIRED_SPIFFS_VERSION Version{10, 0, 0}

 #define RESISTOR_VALUE 4
--- a/src/global_data/global_data.cpp
+++ b/src/global_data/global_data.cpp
@@ -5,6 +5,7 @@ NetworkData ethernet_data;
 DeviceTelemetry telemetry;

 SensorData shunt_data;
+WaterData water_data;

 OTAStatus ota_status;

--- a/src/global_data/water_data_queue.cpp
+++ b/src/global_data/water_data_queue.cpp
@@ -1,39 +0,0 @@
-#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;
-}
--- a/src/global_data/water_data_queue.h
+++ b/src/global_data/water_data_queue.h
@@ -1,16 +0,0 @@
-#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);
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -13,7 +13,6 @@
 #include <ArduinoOTA.h>

 #include "global_data/defines.h"
-#include "global_data/water_data_queue.h"

 #include "networking/networking.h"

@@ -33,6 +32,7 @@

 Preferences prefs;

+extern WaterData water_data;
 extern DeviceTelemetry telemetry;
 extern NetworkData wifi_data;
 extern NetworkData ethernet_data;
@@ -60,9 +60,6 @@ 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);

--- a/src/networking/json_builder.cpp
+++ b/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;
--- a/src/networking/responses.cpp
+++ b/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,21 +25,18 @@ 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(current_water_data), output);
+      serializeJson(build_water_data_json(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 = String(current_water_data.percentage);
+      output = 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 = String(current_water_data.level);
+      output = water_data.level;
      request->send(200, "text/raw", output); });
  

@@ -54,7 +51,7 @@ void setup_api_endpoints(){
        request->send(200, "application/json", output);
    });

-    server.on("/ota_udpate_status", HTTP_GET, [](AsyncWebServerRequest* request) {
+    server.on("/ota_update_status", HTTP_GET, [](AsyncWebServerRequest* request) {
      String output;
      serializeJson(build_ota_json(ota_status), output);
      request->send(200, "application/json", output);
@@ -73,7 +70,7 @@ void setup_api_endpoints(){
        .ota_status = ota_status
      };

-      xTaskCreate(run_ota_update_task, "RunOTAUpdate", 1024 * 8, (void *)&args, 1, NULL);
+      xTaskCreate(run_ota_update_task, "RunOTAUpdate", 1024 * 12, (void *)&args, 1, NULL);
      request->send(LittleFS, "/update_progress.html", "text/html", false, processor);
    });
 }
--- a/src/sensor/sensor.cpp
+++ b/src/sensor/sensor.cpp
@@ -3,7 +3,6 @@
 #include <Elog.h>
 #include "Wire.h"
 #include "../global_data/global_data.h"
-#include "../global_data/water_data_queue.h"


 #ifdef USE_INA226
@@ -19,6 +18,7 @@ INA233 ina_sensor(0x40);
 #include "freertos/task.h"

 extern Preferences prefs;
+extern WaterData water_data;
 extern ActiveErrors active_errors;
 extern SensorData shunt_data;

@@ -106,14 +106,9 @@ void read_sensor_task(void* parameter)
        shunt_data.shunt_voltage = shunt_voltage;
        shunt_data.shunt_current = shunt_current;

-        // 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);
+        water_data.level = cm_over_zero;
+        water_data.liters = liters;
+        water_data.percentage = percentage_rounded;

        delay(20000);
    }
--- a/src/tools/tools.cpp
+++ b/src/tools/tools.cpp
@@ -66,7 +66,7 @@ void update_progress(int cur, int total) {

 void update_error(int err) {
  LOG(ELOG_LEVEL_ERROR, "OTA Update error: %d", err);
-  ota_status.update_progress = -2;
+  ota_status.update_progress = -1;
 }

 void check_update_task(void* parameter) {
@@ -155,7 +155,9 @@ bool check_for_internet_connection() {
 void run_ota_update_task(void* parameter) {
  TaskArgs_t *args = (TaskArgs_t *) parameter;
  LOG(ELOG_LEVEL_DEBUG, "Running OTA upgrade now with URL: %s", args->ota_status.update_url.c_str());
-  run_ota_update(args->ota_status.update_url, update_started, update_finished, update_progress, update_error);
+  String ota_url = args->ota_status.update_url;
+  Serial.println(ota_url);
+  run_ota_update(ota_url, update_started, update_finished, update_progress, update_error);
  vTaskDelete(NULL);
 }
Author	SHA1	Message	Date
tobimai	b68e775350	stuff All checks were successful Compilie project and upload binaries / test (push) Successful in 3m59s Details	2025-11-05 22:41:54 +01:00
tobimai	7e30340e93	test All checks were successful Compilie project and upload binaries / test (push) Successful in 4m1s Details	2025-11-05 22:20:33 +01:00
tobimai	3dc339c449	fix ota upload All checks were successful Compilie project and upload binaries / test (push) Successful in 3m59s Details	2025-11-05 22:08:42 +01:00
Tobias Maier	53920dbb77	Merge pull request 'rev2' (#4 ) from rev2 into main All checks were successful Compilie project and upload binaries / test (push) Successful in 4m1s Details Reviewed-on: #4	2025-11-05 20:33:26 +01:00
Tobias Maier	dbb32efda8	Merge pull request 'rev2' (#3 ) from rev2 into main All checks were successful Compilie project and upload binaries / test (push) Successful in 3m57s Details Reviewed-on: #3	2025-11-05 19:17:56 +01:00
Tobias Maier	7542d44e21	revert `df06be23cb` Some checks failed Test compiling project / test (push) Failing after 0s Details revert Fix image pull URL	2025-11-05 19:17:49 +01:00
Tobias Maier	df06be23cb	Fix image pull URL Some checks failed Test compiling project / test (push) Failing after 59s Details	2025-11-02 15:45:40 +01:00