diff --git a/Core/Inc/common_defs.h b/Core/Inc/common_defs.h deleted file mode 100644 index faff2dd..0000000 --- a/Core/Inc/common_defs.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * common_defs.h - * - * Created on: 23 Mar 2022 - * Author: Jasper - */ - -#ifndef INC_COMMON_DEFS_H_ -#define INC_COMMON_DEFS_H_ - -#define N_CELLS 12 -#define N_TEMP_SENSORS 12 - -#endif /* INC_COMMON_DEFS_H_ */ diff --git a/Core/Src/can.c b/Core/Src/can.c index 9800342..9eb50d4 100644 --- a/Core/Src/can.c +++ b/Core/Src/can.c @@ -73,7 +73,7 @@ void can_handle_send_status() { data[7] = ((highest_temp) >> 4); ftcan_transmit(CAN_ID_OUT, data, sizeof(data)); - + /* int8_t id_lowest_temp = -1; int16_t lowest_temp = INT16_MIN; for (int i = 0; i < N_TEMP_SENSORS; i++) { @@ -109,6 +109,7 @@ void can_handle_send_status() { data[7] = 0; ftcan_transmit(CAN_ID_OUT, data, sizeof(data)); + */ } /* diff --git a/Core/Src/state_machine.c b/Core/Src/state_machine.c index fb70cdf..18804ce 100644 --- a/Core/Src/state_machine.c +++ b/Core/Src/state_machine.c @@ -29,6 +29,10 @@ void sm_init(){ precharge_timer = discharge_timer = powerground_calibration_timer = 0; } +void sm_update_BMS_state(){ + +} + #warning change amsState here void sm_update(){ sm_check_errors();