small chademo can3 fix

damienmaguire · Feb 23, 2023 · f48649c · f48649c
1 parent ec55cae
commit f48649c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/include/param_prj.h b/include/param_prj.h
@@ -126,7 +126,7 @@
     VALUE_ENTRY(shunt_can,     CAN_DEV,             2073 ) \
     VALUE_ENTRY(lim_can,       CAN_DEV,             2074 ) \
     VALUE_ENTRY(charger_can,   CAN_DEV,             2075 ) \
-    VALUE_ENTRY(can3Speed,     CAN3Spd,             2080 ) \
+    VALUE_ENTRY(can3Set,       CAN3Spd,             2080 ) \
     VALUE_ENTRY(TRANS,        TRNMODES,             2081 ) \
     VALUE_ENTRY(Charger,       CHGMODS,             2027 ) \
     VALUE_ENTRY(tmphs,         "°C",                2028 ) \

diff --git a/src/CANSPI.cpp b/src/CANSPI.cpp
@@ -141,14 +141,14 @@ void CANSPI_Initialize(void)
    MCP2515_Write_ByteSequence(MCP2515_RXF5SIDH, MCP2515_RXF5EID0, &(RXF5reg.RXF5SIDH));
 
    // Initialize CAN Timings
-if(Param::GetInt(Param::can3Speed)==1)
+if(Param::GetInt(Param::CAN3Speed)==1)
 {
       MCP2515_Write_Byte(MCP2515_CNF1, 0x40);//500kbps at 16HMz xtal.
       MCP2515_Write_Byte(MCP2515_CNF2, 0xe5);
       MCP2515_Write_Byte(MCP2515_CNF3, 0x83);
 }
 
-if(Param::GetInt(Param::can3Speed)==0)
+if(Param::GetInt(Param::CAN3Speed)==0)
 {
    MCP2515_Write_Byte(MCP2515_CNF1, 0x4E);//33kbps at 16HMz xtal.
    MCP2515_Write_Byte(MCP2515_CNF2, 0xe5);

diff --git a/src/stm32_vcu.cpp b/src/stm32_vcu.cpp
@@ -715,7 +715,7 @@ void Param::Change(Param::PARAM_NUM paramNum)
       can->SetBaudrate((Can::baudrates)Param::GetInt(Param::canspeed));
       can2->SetBaudrate((Can::baudrates)Param::GetInt(Param::canspeed));
    case Param::CAN3Speed:
-       Param::SetInt(Param::can3Speed,Param::GetInt(Param::CAN3Speed));
+       Param::SetInt(Param::can3Set,Param::GetInt(Param::CAN3Speed));
       CANSPI_Initialize();// init the MCP25625 on CAN3
       CANSPI_ENRx_IRQ();  //init CAN3 Rx IRQ
       break;