tobimai/waterlevel-software
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Compare commits

base: tobimai:main
Branches Tags
tobimai:main tobimai:rev2 tobimai:vibe
tobimai:old-rev1-hardware
..
compare: tobimai:vibe
Branches Tags
tobimai:rev2 tobimai:vibe tobimai:main
tobimai:old-rev1-hardware

3 Commits
main ... vibe

Author SHA1 Message Date
Tobias Maier
f5acbe35cf version bump
All checks were successful
Test project compilation / test (push) Successful in 3m30s
Details
2026-03-25 20:53:39 +01:00
Tobias Maier
aebce5ac44 fix water 2026-03-25 20:52:23 +01:00
Tobias Maier
a0240d744c Switched waterlevel to queue
All checks were successful
Test project compilation / test (push) Successful in 3m51s
Details
2026-03-25 20:26:57 +01:00
18 changed files with 116 additions and 102 deletions
Expand all files Collapse all files

2
.gitea/workflows/on_push.yaml
View File

@@ -49,4 +49,4 @@ jobs:
curl -X PUT \ curl -X PUT \
-H "Content-Type: application/octet-stream" \ -H "Content-Type: application/octet-stream" \
--data-binary @.pio/build/ESP32_INA233/littlefs.bin \ --data-binary @.pio/build/ESP32_INA233/littlefs.bin \
https://iot.tobiasmaier.me/filesystem/waterlevel/generic/${VERSION}.0.0 https://iot.tobiasmaier.me/filesystem/waterlevel/generic/${VERSION}

2
.vscode/extensions.json vendored
View File

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

49
.vscode/settings.json vendored
View File

@@ -22,53 +22,6 @@
"text_encoding": "cpp", "text_encoding": "cpp",
"thread": "cpp", "thread": "cpp",
"*.inc": "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"
} }
} }

2
data/logic.js
View File

@@ -49,7 +49,7 @@ function fetchWaterData(gauge) {
} }
function fetchUpdateData(gauge) { function fetchUpdateData(gauge) {
const apiUrl = '/ota_update_status'; const apiUrl = '/ota_udpate_status';
// Fetching data from the API // Fetching data from the API
fetch(apiUrl) fetch(apiUrl)
.then(response => response.json()) .then(response => response.json())

32
data/update_progress.html
View File

@@ -5,8 +5,20 @@
</head> </head>
<body> <body>
<script> <div class="container">
const webSocket = new WebSocket('ws://' + window.location.host + '/webSocket'); <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');
webSocket.onopen = function() { webSocket.onopen = function() {
console.log('WebSocket connection opened.'); console.log('WebSocket connection opened.');
@@ -20,7 +32,7 @@
document.getElementById('progress').textContent = "Upgrade Done, wait for reboot..."; document.getElementById('progress').textContent = "Upgrade Done, wait for reboot...";
const checkStatus = setInterval(() => { const checkStatus = setInterval(() => {
fetch('/ota_update_status') fetch('/ota_udpate_status')
.then(response => { .then(response => {
if (response.ok) { if (response.ok) {
clearInterval(checkStatus); clearInterval(checkStatus);
@@ -43,16 +55,4 @@
webSocket.onclose = function() { webSocket.onclose = function() {
console.log('WebSocket connection closed.'); console.log('WebSocket connection closed.');
}; };
</script> </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>

2
data/version
View File

@@ -1 +1 @@
10 9

22
lib/fetchOTA/fetchOTA.cpp
View File

@@ -90,7 +90,6 @@ 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) { 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, "Starting OTA upgrade");
Logger.log(0, ELOG_LEVEL_DEBUG, "URL: %s", url);
HTTPUpdate httpUpdate; HTTPUpdate httpUpdate;
httpUpdate.onStart(callback_started); httpUpdate.onStart(callback_started);
httpUpdate.onEnd(callback_finished); httpUpdate.onEnd(callback_finished);
@@ -102,14 +101,13 @@ void run_ota_update(String url, std::function<void()> callback_started, std::fu
if (url.startsWith("https")) { if (url.startsWith("https")) {
Logger.log(0, ELOG_LEVEL_DEBUG, "HTTPS URL"); Logger.log(0, ELOG_LEVEL_DEBUG, "HTTPS URL");
HTTPClient http_client; WiFiClient client;
http_client.begin(url); // client.setInsecure();
ret = httpUpdate.update(http_client, url); ret = httpUpdate.update(client, url);
} else if (url.startsWith("http")) { } else if (url.startsWith("http")) {
Logger.log(0, ELOG_LEVEL_DEBUG, "HTTP URL"); Logger.log(0, ELOG_LEVEL_DEBUG, "HTTP URL");
HTTPClient http_client; WiFiClient client;
http_client.begin(url); ret = httpUpdate.update(client, url);
ret = httpUpdate.update(http_client, url);
} else { } else {
Logger.log(0, ELOG_LEVEL_ERROR, "URL is not valid: \n%s", url.c_str()); Logger.log(0, ELOG_LEVEL_ERROR, "URL is not valid: \n%s", url.c_str());
} }
@@ -142,15 +140,13 @@ void run_ota_spiffs_update(String url, std::function<void()> callback_started,
if (url.startsWith("https")) { if (url.startsWith("https")) {
Logger.log(0, ELOG_LEVEL_DEBUG, "HTTPS URL"); Logger.log(0, ELOG_LEVEL_DEBUG, "HTTPS URL");
HTTPClient http_client; WiFiClient client;
http_client.begin(url);
// client.setInsecure(); // client.setInsecure();
ret = httpUpdate.updateSpiffs(http_client, url); ret = httpUpdate.updateSpiffs(client, url);
} else if (url.startsWith("http")) { } else if (url.startsWith("http")) {
Logger.log(0, ELOG_LEVEL_DEBUG, "HTTP URL"); Logger.log(0, ELOG_LEVEL_DEBUG, "HTTP URL");
HTTPClient http_client; WiFiClient client;
http_client.begin(url); ret = httpUpdate.updateSpiffs(client, url);
ret = httpUpdate.updateSpiffs(http_client, url);
} else { } else {
Logger.log(0, ELOG_LEVEL_ERROR, "URL is not valid: \n%s", url.c_str()); Logger.log(0, ELOG_LEVEL_ERROR, "URL is not valid: \n%s", url.c_str());
} }

4
platformio.ini
View File

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

2
src/external_interfacing/leds.cpp
View File

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

4
src/global_data/defines.h
View File

@@ -7,7 +7,7 @@
#define water_level_min_key "water_level_min" #define water_level_min_key "water_level_min"
#define water_level_max_key "water_level_max" #define water_level_max_key "water_level_max"
#define water_volume_key "water_volume" #define water_volume_key "water_volume"
#define current_software_version Version{2, 4, 0} #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 #define RESISTOR_VALUE 4

1
src/global_data/global_data.cpp
View File

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

39
src/global_data/water_data_queue.cpp Normal file
View File

@@ -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;
}

16
src/global_data/water_data_queue.h Normal file
View File

@@ -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);

5
src/main.cpp
View File

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

2
src/networking/json_builder.cpp
View File

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

15
src/networking/responses.cpp
View File

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

13
src/sensor/sensor.cpp
View File

@@ -3,6 +3,7 @@
#include <Elog.h> #include <Elog.h>
#include "Wire.h" #include "Wire.h"
#include "../global_data/global_data.h" #include "../global_data/global_data.h"
#include "../global_data/water_data_queue.h"
#ifdef USE_INA226 #ifdef USE_INA226
@@ -18,7 +19,6 @@ INA233 ina_sensor(0x40);
#include "freertos/task.h" #include "freertos/task.h"
extern Preferences prefs; extern Preferences prefs;
extern WaterData water_data;
extern ActiveErrors active_errors; extern ActiveErrors active_errors;
extern SensorData shunt_data; extern SensorData shunt_data;
@@ -106,9 +106,14 @@ void read_sensor_task(void* parameter)
shunt_data.shunt_voltage = shunt_voltage; shunt_data.shunt_voltage = shunt_voltage;
shunt_data.shunt_current = shunt_current; 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); delay(20000);
} }

6
src/tools/tools.cpp
View File

@@ -66,7 +66,7 @@ void update_progress(int cur, int total) {
void update_error(int err) { void update_error(int err) {
LOG(ELOG_LEVEL_ERROR, "OTA Update error: %d", err); LOG(ELOG_LEVEL_ERROR, "OTA Update error: %d", err);
ota_status.update_progress = -1; ota_status.update_progress = -2;
} }
void check_update_task(void* parameter) { void check_update_task(void* parameter) {
@@ -155,9 +155,7 @@ bool check_for_internet_connection() {
void run_ota_update_task(void* parameter) { void run_ota_update_task(void* parameter) {
TaskArgs_t *args = (TaskArgs_t *) 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()); LOG(ELOG_LEVEL_DEBUG, "Running OTA upgrade now with URL: %s", args->ota_status.update_url.c_str());
String ota_url = args->ota_status.update_url; run_ota_update(args->ota_status.update_url, update_started, update_finished, update_progress, update_error);
Serial.println(ota_url);
run_ota_update(ota_url, update_started, update_finished, update_progress, update_error);
vTaskDelete(NULL); vTaskDelete(NULL);
} }