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

Moved a lot of global vars to queues
Test project compilation / test (push) Successful in 3m52s
Details

Browse Source
This commit is contained in:
Tobias Maier
2026-04-01 20:11:53 +02:00
parent f1d9abc4c7
commit d337784faa
15 changed files with 512 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+81 -56
View File
@@ -12,6 +12,7 @@
#include <ArduinoOTA.h>
#include "global_data/defines.h"
#include "global_data/global_data.h"
#include "networking/networking.h"
#include "networking/webserver.h"
@@ -25,31 +26,41 @@
#include <fetchOTA.h>
#include "time.h"
#include "tools/log.h"
#include "tools/ota_handler.h"
#include <LittleFS.h>
#include "esp_heap_caps.h"
#define MYLOG 0
Preferences prefs;
extern DeviceTelemetry telemetry;
extern NetworkData wifi_data;
extern NetworkData ethernet_data;
extern SensorData shunt_data;
extern ActiveErrors active_errors;
extern AsyncWebSocket webSocket;
Version current_spiffs_version;
// Variable to store the current state of the system
CurrentState current_state = {
{-999.0f, -999.0f, -999.0f},
{-999.0f, -999.0f, -999.0f},
{"0.0.0.0", false, -999.0f, "UNKNOWN"}, // wifiData
{"0.0.0.0", false, -999.0f, "UNKNOWN"}, // ethernetData
{-999.0f, -999, -999.0f},
{false, {0, 0, 0}, {0, 0, 0}, -999, "UNKNOWN"},
{false, false, false, false, false, false}
};
#define FORMAT_LITTLEFS_IF_FAILED true
// Queue for sending data from producers to the processor in main
QueueHandle_t dataQueue = xQueueCreate(5, sizeof(DataMessage));
// Queue for sending data from processor to different tasks
QueueHandle_t stateForWebserverQueue = xQueueCreate(2, sizeof(CurrentState));
void setup()
{
Logger.registerSerial(MYLOG, ELOG_LEVEL_DEBUG, "Serial");
LOG(ELOG_LEVEL_DEBUG, "Init LEDs");
led_setup();
LOG(ELOG_LEVEL_DEBUG, "Init Starting prefs and Serial output");
prefs.begin("waterlevel", false);
Serial.begin(115200);
@@ -72,61 +83,75 @@ void setup()
LOG(ELOG_LEVEL_DEBUG, "Current LittleFS Version: %d.%d.%d", current_spiffs_version.major, current_spiffs_version.minor, current_spiffs_version.patch);
}
LOG(ELOG_LEVEL_DEBUG, "LittleFS initialized");
/////////////////////////////// ROUTES ///////////////////////////////
LOG(ELOG_LEVEL_DEBUG, "Route Setup");
LOG(ELOG_LEVEL_DEBUG, "OTA Setup");
ArduinoOTA
.onStart([]() {
String type;
if (ArduinoOTA.getCommand() == U_FLASH)
type = "sketch";
else // U_SPIFFS
type = "filesystem";
// NOTE: if updating SPIFFS this would be the place to unmount SPIFFS using SPIFFS.end()
LOG(ELOG_LEVEL_DEBUG, "Start updating %s", type); })
.onEnd([]() { LOG(ELOG_LEVEL_DEBUG, "\nEnd"); })
.onProgress([](unsigned int progress, unsigned int total) { Serial.printf("Progress: %u%%\r", (progress / (total / 100))); })
.onError([](ota_error_t error) {
Serial.printf("Error[%u]: ", error);
if (error == OTA_AUTH_ERROR) LOG(ELOG_LEVEL_DEBUG, "Auth Failed");
else if (error == OTA_BEGIN_ERROR) LOG(ELOG_LEVEL_DEBUG, "Begin Failed");
else if (error == OTA_CONNECT_ERROR) LOG(ELOG_LEVEL_DEBUG, "Connect Failed");
else if (error == OTA_RECEIVE_ERROR) LOG(ELOG_LEVEL_DEBUG, "Receive Failed");
else if (error == OTA_END_ERROR) LOG(ELOG_LEVEL_DEBUG, "End Failed"); });
LOG(ELOG_LEVEL_DEBUG, "Starting main tasks");
// Create a queue for water data communication between sensor and webserver tasks
QueueHandle_t webserverWaterDataQueue = xQueueCreate(10, sizeof(WaterData));
if (webserverWaterDataQueue == NULL) {
LOG(ELOG_LEVEL_ERROR, "Failed to create webserver water data queue");
if (dataQueue == NULL) {
LOG(ELOG_LEVEL_ERROR, "Failed to create data queue");
} else {
xTaskCreate(ethernet_task, "EthernetTask", 4096, NULL, 1, NULL);
xTaskCreate(wifi_task, "WiFiTask", 10000, NULL, 1, NULL);
xTaskCreate(read_sensor_task, "ReadSensorTask", 1024 * 4, webserverWaterDataQueue, 1, NULL);
xTaskCreate(collect_internal_telemetry_task, "InternalTelemetryTask", 2048, NULL, 1, NULL);
xTaskCreate(display_task, "DisplayTask", 10000, NULL, 1, NULL);
xTaskCreate(get_time_task, "GetTimeTask", 1024 * 4, NULL, 1, NULL);
xTaskCreate(ethernet_task, "EthernetTask", 1024 * 4, dataQueue, 1, NULL);
xTaskCreate(wifi_task, "WiFiTask", 1024 * 4, dataQueue, 1, NULL);
xTaskCreate(read_sensor_task, "ReadSensorTask", 1024 * 4, dataQueue, 1, NULL);
xTaskCreate(collect_internal_telemetry_task, "InternalTelemetryTask", 1024 * 2, dataQueue, 1, NULL);
xTaskCreate(display_task, "DisplayTask", 1024 * 2, NULL, 1, NULL);
xTaskCreate(get_time_task, "GetTimeTask", 1024 * 2, NULL, 1, NULL);
delay(5000);
xTaskCreate(check_update_task, "CheckUpdateTask", 1024 * 8, NULL, 1, NULL);
xTaskCreate(webserver_task, "WebServerTask", 1024 * 8, webserverWaterDataQueue, 1, NULL);
xTaskCreate(check_update_task, "CheckUpdateTask", 1024 * 6, NULL, 1, NULL);
xTaskCreate(webserver_task, "WebServerTask", 1024 * 4, stateForWebserverQueue, 1, NULL);
xTaskCreate(ota_handler_task, "OTAHandlerTask", 1024 * 4, NULL, 3, NULL);
}
LOG(ELOG_LEVEL_DEBUG, "Starting OTA handler");
ArduinoOTA.begin();
}
void loop()
{
ArduinoOTA.handle();
size_t free_heap = heap_caps_get_free_size(MALLOC_CAP_8BIT);
Serial.println(free_heap);
// Check if there is new data in the queue
DataMessage dataMessage;
if (xQueueReceive(dataQueue, &dataMessage, portMAX_DELAY) == pdTRUE) {
// Decode the data based on its type and update the current state
switch (dataMessage.type) {
case DATA_TYPE_WATER:
current_state.waterData = dataMessage.data.waterData;
LOG(ELOG_LEVEL_DEBUG, "Received water data: level=%F, liters=%F, percentage=%F",
current_state.waterData.level, current_state.waterData.liters, current_state.waterData.percentage);
break;
case DATA_TYPE_SENSOR:
current_state.sensorData = dataMessage.data.sensorData;
LOG(ELOG_LEVEL_DEBUG, "Received sensor data: bus_voltage=%F, shunt_voltage=%F, shunt_current=%F",
current_state.sensorData.bus_voltage, current_state.sensorData.shunt_voltage, current_state.sensorData.shunt_current);
break;
case DATA_TYPE_WIFI:
current_state.wifiData = dataMessage.data.networkData;
LOG(ELOG_LEVEL_DEBUG, "Received WiFi data: ip=%s, link=%d, rssi=%F, name=%s",
current_state.wifiData.ip_address, current_state.wifiData.link,
current_state.wifiData.rssi, current_state.wifiData.network_name);
break;
case DATA_TYPE_ETHERNET:
current_state.ethernetData = dataMessage.data.networkData;
LOG(ELOG_LEVEL_DEBUG, "Received Ethernet data: ip=%s, link=%d, rssi=%F, name=%s",
current_state.ethernetData.ip_address, current_state.ethernetData.link,
current_state.ethernetData.rssi, current_state.ethernetData.network_name);
break;
case DATA_TYPE_TELEMETRY:
current_state.telemetryData = dataMessage.data.telemetryData;
LOG(ELOG_LEVEL_DEBUG, "Received telemetry data: heap=%F, uptime=%d, temperature=%F",
current_state.telemetryData.heap_used_percent, current_state.telemetryData.uptime_seconds,
current_state.telemetryData.temperature);
break;
default:
LOG(ELOG_LEVEL_ERROR, "Unknown data type received");
break;
}
// Send the updated current_state to the webserver queue
if (xQueueSendToBack(stateForWebserverQueue, &current_state, 250 / portTICK_PERIOD_MS) != pdTRUE) {
LOG(ELOG_LEVEL_ERROR, "Failed to send current_state to webserver queue");
}
} else {
LOG(ELOG_LEVEL_WARNING, "No message received within max wait");
}
delay(1000);
}