Obbart/AstroRotaxMonitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor variables and LittleFS mount

Browse Source
This commit is contained in:
Emanuele Trabattoni
2026-04-09 10:23:57 +02:00
parent 97bce90ba6
commit de9ffe40e5
4 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Datasheet/be729405d0b0e6411fd7e01e69acec34184d17a9e57c43ec413389783c890f71_optim.pdf Normal file
View File

Binary file not shown.

2
RotaxMonitor/src/datasave.cpp
View File

@@ -124,7 +124,7 @@ void saveHistoryTask(void *pvParameters)
void save_history(const PSRAMVector<ignitionBoxStatus> &history, const std::filesystem::path &file_name) void save_history(const PSRAMVector<ignitionBoxStatus> &history, const std::filesystem::path &file_name)
{ {
// Initialize SPIFFS // Initialize SPIFFS
if (!SAVE_HISTORY_TO_SPIFFS) if (!SAVE_HISTORY_TO_LITTLEFS)
return; return;
// auto spiffs_guard = LITTLEFSGuard(); // use RAII guard to ensure SPIFFS is properly mounted and unmounted // auto spiffs_guard = LITTLEFSGuard(); // use RAII guard to ensure SPIFFS is properly mounted and unmounted

2
RotaxMonitor/src/datasave.h
View File

@@ -15,7 +15,7 @@
#include "psvector.h" #include "psvector.h"
const uint32_t max_history = 256; const uint32_t max_history = 256;
const bool SAVE_HISTORY_TO_SPIFFS = false; // Set to true to enable saving history to SPIFFS, false to disable const bool SAVE_HISTORY_TO_LITTLEFS = false; // Set to true to enable saving history to SPIFFS, false to disable
static bool first_save = true; // flag to indicate if this is the first save (to write header) static bool first_save = true; // flag to indicate if this is the first save (to write header)
struct dataSaveParams struct dataSaveParams

26
RotaxMonitor/src/main.cpp
View File

@@ -101,14 +101,14 @@ void loop()
auto *writable_history = &ignA_history_1; auto *writable_history = &ignA_history_1;
// Resources Initialization // Resources Initialization
static Devices dev; Devices dev;
// Task handle // Task handle
static TaskHandle_t trigA_TaskHandle = NULL; TaskHandle_t trigA_TaskHandle = NULL;
static TaskHandle_t trigB_TaskHandle = NULL; TaskHandle_t trigB_TaskHandle = NULL;
// Data Queue for real time task to main loop communication // Data Queue for real time task to main loop communication
static QueueHandle_t rt_taskA_queue = xQueueCreate(max_queue, sizeof(ignitionBoxStatus)); QueueHandle_t rt_taskA_queue = xQueueCreate(max_queue, sizeof(ignitionBoxStatus));
static QueueHandle_t rt_taskB_queue = xQueueCreate(max_queue, sizeof(ignitionBoxStatus)); QueueHandle_t rt_taskB_queue = xQueueCreate(max_queue, sizeof(ignitionBoxStatus));
static rtTaskParams taskA_params{ rtTaskParams taskA_params{
.rt_running = true, .rt_running = true,
.dev = &dev, .dev = &dev,
.rt_handle_ptr = &trigA_TaskHandle, .rt_handle_ptr = &trigA_TaskHandle,
@@ -219,22 +219,18 @@ void loop()
uint32_t counter = 0; uint32_t counter = 0;
uint32_t wait_count = 0; uint32_t wait_count = 0;
ignitionBoxStatus ign_info; ignitionBoxStatus ign_info;
int64_t last = esp_timer_get_time(); ignitionBoxStatusAverage ign_info_avg(filter_k);
uint32_t missed_firings12 = 0;
uint32_t missed_firings34 = 0;
ignitionBoxStatusAverage ignA_avg(filter_k); // moving average calculator for ignition box A with a window of 100 samples
// Initialize Web page
AsyncWebServer server(80); AsyncWebServer server(80);
AsyncWebSocket ws("/ws"); AsyncWebSocket ws("/ws");
ws.onEvent(onWsEvent); ws.onEvent(onWsEvent);
server.addHandler(&ws); server.addHandler(&ws);
auto spiffs_guard = LITTLEFSGuard(); // use RAII guard to ensure SPIFFS is properly mounted and unmounted
server.serveStatic("/", LittleFS, "/").setDefaultFile("index.html"); server.serveStatic("/", LittleFS, "/").setDefaultFile("index.html");
server.begin(); server.begin();
server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) server.on("/", HTTP_GET, [](AsyncWebServerRequest *request)
{ request->send(200, "text/html", htmlTest.c_str()); }); { request->send(200, "text/plain", "OK"); });
while (running) while (running)
{ {
@@ -256,14 +252,14 @@ void loop()
// printInfo(ign_info); // printInfo(ign_info);
auto &hist = *active_history; auto &hist = *active_history;
hist[counter++ % active_history->size()] = ign_info; hist[counter++ % active_history->size()] = ign_info;
ignA_avg.update(ign_info); // update moving average with latest ignition status ign_info_avg.update(ign_info); // update moving average with latest ignition status
Serial.print("Data Received: " + String(counter) + "/" + String(hist.size()) + '\r'); Serial.print("Data Received: " + String(counter) + "/" + String(hist.size()) + '\r');
if (ws.count() > 0 && counter % 10 == 0) // send data every 10 samples if (ws.count() > 0 && counter % 10 == 0) // send data every 10 samples
{ {
Serial.println(); Serial.println();
LOG_INFO("Sending average ignition status to websocket clients..."); LOG_INFO("Sending average ignition status to websocket clients...");
auto msg = ignA_avg.toJson().as<String>(); auto msg = ign_info_avg.toJson().as<String>();
ws.textAll(msg); ws.textAll(msg);
} }
} }