Implemented EcuMaster SwitchBoard v3 protocol

Author: xtitoris

firmware/boards/port.h

@@ -91,6 +91,7 @@ enum class CanEgtProtocol : uint8_t {
 enum class CanIoProtocol : uint8_t {
     None = 0,
     Haltech = 3,
+    EcuMaster = 4,
     Motec = 6,
     Emtron = 7,
     MsIoBox = 9,

firmware/can.cpp

@@ -110,7 +110,11 @@ __attribute__((weak)) void SendCanData(uint16_t elapsedMs)
 
     static uint16_t elapsedSinceIoExpanderTxMs = 0;
     const ProtocolHandler* ioExpanderHandler = nullptr;
+
     switch (configuration->ioExpanderConfig.Protocol) {
+        case CanIoProtocol::EcuMaster:
+            ioExpanderHandler = &ecuMasterSwitchBoardTxHandler;
+            break;
         case CanIoProtocol::Haltech:
             ioExpanderHandler = &haltechIoTxHandler;
             break;
@@ -129,6 +133,7 @@ __attribute__((weak)) void SendCanData(uint16_t elapsedMs)
 
     #endif
 
+    // E888 combines EGT and IO expander data, so handle it separately
     #if (MOTEC_E888_ENABLED > 0)
         static uint16_t elapsedSinceMotecE888TxMs = 0;
         if (IsMotecE888Enabled(configuration)) {

firmware/can/can_ecumaster.cpp

@@ -13,7 +13,7 @@
 #include "heater_control.h"
 #include "lambda_conversion.h"
 #include "max3185x.h"
-#include "../for_rusefi/wideband_can.h"
+#include "pwmout.h"
 
 // EcuMaster protocol
 // CAN 1Mbps, big-endian
@@ -154,3 +154,125 @@ constexpr ProtocolHandler ecuMasterClassicEgtTxHandler = MakeProtocolHandler<&Se
 constexpr ProtocolHandler ecuMasterBlackEgtTxHandler = MakeProtocolHandler<&SendEcuMasterEgtFormat>(ECU_MASTER_EGT_TX_PERIOD_MS);
 
 #endif
+
+
+#if (IO_EXPANDER_ENABLED > 0)
+
+#define ECUMASTER_SWITCHBOARD_TX_PERIOD_MS    100
+#define ECUMASTER_SWITCHBOARD_BASE_ID         0x640
+#define ECUMASTER_SWITCHBOARD_DEVICE_ID(n)    (ECUMASTER_SWITCHBOARD_BASE_ID + (n) * 4)
+#define ECUMASTER_SWITCHBOARD_RX_OFFSET       3
+
+namespace ecumaster
+{
+    // BASE:     AV1-AV4, 0.001 V
+    // BASE + 1: AV5-AV8, 0.001 V
+    struct AVData
+    {
+        uint16_t Value[4]; 
+    } __attribute__((packed));
+
+    static_assert(sizeof(AVData) == 8);
+
+    // BASE + 2
+    struct OtherData
+    {
+        uint8_t Rotary1 : 4;  // 0-15
+        uint8_t Rotary2 : 4;  // 0-15
+        uint8_t Rotary3 : 4;  // 0-15
+        uint8_t Rotary4 : 4;  // 0-15
+        uint8_t Rotary5 : 4;  // 0-15
+        uint8_t Rotary6 : 4;  // 0-15
+        uint8_t Rotary7 : 4;  // 0-15
+        uint8_t Rotary8 : 4;  // 0-15
+        uint8_t Switch;       // bit 0-7 represent switch 1-8 (0=open, 1=closed)
+        uint8_t AnalogState;  // bitmask of which analog inputs are above threshold (1) or below threshold (0)
+        uint8_t LowSideState; // bitmask of which low-side outputs are active (1) or inactive (0)
+        uint8_t Heartbeat;    // Incremented on each message
+    } __attribute__((packed));
+
+    static_assert(sizeof(OtherData) == 8);
+
+    // BASE + 3: Low-side output control messages from ECU to switchboard
+    struct LowSideRxData
+    {
+        uint8_t State[4];
+        uint8_t Reserved[4];
+    } __attribute__((packed));
+
+    static_assert(sizeof(LowSideRxData) == 8);
+}
+
+static uint8_t hearbeat = 0;
+static uint8_t analogStatus = 0;
+static uint8_t lowSideStatus = 0;
+
+void SendEcuMasterSwitchBoardFormat(Configuration* configuration)
+{
+
+    auto id = ECUMASTER_SWITCHBOARD_BASE_ID + configuration->afr[0].ExtraCanIdOffset;
+    
+    // Handle first 4 channels for now
+    constexpr uint8_t channels = AUX_INPUT_CHANNELS > 4 ? 4 : AUX_INPUT_CHANNELS;
+
+    CanTxTyped<ecumaster::AVData> frame(id, true);
+    for (uint8_t i = 0; i < channels; i++)
+    {
+        if (configuration->ioExpanderConfig.IOInputsEnabled & (1 << i))
+        {
+            float voltage = GetAuxInputVoltage(i);
+
+            // Some hysteresis
+            if (voltage > 3.0f) analogStatus |= (1 << i);
+            if (voltage < 2.0f) analogStatus &= ~(1 << i);
+
+            uint16_t raw = (uint16_t)(voltage * 1000);
+            frame->Value[i] = raw;
+        }
+        else
+        {
+            frame->Value[i] = 0; // Input disabled, report as 0V
+        }
+    }
+
+    CanTxTyped<ecumaster::OtherData> otherFrame(id + 2, true);
+
+    otherFrame->AnalogState = analogStatus;
+    otherFrame->LowSideState = lowSideStatus;
+    otherFrame->Heartbeat = hearbeat++;
+}
+
+void HandleEcuMasterCanMessage(const CANRxFrame* msg, Configuration* configuration)
+{
+    auto msg_id = CAN_ID(*msg);
+
+    auto device_id = ECUMASTER_SWITCHBOARD_DEVICE_ID(configuration->ioExpanderConfig.Offset);
+
+    if (msg_id != device_id + ECUMASTER_SWITCHBOARD_RX_OFFSET) {
+        return; // Not a low-side control message
+    }
+
+    auto lowSideData = reinterpret_cast<const ecumaster::LowSideRxData*>(msg->data8);
+    for (uint8_t i = 0; i < 4; i++)
+    {
+        if (configuration->ioExpanderConfig.IOOutputsEnabled & (1 << i))
+        {
+            if (lowSideData->State[i])
+            {
+                lowSideStatus |= (1 << i);
+                SetAuxPwmDuty(i, 1.0); // Set PWM duty to 100% for active low-side output
+            }
+            else
+            {
+                lowSideStatus &= ~(1 << i);
+                SetAuxPwmDuty(i, 0.0); // Set PWM duty to 0% for inactive low-side output
+            }
+
+
+        }
+    }
+}
+
+constexpr ProtocolHandler ecuMasterSwitchBoardTxHandler = MakeProtocolHandler<&SendEcuMasterSwitchBoardFormat>(ECUMASTER_SWITCHBOARD_TX_PERIOD_MS);
+
+#endif

firmware/can/can_ecumaster.h

@@ -10,4 +10,7 @@
 
 extern const ProtocolHandler ecuMasterAfrTxHandler;
 extern const ProtocolHandler ecuMasterClassicEgtTxHandler;
-extern const ProtocolHandler ecuMasterBlackEgtTxHandler;
+extern const ProtocolHandler ecuMasterBlackEgtTxHandler;
+extern const ProtocolHandler ecuMasterSwitchBoardTxHandler;
+
+void HandleEcuMasterCanMessage(const CANRxFrame* msg, Configuration* configuration);

firmware/can/can_haltech.cpp

@@ -14,7 +14,6 @@
 #include "heater_control.h"
 #include "lambda_conversion.h"
 #include "max3185x.h"
-#include "../for_rusefi/wideband_can.h"
 
 // Haltech protocol
 // 1Mbps, big endian, DLC 8

firmware/can/can_msiobox.cpp

@@ -195,7 +195,7 @@ void ProcessMsIoBoxCanMessage(const CANRxFrame* fr, Configuration* cfg)
     }
 
     const uint32_t base = MS_IOBOX_DEVICE_ID(cfg->ioExpanderConfig.Offset);
-    uint32_t frame_id = fr->SID;
+    uint32_t frame_id = CAN_ID(*fr);
 
     if ((frame_id < base) || (frame_id > base + MS_IOBOX_LAST_IN))
         return;