fix: wrong filter id for cellboard balancing

eagletrt · Apr 11, 2024 · 07dbd06 · 07dbd06
1 parent b6ec58d
commit 07dbd06
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/cellboard/Core/Src/can_comms.c b/cellboard/Core/Src/can_comms.c
@@ -71,8 +71,8 @@ void can_init_with_filter() {
         .FilterActivation = CAN_FILTER_ENABLE,
         .FilterBank = 0,
         .FilterFIFOAssignment = CAN_FILTER_FIFO0,
-        .FilterIdHigh = BMS_TOPIC_FILTER_BALANCING << 5,
-        .FilterIdLow = BMS_TOPIC_FILTER_BALANCING << 5,
+        .FilterIdHigh = BMS_SET_BALANCING_STATUS_FRAME_ID << 5,
+        .FilterIdLow = BMS_SET_BALANCING_STATUS_FRAME_ID << 5,
         .FilterMaskIdHigh = BMS_TOPIC_MASK_BALANCING << 5,
         .FilterMaskIdLow = BMS_TOPIC_MASK_BALANCING << 5,
         .FilterMode = CAN_FILTERMODE_IDMASK,

diff --git a/cellboard/STM32-for-VSCode.config.yaml b/cellboard/STM32-for-VSCode.config.yaml
@@ -18,7 +18,7 @@ cpu: -mcpu=cortex-m4
 fpu: -mfpu=fpv4-sp-d16
 floatAbi: -mfloat-abi=hard
 ldscript: STM32L432KBUx_FLASH_shifted.ld # linker script
-#ldscript: STM32L432KBUx_FLASH.ld # linker script
+# ldscript: STM32L432KBUx_FLASH.ld # linker script
 
 # Compiler definitions. The -D prefix for the compiler will be automatically added.
 cDefinitions: 

diff --git a/cellboard/openocd.cfg b/cellboard/openocd.cfg
@@ -2,7 +2,7 @@
 
 # Programmer, can be changed to several interfaces
 # Standard will be the stlink interface as this is the standard for STM32 dev boards
-source [find interface/stlink.cfg]
+source [find interface/cmsis-dap.cfg]
 
 # The target MCU. This should match your board
 source [find target/stm32l4x.cfg]
diff --git a/mainboard/lib/can b/mainboard/lib/can
+1 −1		dbc/bms/bms.dbc
+14 −11		dbc/primary/primary.dbc
+6 −1		dbc/secondary/secondary.dbc
+1 −1		dbc/simulator/simulator.dbc
+1 −1		lib/bms/bms_network.c
+24 −2		lib/bms/bms_network.h
+3 −3		lib/bms/bms_utils_c.h
+1 −1		lib/inverters/inverters_network.c
+9 −3		lib/inverters/inverters_network.h
+3 −3		lib/inverters/inverters_utils_c.h
+1 −1		lib/ivts/ivts_network.c
+15 −3		lib/ivts/ivts_network.h
+5 −5		lib/ivts/ivts_utils_c.h
+111 −50		lib/primary/primary_network.c
+158 −45		lib/primary/primary_network.h
+23 −5		lib/primary/primary_utils_c.c
+6 −3		lib/primary/primary_utils_c.h
+227 −1		lib/secondary/secondary_network.c
+201 −6		lib/secondary/secondary_network.h
+30 −0		lib/secondary/secondary_utils_c.c
+11 −4		lib/secondary/secondary_utils_c.h
+2 −1		lib/secondary/secondary_watchdog.c
+5 −4		lib/secondary/secondary_watchdog.h
+1 −1		lib/simulator/simulator_network.c
+7 −2		lib/simulator/simulator_network.h
+2 −2		lib/simulator/simulator_utils_c.h
+17 −12		networks/primary/network.json
+24 −0		networks/secondary/network.json
+4 −1		proto/primary/primary.proto
+6 −0		proto/primary/primary_proto_interface.h
+9 −3		proto/secondary/secondary.proto
+25 −0		proto/secondary/secondary_proto_interface.h