io expander class ok , adc not working

RotaxMonitor/lib/led/led.cpp

@@ -4,6 +4,7 @@ RGBled::RGBled(const uint8_t pin) : m_led(pin)
 {
     pinMode(m_led, OUTPUT);
     writeStatus(RGBled::ERROR);
+    m_brightness = 1.0f; 
 }
 
 RGBled::~RGBled()
@@ -11,6 +12,11 @@ RGBled::~RGBled()
     pinMode(m_led, INPUT);
 }
 
+void RGBled::setBrightness(const float b)
+{
+    m_brightness = b;
+}
+
 void RGBled::setStatus(const LedStatus s)
 {
     if (m_status == s)
@@ -27,6 +33,6 @@ const RGBled::LedStatus RGBled::getSatus(void)
 
 void RGBled::writeStatus(const RGBled::LedStatus s)
 {
-    RGBled::color_u u{.status = s};
+    const RGBled::color_u u{.status = s};
-    rgbLedWrite(m_led, u.color.r, u.color.g, u.color.b);
+    rgbLedWrite(m_led, (uint8_t)(m_brightness*u.color.r), (uint8_t)(m_brightness*u.color.g), (uint8_t)(m_brightness*u.color.b));
 }

RotaxMonitor/lib/led/led.h

@@ -50,6 +50,7 @@ public:
     RGBled(const uint8_t pin = 48);
     ~RGBled();
 
+    void setBrightness(const float b);
     void setStatus(const LedStatus s);
     const LedStatus getSatus(void);
 
@@ -59,5 +60,6 @@ private:
 private:
     LedStatus m_status = LedStatus::IDLE;
     std::mutex m_mutex;
+    float m_brightness;
     const uint8_t m_led;
 };

RotaxMonitor/platformio.ini

@@ -28,7 +28,7 @@ monitor_port = /dev/ttyACM0
 monitor_speed = 921600
 build_type = release
 build_flags = 
-	-DCORE_DEBUG_LEVEL=1
+	-DCORE_DEBUG_LEVEL=5
 	-DARDUINO_USB_CDC_ON_BOOT=0
 	-DARDUINO_USB_MODE=0
 	-DCONFIG_ASYNC_TCP_MAX_ACK_TIME=5000
@@ -59,7 +59,7 @@ build_flags =
 	-O0
 	-g3
 	-ggdb3
-	-DCORE_DEBUG_LEVEL=3
+	-DCORE_DEBUG_LEVEL=5
 	-DARDUINO_USB_CDC_ON_BOOT=0
 	-DARDUINO_USB_MODE=0
 	-DCONFIG_ASYNC_TCP_MAX_ACK_TIME=5000

RotaxMonitor/src/devices.h

@@ -9,7 +9,8 @@
 // Device Libraries
 #include <ADS1256.h>
 #include <AD5292.h>
-#include <PCA95x5.h>
+#include <extio.h>
+#include <Wire.h>
 
 // ADC Channel mapping
 #define ADC_CH_PEAK_12P_IN SING_0
@@ -24,23 +25,25 @@
 // Device Pointer structs for tasks
 struct Devices
 {
+    // Busses
+    std::unique_ptr<TwoWire> m_i2c = nullptr;
     std::unique_ptr<SPIClass> m_spi_a = nullptr;
     std::unique_ptr<SPIClass> m_spi_b = nullptr;
 
+    // Bus Mutextes
+    std::mutex m_spi_a_mutex;
+    std::mutex m_spi_b_mutex;
+    std::mutex m_i2c_mutex;
+
+    // Device Pointers
     std::unique_ptr<AD5292> m_pot_a = nullptr;
     std::unique_ptr<AD5292> m_pot_b = nullptr;
 
     std::unique_ptr<ADS1256> m_adc_a = nullptr;
     std::unique_ptr<ADS1256> m_adc_b = nullptr;
 
-    std::unique_ptr<PCA9555> m_expander_a = nullptr;
+    std::unique_ptr<ExternalIO> m_ext_io = nullptr;
-    std::unique_ptr<PCA9555> m_expander_b = nullptr;
-    std::unique_ptr<PCA9555> m_expander_inputs_ab = nullptr;
 
-    std::mutex m_spi_a_mutex;
-    std::mutex m_spi_b_mutex;
-
-    std::mutex m_i2c_mutex;
 };
 
 // Adc read channel wrapper to selet mux before reading

RotaxMonitor/src/extio.cpp

@@ -0,0 +1,129 @@
+#include <extio.h>
+
+// Static interrupt callback
+static void onExpanderInterrupt(void *arg)
+{
+    auto cls = (ExternalIO *)(arg);
+    if (!cls) // invalid args
+        return;
+    cls->extReadInterrupt();
+}
+
+ExternalIO::ExternalIO(TwoWire &i2c, std::mutex &i2c_mutex, const uint8_t int_pin) : m_i2cMutex(i2c_mutex), m_i2c(i2c), m_intPin(int_pin)
+{
+    std::lock_guard<std::mutex> lock(m_i2cMutex);
+    // Attach OUT expanders on BUS
+    m_outMap[EXPANDER_A_OUT_ADDR] = std::make_unique<PCA9555>();
+    m_outMap[EXPANDER_A_OUT_ADDR]->attach(m_i2c, EXPANDER_A_OUT_ADDR);
+    m_outMap[EXPANDER_B_OUT_ADDR] = std::make_unique<PCA9555>();
+    m_outMap[EXPANDER_B_OUT_ADDR]->attach(m_i2c, EXPANDER_B_OUT_ADDR);
+
+    for (auto &[a, e] : m_outMap)
+    {
+        e->direction(PCA95x5::Direction::OUT_ALL);
+        e->polarity(PCA95x5::Polarity::ORIGINAL_ALL);
+    };
+
+    // Attach IN Expanders on Bus
+    m_inMap[EXPANDER_A_IN_ADDR] = std::make_unique<PCA9555>();
+    m_inMap[EXPANDER_A_IN_ADDR]->attach(m_i2c, EXPANDER_A_IN_ADDR);
+    m_inMap[EXPANDER_B_IN_ADDR] = std::make_unique<PCA9555>();
+    m_inMap[EXPANDER_B_IN_ADDR]->attach(m_i2c, EXPANDER_B_IN_ADDR);
+
+    for (auto &[a, e] : m_inMap)
+    {
+        e->direction(PCA95x5::Direction::IN_ALL);
+        e->polarity(PCA95x5::Polarity::ORIGINAL_ALL);
+        m_lastInputState[a] = e->read(); /// initialize input state to collect interrupts
+    };
+}
+ExternalIO::~ExternalIO() {
+
+}
+
+void ExternalIO::extDigitalWrite(const uint32_t mappedPin, const bool val)
+{
+    std::lock_guard<std::mutex> lock(m_i2cMutex);
+    const io_t pa = map2pin(mappedPin);
+    if (!m_outMap.contains(pa.addr))
+    {
+        LOG_ERROR("Undefined IO Expander addr: [", pa.addr, "]");
+        return;
+    }
+    auto &io = m_outMap.at(pa.addr);
+    if (!io->write(static_cast<PCA95x5::Port::Port>(pa.pin), val ? PCA95x5::Level::H : PCA95x5::Level::L))
+    {
+        LOG_ERROR("IO Expander [", pa.addr, "] Unable to WRITE Port [", pa.pin, "] to [", val ? "HIGH" : "LOW");
+        LOG_ERROR("IO Expander Error [", io->i2c_error(), "]");
+    }
+}
+
+const bool ExternalIO::extDigitalRead(const uint32_t mappedPin)
+{
+    std::lock_guard<std::mutex> lock(m_i2cMutex);
+    const io_t pa = map2pin(mappedPin);
+    if (!m_inMap.contains(pa.addr))
+    {
+        LOG_ERROR("Undefined IO Expander addr: [", pa.addr, "]");
+        return false;
+    }
+    auto &io = m_inMap.at(pa.addr);
+    const bool rv = io->read(static_cast<PCA95x5::Port::Port>(pa.pin)) == PCA95x5::Level::H ? true : false; // read value
+    const uint8_t err = io->i2c_error();
+    if (err)
+    {
+        LOG_ERROR("IO Expander [", pa.addr, "] Unable to READ Port [", pa.pin, "]");
+        LOG_ERROR("IO Expander Error [", err, "]");
+    }
+    return rv;
+}
+
+void ExternalIO::extAttachInterrupt(ExtInterruptCb cb)
+{
+    attachInterruptArg(EXPANDER_ALL_INTERRUPT, onExpanderInterrupt, (void *)(this), FALLING);
+    m_extInterruptCb = cb;
+}
+
+void ExternalIO::extDetachInterrupt()
+{
+    detachInterrupt(EXPANDER_ALL_INTERRUPT);
+}
+
+void ExternalIO::extReadInterrupt()
+{
+    std::lock_guard<std::mutex> lock(m_i2cMutex);
+    disableInterrupt(EXPANDER_ALL_INTERRUPT);
+    // read all registers and collect
+    IOstate interruptState;
+    for (auto &[a, e] : m_inMap)
+    {
+        interruptState[a] = e->read();
+    }
+    m_lastInputState = interruptState; // restore to current values
+    // compare to last state to see the difference
+    if (m_extInterruptCb)
+    {
+        for (auto &[a, v] : interruptState)
+        {
+            if (v)
+                m_extInterruptCb(stat2map(a, v));
+        }
+    }
+
+    enableInterrupt(EXPANDER_ALL_INTERRUPT);
+}
+
+const ExternalIO::io_t ExternalIO::map2pin(const uint32_t mappedIO)
+{
+    return io_t{
+        .addr = (uint8_t)((mappedIO >> 16) & (uint8_t)0xFF),
+        .pin = (uint8_t)(mappedIO && (uint32_t)0xFF),
+    };
+}
+
+const uint32_t ExternalIO::stat2map(const uint8_t addr, const uint16_t stat)
+{
+    if (!stat)
+        return 0;
+    return (uint32_t)(addr << 16) | (1UL << __builtin_ctz(stat));
+}

RotaxMonitor/src/extio.h

@@ -0,0 +1,49 @@
+#pragma once
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_DEBUG
+
+#include <Arduino.h>
+#include <DebugLog.h>
+#include <PCA95x5.h>
+
+#include <pins.h>
+
+#include <memory>
+#include <map>
+
+class ExternalIO
+{
+    using IOptr = std::unique_ptr<PCA9555>;
+    using IOmap = std::map<const uint8_t, IOptr>;
+    using IOstate = std::map<const uint8_t, uint16_t>;
+    using ExtInterruptCb = std::function<void(const uint32_t)>;
+
+    struct io_t
+    {
+        uint8_t addr;
+        uint8_t pin;
+    };
+
+public:
+    ExternalIO(TwoWire &i2c, std::mutex &i2c_mutex, const uint8_t int_pin);
+    ~ExternalIO();
+
+    void extDigitalWrite(const uint32_t mappedPin, const bool val);
+    const bool extDigitalRead(const uint32_t mappedPin);
+    void extAttachInterrupt(ExtInterruptCb cb = nullptr);
+    void extDetachInterrupt();
+    void extReadInterrupt();
+
+private:
+    const io_t map2pin(const uint32_t mappedIO);
+    const uint32_t stat2map(const uint8_t addr, const uint16_t stat);
+
+private:
+    const uint8_t m_intPin;
+    IOmap m_inMap;
+    IOmap m_outMap;
+    uint8_t m_intPinChanged;
+    IOstate m_lastInputState;
+    ExtInterruptCb m_extInterruptCb = nullptr;
+    std::mutex &m_i2cMutex;
+    TwoWire &m_i2c;
+};

RotaxMonitor/src/main.cpp

@@ -18,11 +18,12 @@
 
 // Defines to enable channel B
 #define CH_B_ENABLE
-// #define TEST
 
 // Debug Defines
 #define WIFI_SSID "AstroRotaxMonitor"
 #define WIFI_PASSWORD "maledettirotax"
+#define PSRAM_MAX 4096
+#define QUEUE_MAX 256
 
 void setup()
 {
@@ -79,49 +80,77 @@ void loop()
 {
     // global variables
     RGBled led;
+    led.setBrightness(0.025f);
     led.setStatus(RGBled::LedStatus::INIT);
+
+    std::shared_ptr<Devices> dev = std::make_shared<Devices>();
     bool running = true;
     std::mutex fs_mutex;
     LITTLEFSGuard fsGuard;
 
-    //////// INIT SPI PORTS ////////
+    //////// INIT SPI INTERFACES ////////
     bool spiA_ok = true;
     bool spiB_ok = true;
-    // Init 2 SPI interfaces
+    LOG_DEBUG("Init SPI Interfaces");
-//     SPIClass SPI_A(FSPI);
+    SPIClass SPI_A(FSPI);
-//     spiA_ok = SPI_A.begin(SPI_A_SCK, SPI_A_MISO, SPI_A_MOSI);
+    spiA_ok = SPI_A.begin(SPI_A_SCK, SPI_A_MISO, SPI_A_MOSI);
-//     SPI_A.setDataMode(SPI_MODE1); // ADS1256 requires SPI mode 1
+    SPI_A.setDataMode(SPI_MODE1); // ADS1256 requires SPI mode 1
-// #ifdef CH_B_ENABLE
+    LOG_DEBUG("Init SPI A ok");
-//     SPIClass SPI_B(HSPI);
+#ifdef CH_B_ENABLE
-//     spiB_ok = SPI_B.begin(SPI_B_SCK, SPI_B_MISO, SPI_B_MOSI);
+    delay(50);
-//     SPI_B.setDataMode(SPI_MODE1); // ADS1256 requires SPI mode 1
+    SPIClass SPI_B(HSPI);
-// #endif
+    spiB_ok = SPI_B.begin(SPI_B_SCK, SPI_B_MISO, SPI_B_MOSI);
+    SPI_B.setDataMode(SPI_MODE1); // ADS1256 requires SPI mode 1
+    LOG_DEBUG("Init SPI B ok");
+#endif
+
     if (!spiA_ok || !spiB_ok)
     {
         LOG_ERROR("Unable to Initialize SPI Busses");
         LOG_ERROR("5 seconds to restart...");
+        //vTaskDelay(pdMS_TO_TICKS(5000));
+        //esp_restart();
+    }
+    //dev->m_spi_a = std::make_unique<SPIClass*>(&SPI_A);
+#ifdef CH_B_ENABLE
+    //dev->m_spi_b = std::make_unique<SPIClass*>(&SPI_B);
+#endif
+    // Init ADCs
+    dev->m_adc_a = std::make_unique<ADS1256>(ADC_A_DRDY, ADS1256::PIN_UNUSED, ADS1256::PIN_UNUSED, ADC_A_CS, 2.5, &SPI_A);
+    LOG_DEBUG("Init ADC A pointer ok");
+    #ifdef CH_B_ENABLE
+    dev->m_adc_b = std::make_unique<ADS1256>(ADC_B_DRDY, ADS1256::PIN_UNUSED, ADS1256::PIN_UNUSED, ADC_B_CS, 2.5, &SPI_B);
+    LOG_DEBUG("Init ADC B pointer ok");
+    #endif
+    // Configure ADCs
+    dev->m_adc_a->InitializeADC();
+    dev->m_adc_a->setPGA(PGA_1);
+    dev->m_adc_a->setDRATE(DRATE_7500SPS);
+    LOG_DEBUG("Init ADC A params ok");
+    #ifdef CH_B_ENABLE
+    dev->m_adc_b->InitializeADC();
+    dev->m_adc_b->setPGA(PGA_1);
+    dev->m_adc_b->setDRATE(DRATE_7500SPS);
+    LOG_DEBUG("Init ADC B params ok");
+#endif
+    LOG_DEBUG("Init SPI OK");
+
+    //////// INIT I2C INTERFACES ////////
+    LOG_DEBUG("Init I2C Interfaces");
+    bool i2c_ok = true;
+    i2c_ok = Wire.begin();
+    if (!i2c_ok)
+    {
+        LOG_ERROR("Unable to Initialize I2C Bus");
+        LOG_ERROR("5 seconds to restart...");
         vTaskDelay(pdMS_TO_TICKS(5000));
         esp_restart();
     }
-    LOG_DEBUG("Init SPI OK");
 
-    // Resources Initialization
+    // Init IO Expanders
-    std::shared_ptr<Devices> dev = std::make_shared<Devices>();
+    dev->m_ext_io = std::make_unique<ExternalIO>(Wire, dev->m_i2c_mutex, EXPANDER_ALL_INTERRUPT);
-    // dev->m_spi_a = std::make_unique<SPIClass>(SPI_A);
-    // dev->m_spi_b = std::make_unique<SPIClass>(SPI_B);
-
-    // // Init ADC_A
-    // dev->m_adc_a = std::make_unique<ADS1256>(ADC_A_DRDY, ADS1256::PIN_UNUSED, ADS1256::PIN_UNUSED, ADC_A_CS, 2.5, &SPI_A);
-    // dev->m_adc_b = std::make_unique<ADS1256>(ADC_B_DRDY, ADS1256::PIN_UNUSED, ADS1256::PIN_UNUSED, ADC_B_CS, 2.5, &SPI_B);
-
-    // dev->m_adc_a->InitializeADC();
-    // dev->m_adc_a->setPGA(PGA_1);
-    // dev->m_adc_a->setDRATE(DRATE_7500SPS);
-
-    // dev->m_adc_b->InitializeADC();
-    // dev->m_adc_b->setPGA(PGA_1);
-    // dev->m_adc_b->setDRATE(DRATE_7500SPS);
 
+    //////// INIT REALTIME TASKS PARAMETERS ////////
     const rtIgnitionTask::rtTaskParams taskA_params{
         .rt_running = true,
         .name = "rtIgnTask_A",
@@ -184,9 +213,10 @@ void loop()
         .rt_queue = nullptr,
         .dev = dev};
 
-    auto task_A = rtIgnitionTask(taskA_params, 4096, 256, CORE_0, fs_mutex);
+    //////// SPAWN REALTIME TASKS ////////
+    auto task_A = rtIgnitionTask(taskA_params, PSRAM_MAX, QUEUE_MAX, CORE_0, fs_mutex);
     delay(50);
-    auto task_B = rtIgnitionTask(taskB_params, 4096, 256, CORE_1, fs_mutex);
+    auto task_B = rtIgnitionTask(taskB_params, PSRAM_MAX, QUEUE_MAX, CORE_1, fs_mutex);
 
     // Ignition A on Core 0
     auto ignA_task_success = task_A.getStatus() == rtIgnitionTask::OK ? pdPASS : pdFAIL;
@@ -206,22 +236,26 @@ void loop()
     {
         led.setStatus(RGBled::LedStatus::ERROR);
         LOG_ERROR("Unable to start realtime tasks");
-    } else 
+    }
-    LOG_DEBUG("Real Time Tasks A & B initialized");
+    else
-    led.setStatus(RGBled::LedStatus::OK);
+    {
+        LOG_DEBUG("Real Time Tasks A & B initialized");
+        led.setStatus(RGBled::LedStatus::OK);
+    }
 
-    AstroWebServer webPage(80, LittleFS); // Initialize webserver and Websocket
+    //////// SPAWN WEBSERVER and WEBSOCKET ////////
+    AstroWebServer webPage(80, LittleFS);
     ArduinoJson::JsonDocument json_data;
     bool data_a, data_b;
-    task_A.onMessage([&webPage, &json_data, &data_a](ignitionBoxStatusFiltered sts){
+    task_A.onMessage([&webPage, &json_data, &data_a](ignitionBoxStatusFiltered sts)
+                     {
         json_data["box_a"] = sts.toJson();
-        data_a = true;
+        data_a = true; });
-    });
 
-    task_B.onMessage([&webPage, &json_data, &data_b](ignitionBoxStatusFiltered sts){
+    task_B.onMessage([&webPage, &json_data, &data_b](ignitionBoxStatusFiltered sts)
+                     {
         json_data["box_b"] = sts.toJson();
-        data_b = true;
+        data_b = true; });
-    });
 
     // task_A.enableSave(true, "ignitionA_test.csv");
     // task_B.enableSave(true, "ignitionB_test.csv");
@@ -238,7 +272,8 @@ void loop()
             printRunningTasksMod(Serial);
             monitor_loop = millis();
         }
-        if ((data_a && data_b) || (this_loop - data_loop > 500)) {
+        if ((data_a && data_b) || (this_loop - data_loop > 500))
+        {
             webPage.sendWsData(json_data.as<String>());
             json_data.clear();
             data_a = data_b = false;

RotaxMonitor/src/pins.h

@@ -79,86 +79,87 @@
 #define SPARK_PIN_B12 1
 #define SPARK_PIN_B34 2
 
-// =====================
+// +++++++++++++++++++++
-// PCA9555 I/O EXPANDER BOX_A
+// MACRO TO COMBINE PIN NUMBER AND ADDRESS
-// =====================
+#define PIN2ADDR(p, a) ((1UL << p) | ((uint32_t)(a) << 16))
+// +++++++++++++++++++++
 
-#define EXPANDER_A_ADDR 0x010101
+// =====================
+// PCA9555 I/O EXPANDER INTERRUPT (Common)
+// =====================
+#define EXPANDER_ALL_INTERRUPT 17
+
+// =====================
+// PCA9555 I/O EXPANDER BOX_A (OUT)
+// =====================
+#define EXPANDER_A_OUT_ADDR 0xFF
 
 // --- DIGITAL POT CHIP SELECT LINES ---
-#define POT_CS_A12 0
+#define POT_CS_A12 PIN2ADDR(0, EXPANDER_A_OUT_ADDR)
-#define POT_CS_A34 1
+#define POT_CS_A34 PIN2ADDR(1, EXPANDER_A_OUT_ADDR)
 
 // --- SOFT START FORCE LINES ---
-#define SS_FORCE_A 2
+#define SS_FORCE_A PIN2ADDR(2, EXPANDER_A_OUT_ADDR)
-#define SS_INIBHIT_A12 3
+#define SS_INIBHIT_A12 PIN2ADDR(3, EXPANDER_A_OUT_ADDR)
-#define SS_INHIBIT_A34 4
+#define SS_INHIBIT_A34 PIN2ADDR(4, EXPANDER_A_OUT_ADDR)
 
 // --- SAMPLE AND HOLD ARM AND DISCHARGE ---
-#define SH_DISCH_A12 5
+#define SH_DISCH_A12 PIN2ADDR(5, EXPANDER_A_OUT_ADDR)
-#define SH_DISCH_A34 6
+#define SH_DISCH_A34 PIN2ADDR(6, EXPANDER_A_OUT_ADDR)
-#define SH_ARM_A12 7
+#define SH_ARM_A12 PIN2ADDR(7, EXPANDER_A_OUT_ADDR)
-#define SH_ARM_A34 8
+#define SH_ARM_A34 PIN2ADDR(8, EXPANDER_A_OUT_ADDR)
 
 // --- RELAY ---
-#define RELAY_IN_A12 9
+#define RELAY_IN_A12 PIN2ADDR(9, EXPANDER_A_OUT_ADDR)
-#define RELAY_OUT_A12 10
+#define RELAY_OUT_A12 PIN2ADDR(10, EXPANDER_A_OUT_ADDR)
-#define RELAY_IN_A34 11
+#define RELAY_IN_A34 PIN2ADDR(11, EXPANDER_A_OUT_ADDR)
-#define RELAY_OUT_A34 12
+#define RELAY_OUT_A34 PIN2ADDR(12, EXPANDER_A_OUT_ADDR)
-
-// --- STATUS / BUTTON ---
-#define STA_2 13
-#define STA_3 14
-#define STA_4 15
 
 // =====================
-// PCA9555 I/O EXPANDER BOX_B
+// PCA9555 I/O EXPANDER BOX_A (IN)
 // =====================
+#define EXPANDER_A_IN_ADDR 0xFF
 
-#define EXPANDER_B_ADDR 0x101010
+#define SS_A12_ON PIN2ADDR(0, EXPANDER_A_IN_ADDR)
+#define SS_A12_OFF PIN2ADDR(1, EXPANDER_A_IN_ADDR)
+#define SS_A34_ON PIN2ADDR(2, EXPANDER_A_IN_ADDR)
+#define SS_A34_OFF PIN2ADDR(3, EXPANDER_A_IN_ADDR)
+
+// =====================
+// PCA9555 I/O EXPANDER BOX_B (OUT)
+// =====================
+#define EXPANDER_B_OUT_ADDR 0xFF
 
 // --- DIGITAL POT CHIP SELECT LINES ---
-#define POT_CS_B12 0
+#define POT_CS_B12 PIN2ADDR(0, EXPANDER_B_OUT_ADDR)
-#define POT_CS_B34 1
+#define POT_CS_B34 PIN2ADDR(1, EXPANDER_B_OUT_ADDR)
 
 // --- SOFT START FORCE LINES ---
-#define SS_FORCE_B 2
+#define SS_FORCE_B PIN2ADDR(2, EXPANDER_B_OUT_ADDR)
-#define SS_INIBHIT_B12 3
+#define SS_INIBHIT_B12 PIN2ADDR(3, EXPANDER_B_OUT_ADDR)
-#define SS_INHIBIT_B34 4
+#define SS_INHIBIT_B34 PIN2ADDR(4, EXPANDER_B_OUT_ADDR)
 
 // --- SAMPLE AND HOLD ARM AND DISCHARGE ---
-#define SH_DISCH_B12 5
+#define SH_DISCH_B12 PIN2ADDR(5, EXPANDER_B_OUT_ADDR)
-#define SH_DISCH_B34 6
+#define SH_DISCH_B34 PIN2ADDR(6, EXPANDER_B_OUT_ADDR)
-#define SH_ARM_B12 7
+#define SH_ARM_B12 PIN2ADDR(7, EXPANDER_B_OUT_ADDR)
-#define SH_ARM_B34 8
+#define SH_ARM_B34 PIN2ADDR(8, EXPANDER_B_OUT_ADDR)
 
 // --- RELAY ---
-#define RELAY_IN_B12 9
+#define RELAY_IN_B12 PIN2ADDR(9, EXPANDER_B_OUT_ADDR)
-#define RELAY_OUT_B12 10
+#define RELAY_OUT_B12 PIN2ADDR(10, EXPANDER_B_OUT_ADDR)
-#define RELAY_IN_B34 11
+#define RELAY_IN_B34 PIN2ADDR(11, EXPANDER_B_OUT_ADDR)
-#define RELAY_OUT_B34 12
+#define RELAY_OUT_B34 PIN2ADDR(12, EXPANDER_B_OUT_ADDR)
-
-// --- STATUS / BUTTON ---
-#define STA_2 13
-#define STA_3 14
-#define STA_4 15
 
 // =====================
-// PCA9555 I/O EXPANDER INPUTS A+B
+// PCA9555 I/O EXPANDER BOX_B (IN)
 // =====================
+#define EXPANDER_B_IN_ADDR 0xFF
 
-#define EXPANDER_IN_ADDR 0x0a0a0a
+#define SS_B12_ON PIN2ADDR(0, EXPANDER_B_IN_ADDR)
-
+#define SS_B12_OFF PIN2ADDR(1, EXPANDER_B_IN_ADDR)
-#define SS_A12_ON
+#define SS_B34_ON PIN2ADDR(2, EXPANDER_B_IN_ADDR)
-#define SS_A12_OFF
+#define SS_B34_OFF PIN2ADDR(3, EXPANDER_B_IN_ADDR)
-#define SS_A34_ON
-#define SS_A34_OFF
-
-#define SS_B12_ON
-#define SS_B12_OFF
-#define SS_B34_ON
-#define SS_B34_OFF
-
 
 // Init Pin Functions
 inline void initTriggerPinsInputs()

RotaxMonitor/src/tasks.cpp

@@ -39,7 +39,7 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
     QueueHandle_t rt_queue = params->rt_queue;
     Devices *dev = params->dev.get();
     ADS1256 *adc = dev->m_adc_a.get();
-    PCA9555 *io = dev->m_expander_a.get();
+    ExternalIO* io = dev->m_ext_io.get();
 
     TaskStatus_t rt_task_info;
     vTaskGetInfo(NULL, &rt_task_info, pdFALSE, eInvalid);

RotaxMonitor/src/tasks.h

@@ -59,19 +59,19 @@ public:
     struct rtTaskIOParams
     {
         const uint32_t expander_addr;
-        const uint8_t pot_cs_12;
+        const uint32_t pot_cs_12;
-        const uint8_t pot_cs_34;
+        const uint32_t pot_cs_34;
-        const uint8_t ss_force;
+        const uint32_t ss_force;
-        const uint8_t ss_inhibit_12;
+        const uint32_t ss_inhibit_12;
-        const uint8_t ss_inhibit_34;
+        const uint32_t ss_inhibit_34;
-        const uint8_t sh_disch_12;
+        const uint32_t sh_disch_12;
-        const uint8_t sh_disch_34;
+        const uint32_t sh_disch_34;
-        const uint8_t sh_arm_12;
+        const uint32_t sh_arm_12;
-        const uint8_t sh_arm_34;
+        const uint32_t sh_arm_34;
-        const uint8_t relay_in_12;
+        const uint32_t relay_in_12;
-        const uint8_t relay_in_34;
+        const uint32_t relay_in_34;
-        const uint8_t relay_out_12;
+        const uint32_t relay_out_12;
-        const uint8_t relay_out_34;
+        const uint32_t relay_out_34;
     };
 
     // RT task parameters