Added can mode selection

Author: xtitoris

firmware/boards/f0_module/bootloader/bootloader.cpp

@@ -225,7 +225,7 @@ THD_FUNCTION(BootloaderThread, arg)
     (void)arg;
 
     // turn on CAN
-    canStart(&CAND1, &GetCanConfig());
+    canStart(&CAND1, &GetCanConfig(0));
 
     WaitForBootloaderCmd();
 

firmware/boards/f0_module/port_shared.cpp

@@ -11,6 +11,6 @@ static const CANConfig canConfig500 =
     CAN_BTR_SJW(0) | CAN_BTR_BRP(5)  | CAN_BTR_TS1(12) | CAN_BTR_TS2(1),
 };
 
-const CANConfig& GetCanConfig() {
+const CANConfig& GetCanConfig(uint8_t mode) {
     return canConfig500;
 }

firmware/boards/f1_dual/port_shared.cpp

@@ -11,6 +11,6 @@ static const CANConfig canConfig500 =
     CAN_BTR_SJW(0) | CAN_BTR_BRP(2)  | CAN_BTR_TS1(12) | CAN_BTR_TS2(1),
 };
 
-const CANConfig& GetCanConfig() {
+const CANConfig& GetCanConfig(uint8_t mode) {
     return canConfig500;
 }

firmware/boards/f1_dual_rev1/port_shared.cpp

@@ -39,6 +39,12 @@ static const CANConfig canConfig1000 =
 };
 
 
-const CANConfig& GetCanConfig() {
-    return canConfig500;
+const CANConfig& GetCanConfig(uint8_t mode) {
+    mode &= 0x03;
+    switch (mode) {
+        case 0:
+            return canConfig500;
+        case 1:
+            return canConfig1000;
+    }
 }

firmware/boards/f1_rev2/port_shared.cpp

@@ -11,6 +11,6 @@ static const CANConfig canConfig500 =
     CAN_BTR_SJW(0) | CAN_BTR_BRP(4 - 1)  | CAN_BTR_TS1(13 - 1) | CAN_BTR_TS2(2 - 1),
 };
 
-const CANConfig& GetCanConfig() {
+const CANConfig& GetCanConfig(uint8_t mode) {
     return canConfig500;
 }

firmware/boards/f1_rev3/port_shared.cpp

@@ -11,6 +11,6 @@ static const CANConfig canConfig500 =
     CAN_BTR_SJW(0) | CAN_BTR_BRP(2)  | CAN_BTR_TS1(12) | CAN_BTR_TS2(1),
 };
 
-const CANConfig& GetCanConfig() {
+const CANConfig& GetCanConfig(uint8_t mode) {
     return canConfig500;
 }

firmware/boards/port.h

@@ -58,7 +58,7 @@ class Configuration {
 private:
     // Increment this any time the configuration format changes
     // It is stored along with the data to ensure that it has been written before
-    static constexpr uint32_t ExpectedTag = 0xDEADBE03;
+    static constexpr uint32_t ExpectedTag = 0xDEADBE04;
     uint32_t Tag = ExpectedTag;
 
 public:
@@ -75,6 +75,7 @@ class Configuration {
         *this = {};
 
         NoLongerUsed0 = 0;
+        CanMode = 0;
         sensorType = BOARD_DEFAULT_SENSOR_TYPE;
 
         /* default auxout curve is 0..5V for AFR 8.5 to 18.0
@@ -119,7 +120,8 @@ class Configuration {
     // Actual configuration data
     union {
         struct {
-            uint8_t NoLongerUsed0 = 0;
+            uint8_t NoLongerUsed0 : 6 = 0;
+            uint8_t CanMode : 2;
             // AUX0 and AUX1 curves
             float auxOutBins[2][8];
             float auxOutValues[2][8];

firmware/boards/port_shared.h

@@ -4,6 +4,6 @@
 
 #include "hal.h"
 
-const CANConfig& GetCanConfig();
+const CANConfig& GetCanConfig(uint8_t mode);
 
 #endif // WB_PROD

firmware/can.cpp

@@ -179,7 +179,7 @@ void InitCan()
 {
     configuration = GetConfiguration();
 
-    canStart(&CAND1, &GetCanConfig());
+    canStart(&CAND1, &GetCanConfig(configuration->CanMode));
     chThdCreateStatic(waCanTxThread, sizeof(waCanTxThread), NORMALPRIO, CanTxThread, nullptr);
     chThdCreateStatic(waCanRxThread, sizeof(waCanRxThread), NORMALPRIO - 4, CanRxThread, nullptr);
 }

firmware/ini/wideband_dual.ini

@@ -60,7 +60,7 @@ page 	   = 1
 
 ; name         =  class, type, offset, [shape], units, scale, translate, min,   max, digits
 ; First four bytes are used for internal tag. Should not be accessable from TS
-CanIndexOffset = scalar,  U08,      4,             "",     1,         0,   0,   255,      0
+CanMode        = bits,    U08,      4,   [7:8], "500kbps", "1000kbps", "INVALID", "INVALID"
 Aux0OutBins    =  array,  F32,      5,     [8],    "",     1,         0,   0,  1500,      2
 Aux1OutBins    =  array,  F32,     37,     [8],    "",     1,         0,   0,  1500,      2
 Aux0Out        =  array,  F32,     69,     [8],   "V",     1,         0,   0,   5.0,      2
@@ -338,7 +338,8 @@ menuDialog = main
    menu = "&Settings"
       subMenu = sensor_settings, "Sensor settings"
       subMenu = heater_settings, "Heater settings"
-      subMenu = can_settings, "CAN AFR settings"
+      subMenu = can_speed_settings, "CAN Speed settings"
+      subMenu = can_afr_settings, "CAN AFR settings"
       subMenu = can_egt_settings, "CAN EGT settings"
 
    menu = "Outputs"
@@ -367,6 +368,9 @@ cmd_openblt                  = "Z\x00\xbc\x00\x00"
 
 [UserDefined]
 
+dialog = can_speed_settings, "Can Settings"
+   field = "Speed", CanMode
+
 dialog = sensor_settings, "Sensor Settings"
    field = "Sensor Type", LsuSensorType
 
@@ -407,11 +411,11 @@ dialog = egt1_can_settings, "EGT 1 (right) channel CAN Settings"
    field = "Output EGT", AemNetEgtTx1
    field = "Device index (CAN ID is 0xA0305 + IDX)", AemNetEgtIdx1, { (AemNetEgtTx1 == 1) }, { 1 }, displayInHex
 
-dialog = can_settings, "CAN AFR Settings", border
+dialog = can_afr_settings, "CAN AFR Settings", border
    panel = afr0_can_settings, West
    panel = afr1_can_settings, East
 
-dialog = can_egt_settings, "CAN AFR Settings", border
+dialog = can_egt_settings, "CAN EGT Settings", border
    panel = egt0_can_settings, West
    panel = egt1_can_settings, East