task refactoring work in progress

2026-04-11 15:49:40 +02:00
parent 684c34e209
commit d1b96e932c
5 changed files with 367 additions and 185 deletions
@@ -10,6 +10,9 @@
 #include "utils.h"
 #include <memory>
 #include <mutex>
+#include <filesystem>
+#include <FS.h>
+#include <LittleFS.h>

 // ISR
 #include "isr.h"
@@ -33,68 +36,115 @@ static const std::map<const uint32_t, const char *> names = {
 };
 #endif

-// RT task Interrupt parameters
-struct rtTaskInterrupts
-{
-    void (*isr_ptr)(void *);
-    const uint8_t trig_pin_12p;
-    const uint8_t trig_pin_12n;
-    const uint8_t trig_pin_34p;
-    const uint8_t trig_pin_34n;
-    const uint8_t spark_pin_12;
-    const uint8_t spark_pin_34;
-};
-
-// RT Task Peak Detector Reset pins
-struct rtTaskResets
-{
-    const uint8_t rst_io_peak;
-    const uint8_t rst_io_sh;
-};
-
-// RT task parameters
-struct rtTaskParams
-{
-    bool rt_running; // run flag, false to terminate
-    Devices *dev;
-    const QueueHandle_t rt_queue;
-    const rtTaskInterrupts rt_int; // interrupt pins to attach
-    const rtTaskResets rt_resets;  // reset ping for peak detectors
-};
-
-
 class rtIgnitionTask
 {
-    
-    using PShistory = PSRAMVector<ignitionBoxStatus>;
-    
-    public:
-    rtIgnitionTask();
+    using PSHistory = PSRAMVector<ignitionBoxStatus>;
+    // RT task Interrupt parameters
+    struct rtTaskInterruptParams
+    {
+        void (*isr_ptr)(void *);
+        const uint8_t trig_pin_12p;
+        const uint8_t trig_pin_12n;
+        const uint8_t trig_pin_34p;
+        const uint8_t trig_pin_34n;
+        const uint8_t spark_pin_12;
+        const uint8_t spark_pin_34;
+    };
+
+    // RT Task Peak Detector Reset pins
+    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;
+    };
+
+    // RT task parameters
+    struct rtTaskParams
+    {
+        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
+    };
+
+    enum rtTaskStatus
+    {
+        INIT,
+        OK,
+        ERROR,
+        RUNNING,
+        IDLE,
+        STOPPED
+    };
+
+public:
+    rtIgnitionTask(const rtTaskParams params, const uint32_t history_size, const uint32_t queue_size, const uint8_t core, std::mutex &fs_mutex, fs::FS &filesystem = LittleFS);
    ~rtIgnitionTask();
-    
-    static void rtIgnitionTask_run(void *pvParameters);
-    
+
    void run();
-    void start();
-    void stop();
+    const bool start();
+    const bool stop();
+
+    const ignitionBoxStatus getLast() const;
+    const ignitionBoxStatusFiltered getFiltered() const;
+
+    const rtTaskStatus getStatus() const;
+
+    void enableSave(const bool enable, const std::filesystem::path filename);
+
+private:
+    void rtIgnitionTask::saveHistory(const rtIgnitionTask::PSHistory &history, const std::filesystem::path &file_name);
+
+private: // static functions for FreeRTOS
+    static void rtIgnitionTask_manager(void *pvParameters);
+    static void rtIgnitionTask_realtime(void *pvParameters);

 private:
    bool m_running = true;
+    rtTaskStatus m_manager_status = INIT;

-    std::shared_ptr<Devices> m_devices;
-    std::string m_name;
-    TaskHandle_t m_handle;
-    QueueHandle_t m_queue;
    rtTaskParams m_params;
+    const uint8_t m_core;

-    PShistory m_history_0;
-    PShistory m_history_1;
+    TaskHandle_t m_rt_handle = nullptr;
+    TaskHandle_t m_manager_handle = nullptr;
+    QueueHandle_t m_queue = nullptr;

-    std::unique_ptr<PShistory> m_active_history;
-    std::unique_ptr<PShistory> m_save_history;
+    bool m_enable_save = false;
+    std::filesystem::path m_history_path;
+    PSHistory m_history_0;
+    PSHistory m_history_1;
+    std::unique_ptr<PSHistory> m_active_history;
+    std::unique_ptr<PSHistory> m_save_history;
+    fs::FS &m_filesystem;
+    std::mutex &m_fs_mutex;

+    bool m_partial_save = false;
+    bool m_first_save = true;

-    fs::FS m_filesystem;
-
+    uint32_t m_counter_status = 0;
+    uint32_t m_last_data = 0;
+    ignitionBoxStatus m_last_status;
+    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 uint8_t c_adc_time = 4;            // in mS
+    static const uint8_t c_io_time = 2;             // in mS
 };