fix: cant stop balancing

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

Hide file tree

Showing 8 changed files with 1,706 additions and 1,705 deletions.
diff --git a/cellboard/Core/Lib/can b/cellboard/Core/Lib/can
diff --git a/cellboard/Core/Lib/micro-libs b/cellboard/Core/Lib/micro-libs
diff --git a/cellboard/Core/Src/can_comms.c b/cellboard/Core/Src/can_comms.c
@@ -115,7 +115,8 @@ void can_send(uint16_t id) {
         conv_state.cellboard_id = cellboard_index;
         conv_state.balancing_status = BMS_BOARD_STATUS_BALANCING_STATUS_OFF_CHOICE;
 
-        if (fsm_get_state() == STATE_DISCHARGE)
+        bal_state_t fsm_state = fsm_get_state();
+        if (fsm_state == STATE_DISCHARGE || fsm_state == STATE_COOLDOWN)
             conv_state.balancing_status = BMS_BOARD_STATUS_BALANCING_STATUS_DISCHARGE_CHOICE;
         else
             conv_state.balancing_status = BMS_BOARD_STATUS_BALANCING_STATUS_OFF_CHOICE;

diff --git a/cellboard/Core/Src/stm32l4xx_it.c b/cellboard/Core/Src/stm32l4xx_it.c
@@ -91,6 +91,7 @@ void HardFault_Handler(void)
 {
   /* USER CODE BEGIN HardFault_IRQn 0 */
 
+  HAL_UART_Transmit(&huart1, (uint8_t *)"Bug\r\n", 5, 10);
   HAL_NVIC_SystemReset();
 
   /* USER CODE END HardFault_IRQn 0 */

diff --git a/mainboard/Src/bal.c b/mainboard/Src/bal.c
@@ -52,8 +52,8 @@ void bal_update_status(uint8_t cellboard, bool status) {
     if (cellboard >= CELLBOARD_COUNT)
         return;
 
-    bal_status.status &= ~(1 << cellboard);
-    bal_status.status |= (1 << cellboard) & status;
+    bal_status.status &= ~(1U << cellboard);
+    bal_status.status |= (1U << cellboard) * status;
 }
 void bal_stop(void) {
     bal_change_status_request(false, BAL_THRESHOLD_DEFAULT);

diff --git a/mainboard/lib/micro-libs b/mainboard/lib/micro-libs
diff --git a/scripts/binaries/cellboard.srec b/scripts/binaries/cellboard.srec
diff --git a/scripts/binaries/fenice-bms.srec b/scripts/binaries/fenice-bms.srec
+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
+33 −9		bms-monitor/inc/ltc6811.h
+1 −1		bms-monitor/src/ltc6811.c
+1 −1		can-manager/src/can_manager.c
+1 −1		docs/blinky/blinky.md
+1 −0		docs/bms-monitor/.pages
+ −		docs/bms-monitor/assets/pec-calculation.png
+5 −0		docs/bms-monitor/ltc6811/.pages
+175 −0		docs/bms-monitor/ltc6811/command-format.md
+20 −0		docs/bms-monitor/ltc6811/ltc6811.md
+29 −0		docs/bms-monitor/ltc6811/pec.md
+201 −66		mcp23017/README.md
+22 −24		mcp23017/inc/mcp23017.h