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:a0240d744cb90f8ac6fc673371c35e18276d0d56
Branches Tags
tobimai:rev2 tobimai:vibe tobimai:main
tobimai:old-rev1-hardware

1 Commits
main ... a0240d744c

Author SHA1 Message Date
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 104 additions and 101 deletions
Expand all files Collapse all files

2
.gitea/workflows/on_push.yaml
View File

@@ -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}.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": [
"pioarduino.pioarduino-ide",
"platformio.platformio-ide"

49
.vscode/settings.json vendored
View File

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

2
data/logic.js
View File

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

32
data/update_progress.html
View File

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

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) {
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);
@@ -102,14 +101,13 @@ 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");
HTTPClient http_client;
http_client.begin(url);
ret = httpUpdate.update(http_client, url);
WiFiClient client;
// client.setInsecure();
ret = httpUpdate.update(client, url);
} else if (url.startsWith("http")) {
Logger.log(0, ELOG_LEVEL_DEBUG, "HTTP URL");
HTTPClient http_client;
http_client.begin(url);
ret = httpUpdate.update(http_client, url);
WiFiClient client;
ret = httpUpdate.update(client, url);
} else {
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")) {
Logger.log(0, ELOG_LEVEL_DEBUG, "HTTPS URL");
HTTPClient http_client;
http_client.begin(url);
WiFiClient client;
// client.setInsecure();
ret = httpUpdate.updateSpiffs(http_client, url);
ret = httpUpdate.updateSpiffs(client, url);
} else if (url.startsWith("http")) {
Logger.log(0, ELOG_LEVEL_DEBUG, "HTTP URL");
HTTPClient http_client;
http_client.begin(url);
ret = httpUpdate.updateSpiffs(http_client, url);
WiFiClient client;
ret = httpUpdate.updateSpiffs(client, url);
} else {
Logger.log(0, ELOG_LEVEL_ERROR, "URL is not valid: \n%s", url.c_str());
}

2
platformio.ini
View File

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

2
src/external_interfacing/leds.cpp
View File

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

4
src/global_data/defines.h
View File

@@ -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, 4, 0}
#define REQUIRED_SPIFFS_VERSION Version{10, 0, 0}
#define current_software_version Version{2, 2, 0}
#define REQUIRED_SPIFFS_VERSION Version{9, 0, 0}
#define RESISTOR_VALUE 4

1
src/global_data/global_data.cpp
View File

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

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

@@ -0,0 +1,30 @@
#include "water_data_queue.h"
#include <Arduino.h>
QueueHandle_t waterDataQueue = nullptr;
void initWaterDataQueue() {
// Create queue that can hold 5 WaterData structures
waterDataQueue = xQueueCreate(5, sizeof(WaterData));
if (waterDataQueue == nullptr) {
Serial.println("Failed to create water data queue");
}
}
WaterData getLatestWaterData() {
WaterData latestData;
// Try to receive the latest data without blocking
if (xQueueReceive(waterDataQueue, &latestData, 0) == pdPASS) {
// Put the data back in the queue so other consumers can get it too
xQueueSendToBack(waterDataQueue, &latestData, 0);
return latestData;
}
// Return default values if queue is empty
latestData.level = 0.0f;
latestData.liters = 0.0f;
latestData.percentage = 0.0f;
return latestData;
}

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

@@ -0,0 +1,12 @@
#pragma once
#include "global_data.h"
#include "freertos/queue.h"
// Create a queue handle for WaterData
extern QueueHandle_t waterDataQueue;
// Initialize the water data queue
void initWaterDataQueue();
// Helper function to get latest water data
WaterData getLatestWaterData();

5
src/main.cpp
View File

@@ -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 Queue");
initWaterDataQueue();
LOG(ELOG_LEVEL_DEBUG, "Beginning LittleFS");
LittleFS.begin(FORMAT_LITTLEFS_IF_FAILED);

2
src/networking/json_builder.cpp
View File

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

15
src/networking/responses.cpp
View File

@@ -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);
@@ -70,7 +73,7 @@ void setup_api_endpoints(){
.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);
});
}

15
src/sensor/sensor.cpp
View File

@@ -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,16 @@ 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 send to queue
WaterData current_water_data;
current_water_data.level = cm_over_zero;
current_water_data.liters = liters;
current_water_data.percentage = percentage_rounded;
// Send to queue, don't block if queue is full
if (waterDataQueue != nullptr) {
xQueueSendToBack(waterDataQueue, &current_water_data, 0);
}
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) {
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) {
@@ -155,9 +155,7 @@ 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());
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);
run_ota_update(args->ota_status.update_url, update_started, update_finished, update_progress, update_error);
vTaskDelete(NULL);
}