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

refactor continued, at least it compiles

Browse Source
This commit is contained in:
Emanuele Trabattoni
2026-04-11 16:39:59 +02:00
parent d1b96e932c
commit fdba6d5ad5
7 changed files with 162 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RotaxMonitor/src/tasks.h
+20 -16
View File
@@ -13,6 +13,7 @@
#include <filesystem>
#include <FS.h>
#include <LittleFS.h>
#include <datasave.h>
// ISR
#include "isr.h"
@@ -39,6 +40,8 @@ static const std::map<const uint32_t, const char *> names = {
class rtIgnitionTask
{
using PSHistory = PSRAMVector<ignitionBoxStatus>;
public:
// RT task Interrupt parameters
struct rtTaskInterruptParams
{
@@ -55,19 +58,19 @@ class rtIgnitionTask
struct rtTaskIOParams
{
const uint32_t expander_addr;
const uint8_t pot_cs_a12;
const uint8_t pot_cs_a34;
const uint8_t ss_force_a;
const uint8_t ss_inhibit_a12;
const uint8_t ss_inhibit_a34;
const uint8_t sh_disch_a12;
const uint8_t sh_disch_a34;
const uint8_t sh_arm_a12;
const uint8_t sh_arm_a34;
const uint8_t relay_in_a12;
const uint8_t relay_in_a34;
const uint8_t relay_out_a12;
const uint8_t relay_out_a34;
const uint8_t pot_cs_12;
const uint8_t pot_cs_34;
const uint8_t ss_force;
const uint8_t ss_inhibit_12;
const uint8_t ss_inhibit_34;
const uint8_t sh_disch_12;
const uint8_t sh_disch_34;
const uint8_t sh_arm_12;
const uint8_t sh_arm_34;
const uint8_t relay_in_12;
const uint8_t relay_in_34;
const uint8_t relay_out_12;
const uint8_t relay_out_34;
};
// RT task parameters
@@ -75,12 +78,12 @@ class rtIgnitionTask
{
bool rt_running; // run flag, false to terminate
const std::string name;
const std::shared_ptr<Devices> dev;
const uint32_t rt_stack_size;
const uint32_t rt_priority;
const rtTaskInterruptParams rt_int; // interrupt pins to attach
const rtTaskIOParams rt_io; // reset ping for peak detectors
QueueHandle_t rt_queue; // queue for task io
const std::shared_ptr<Devices> dev;
};
enum rtTaskStatus
@@ -109,7 +112,7 @@ public:
void enableSave(const bool enable, const std::filesystem::path filename);
private:
void rtIgnitionTask::saveHistory(const rtIgnitionTask::PSHistory &history, const std::filesystem::path &file_name);
void saveHistory(const rtIgnitionTask::PSHistory &history, const std::filesystem::path &file_name);
private: // static functions for FreeRTOS
static void rtIgnitionTask_manager(void *pvParameters);
@@ -128,6 +131,7 @@ private:
bool m_enable_save = false;
std::filesystem::path m_history_path;
const uint32_t m_max_history;
PSHistory m_history_0;
PSHistory m_history_1;
std::unique_ptr<PSHistory> m_active_history;
@@ -144,7 +148,7 @@ private:
ignitionBoxStatusFiltered m_info_filtered;
static const uint32_t c_idle_time = 2000; // in mS
static const uint8_t c_spark_timeout_max = 500; // uS
static const uint32_t c_spark_timeout_max = 500; // uS
static const uint8_t c_adc_time = 4; // in mS
static const uint8_t c_io_time = 2; // in mS
};