Move can senders to separate folder

Author: xtitoris

firmware/Makefile

@@ -150,7 +150,8 @@ CPPSRC = $(ALLCPPSRC) \
           shared/flash.cpp \
           can.cpp \
           can_helper.cpp \
-          can_aemnet.cpp \
+          can/can_aemnet.cpp \
+          can/can_rusefi.cpp \
           status.cpp \
           lambda_conversion.cpp \
           pwm.cpp \

firmware/can.cpp

@@ -4,7 +4,8 @@
 
 #include "status.h"
 #include "can_helper.h"
-#include "can_aemnet.h"
+#include "can/can_rusefi.h"
+#include "can/can_aemnet.h"
 #include "heater_control.h"
 #include "lambda_conversion.h"
 #include "sampling.h"
@@ -22,7 +23,7 @@ static Configuration* configuration;
 static THD_WORKING_AREA(waCanTxThread, 512);
 void CanTxThread(void*)
 {
-    int cycle;
+    int cycle = 0;
     chRegSetThreadName("CAN Tx");
 
     // Current system time.
@@ -183,52 +184,11 @@ void InitCan()
     chThdCreateStatic(waCanRxThread, sizeof(waCanRxThread), NORMALPRIO - 4, CanRxThread, nullptr);
 }
 
-void SendRusefiFormat(uint8_t ch)
-{
-    auto baseAddress = WB_DATA_BASE_ADDR + 2 * configuration->afr[ch].RusEfiIdx;
-
-    const auto& sampler = GetSampler(ch);
-    const auto& heater = GetHeaterController(ch);
-
-    auto nernstDc = sampler.GetNernstDc();
-    auto pumpDuty = GetPumpOutputDuty(ch);
-    auto lambda = GetLambda(ch);
-
-    // Lambda is valid if:
-    // 1. Nernst voltage is near target
-    // 2. Lambda is >0.6 (sensor isn't specified below that)
-    bool lambdaValid =
-            nernstDc > (NERNST_TARGET - 0.1f) && nernstDc < (NERNST_TARGET + 0.1f) &&
-            lambda > 0.6f;
-
-    if (configuration->afr[ch].RusEfiTx) {
-        CanTxTyped<wbo::StandardData> frame(baseAddress + 0);
-
-        // The same header is imported by the ECU and checked against this data in the frame
-        frame.get().Version = RUSEFI_WIDEBAND_VERSION;
-
-        uint16_t lambdaInt = lambdaValid ? (lambda * 10000) : 0;
-        frame.get().Lambda = lambdaInt;
-        frame.get().TemperatureC = sampler.GetSensorTemperature();
-        bool heaterClosedLoop = heater.IsRunningClosedLoop();
-        frame.get().Valid = (heaterClosedLoop && lambdaValid) ? 0x01 : 0x00;
-    }
-
-    if (configuration->afr[ch].RusEfiTxDiag) {
-        CanTxTyped<wbo::DiagData> frame(baseAddress + 1);;
-
-        frame.get().Esr = sampler.GetSensorInternalResistance();
-        frame.get().NernstDc = nernstDc * 1000;
-        frame.get().PumpDuty = pumpDuty * 255;
-        frame.get().status = GetCurrentStatus(ch);
-        frame.get().HeaterDuty = GetHeaterDuty(ch) * 255;
-    }
-}
 
 // Weak link so boards can override it
 __attribute__((weak)) void SendCanForChannel(uint8_t ch)
 {
-    SendRusefiFormat(ch);
+    SendRusefiFormat(configuration, ch);
     SendAemNetUEGOFormat(configuration, ch);
 }
 

firmware/can.h

@@ -3,8 +3,6 @@
 #include <cstdint>
 
 void InitCan();
-void SendCanData(float lambda, uint16_t measuredResistance);
-void SendRusefiFormat(uint8_t ch);
 
 enum class HeaterAllow {
     // no CAN message telling us what to do has been rx'd

firmware/can_aemnet.cpp firmware/can/can_aemnet.cppfirmware/can_aemnet.cpp renamed to firmware/can/can_aemnet.cpp

@@ -56,18 +56,6 @@ static_assert(sizeof(EgtData) == 8);
 
 } //namespace aemnet
 
-static int LambdaIsValid(int ch)
-{
-    const auto& sampler = GetSampler(ch);
-    const auto& heater = GetHeaterController(ch);
-
-    float nernstDc = sampler.GetNernstDc();
-
-    return ((heater.IsRunningClosedLoop()) &&
-            (nernstDc > (NERNST_TARGET - 0.1f)) &&
-            (nernstDc < (NERNST_TARGET + 0.1f)));
-}
-
 void SendAemNetUEGOFormat(Configuration* cfg, uint8_t ch)
 {
     if (cfg->afr[ch].AemNetTx) {

firmware/can_aemnet.h firmware/can/can_aemnet.hfirmware/can_aemnet.h renamed to firmware/can/can_aemnet.h

@@ -0,0 +1,55 @@
+#include "can.h"
+#include "hal.h"
+
+#include "can_rusefi.h"
+
+#include "port.h"
+#include "status.h"
+#include "can_helper.h"
+#include "sampling.h"
+#include "pump_dac.h"
+#include "heater_control.h"
+#include "lambda_conversion.h"
+#include "../for_rusefi/wideband_can.h"
+
+void SendRusefiFormat(Configuration* configuration, uint8_t ch)
+{
+    auto baseAddress = WB_DATA_BASE_ADDR + 2 * configuration->afr[ch].RusEfiIdx;
+
+    const auto& sampler = GetSampler(ch);
+    const auto& heater = GetHeaterController(ch);
+
+    auto nernstDc = sampler.GetNernstDc();
+    auto pumpDuty = GetPumpOutputDuty(ch);
+    auto lambda = GetLambda(ch);
+
+    // Lambda is valid if:
+    // 1. Nernst voltage is near target
+    // 2. Lambda is >0.6 (sensor isn't specified below that)
+    bool lambdaValid =
+            LambdaIsValid(ch) &&
+            lambda > 0.6f;
+
+    if (configuration->afr[ch].RusEfiTx) {
+        CanTxTyped<wbo::StandardData> frame(baseAddress + 0);
+
+        // The same header is imported by the ECU and checked against this data in the frame
+        frame.get().Version = RUSEFI_WIDEBAND_VERSION;
+
+        uint16_t lambdaInt = lambdaValid ? (lambda * 10000) : 0;
+        frame.get().Lambda = lambdaInt;
+        frame.get().TemperatureC = sampler.GetSensorTemperature();
+        bool heaterClosedLoop = heater.IsRunningClosedLoop();
+        frame.get().Valid = (heaterClosedLoop && lambdaValid) ? 0x01 : 0x00;
+    }
+
+    if (configuration->afr[ch].RusEfiTxDiag) {
+        CanTxTyped<wbo::DiagData> frame(baseAddress + 1);;
+
+        frame.get().Esr = sampler.GetSensorInternalResistance();
+        frame.get().NernstDc = nernstDc * 1000;
+        frame.get().PumpDuty = pumpDuty * 255;
+        frame.get().status = GetCurrentStatus(ch);
+        frame.get().HeaterDuty = GetHeaterDuty(ch) * 255;
+    }
+}

firmware/can/can_rusefi.cpp

@@ -0,0 +1,6 @@
+#pragma once
+
+#include "port.h"
+#include <cstdint>
+
+void SendRusefiFormat(Configuration* configuration, uint8_t ch);

firmware/can/can_rusefi.h

@@ -1,5 +1,6 @@
 #include "lambda_conversion.h"
 #include "sampling.h"
+#include "heater_control.h"
 #include "port.h"
 
 static float GetPhiLsu49(float pumpCurrent)
@@ -91,3 +92,15 @@ float GetLambda(int ch)
     // Lambda is reciprocal of phi
     return 1 / GetPhi(pumpCurrent);
 }
+
+int LambdaIsValid(int ch)
+{
+    const auto& sampler = GetSampler(ch);
+    const auto& heater = GetHeaterController(ch);
+
+    float nernstDc = sampler.GetNernstDc();
+
+    return ((heater.IsRunningClosedLoop()) &&
+            (nernstDc > (NERNST_TARGET - 0.1f)) &&
+            (nernstDc < (NERNST_TARGET + 0.1f)));
+}

firmware/lambda_conversion.cpp

@@ -1,3 +1,5 @@
 #pragma once
 
 float GetLambda(int ch);
+
+int LambdaIsValid(int ch);