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

Webserver prefs via queues

Browse Source
This commit is contained in:
tobimai
2026-05-24 16:22:07 +02:00
parent b8d5ba041b
commit 31acd5d5ec
5 changed files with 160 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+55 -4
View File
@@ -56,6 +56,9 @@ QueueHandle_t dataQueue = xQueueCreate(5, sizeof(DataMessage));
// Queue for sending data from processor to different tasks
QueueHandle_t stateForWebserverQueue = xQueueCreate(2, sizeof(CurrentState));
// Queue for sending preferences from main to webserver
QueueHandle_t prefsForWebserverQueue = xQueueCreate(2, sizeof(DataMessage));
void setup()
{
Logger.registerSerial(MYLOG, ELOG_LEVEL_DEBUG, "Serial");
@@ -63,6 +66,26 @@ void setup()
prefs.begin("waterlevel", false);
Serial.begin(115200);
// Read initial preferences and send to webserver
if (prefsForWebserverQueue != NULL) {
DataMessage prefsMessage;
prefsMessage.type = DATA_TYPE_PREFERENCES;
prefsMessage.data.preferencesData.level_sensor_range = prefs.getFloat(level_sensor_range_key, 200);
prefsMessage.data.preferencesData.water_level_min = prefs.getFloat(water_level_min_key, 0);
prefsMessage.data.preferencesData.water_level_max = prefs.getFloat(water_level_max_key, 200);
prefsMessage.data.preferencesData.water_volume = prefs.getFloat(water_volume_key, 10000.0f);
strncpy(prefsMessage.data.preferencesData.ssid, prefs.getString(ssid_key, "").c_str(), sizeof(prefsMessage.data.preferencesData.ssid) - 1);
prefsMessage.data.preferencesData.ssid[sizeof(prefsMessage.data.preferencesData.ssid) - 1] = '\0';
strncpy(prefsMessage.data.preferencesData.wifi_password, prefs.getString(wifi_password_key, "").c_str(), sizeof(prefsMessage.data.preferencesData.wifi_password) - 1);
prefsMessage.data.preferencesData.wifi_password[sizeof(prefsMessage.data.preferencesData.wifi_password) - 1] = '\0';
if (xQueueSend(prefsForWebserverQueue, &prefsMessage, 100 / portTICK_PERIOD_MS) != pdTRUE) {
LOG(ELOG_LEVEL_ERROR, "Failed to send initial preferences to webserver queue");
} else {
LOG(ELOG_LEVEL_DEBUG, "Sent initial preferences to webserver");
}
}
LOG(ELOG_LEVEL_DEBUG, "Beginning LittleFS");
LittleFS.begin(FORMAT_LITTLEFS_IF_FAILED);
@@ -90,7 +113,13 @@ void setup()
xTaskCreate(display_task, "DisplayTask", 1024 * 2, NULL, 1, NULL);
xTaskCreate(get_time_task, "GetTimeTask", 1024 * 2, NULL, 1, NULL);
xTaskCreate(check_update_task, "CheckUpdateTask", 1024 * 6, dataQueue, 1, NULL);
xTaskCreate(webserver_task, "WebServerTask", 1024 * 4, stateForWebserverQueue, 1, NULL);
// Create webserver queues struct
WebserverQueues webserverQueues = {
.stateQueue = stateForWebserverQueue,
.dataQueue = dataQueue,
.prefsQueue = prefsForWebserverQueue
};
xTaskCreate(webserver_task, "WebServerTask", 1024 * 4, &webserverQueues, 1, NULL);
xTaskCreate(ota_handler_task, "OTAHandlerTask", 1024 * 4, NULL, 3, NULL);
}
}
@@ -140,13 +169,35 @@ void loop()
current_state.otaStatus.current_version.major, current_state.otaStatus.current_version.minor, current_state.otaStatus.current_version.patch,
current_state.otaStatus.latest_version.major, current_state.otaStatus.latest_version.minor, current_state.otaStatus.latest_version.patch);
break;
case DATA_TYPE_PREFERENCES:
// Store preferences in flash and forward to webserver
LOG(ELOG_LEVEL_DEBUG, "Received preference update request");
// Write to preferences storage
prefs.putFloat(level_sensor_range_key, dataMessage.data.preferencesData.level_sensor_range);
prefs.putFloat(water_level_min_key, dataMessage.data.preferencesData.water_level_min);
prefs.putFloat(water_level_max_key, dataMessage.data.preferencesData.water_level_max);
prefs.putFloat(water_volume_key, dataMessage.data.preferencesData.water_volume);
prefs.putString(ssid_key, dataMessage.data.preferencesData.ssid);
prefs.putString(wifi_password_key, dataMessage.data.preferencesData.wifi_password);
// Forward to webserver so it can update its local copy
if (prefsForWebserverQueue != NULL) {
if (xQueueSend(prefsForWebserverQueue, &dataMessage, 100 / portTICK_PERIOD_MS) != pdTRUE) {
LOG(ELOG_LEVEL_ERROR, "Failed to forward preferences to webserver queue");
}
}
LOG(ELOG_LEVEL_DEBUG, "Stored preferences and forwarded to webserver");
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");
// Send the updated current_state to the webserver queue (for non-preference messages)
if (dataMessage.type != DATA_TYPE_PREFERENCES) {
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");