V1.5
This commit is contained in:
@ -11,6 +11,7 @@
|
||||
#include "TMP1075.h"
|
||||
#include "errors.h"
|
||||
#include "main.h"
|
||||
#include "stm32f302xc.h"
|
||||
#include "stm32f3xx_hal.h"
|
||||
#include <stdint.h>
|
||||
|
||||
@ -23,6 +24,7 @@ bool CURRENT_MEASUREMENT_ON;
|
||||
uint8_t powerground_status;
|
||||
uint32_t precharge_timer;
|
||||
uint32_t discharge_timer;
|
||||
uint32_t CAN_timer;
|
||||
|
||||
uint32_t powerground_calibration_timer;
|
||||
uint8_t powerground_calibration_stage;
|
||||
@ -33,7 +35,8 @@ void sm_init(){
|
||||
state.current_state = STATE_INACTIVE;
|
||||
state.target_state = STATE_INACTIVE;
|
||||
state.error_source = 0;
|
||||
precharge_timer = discharge_timer = powerground_calibration_timer = 0;
|
||||
precharge_timer = discharge_timer = powerground_calibration_timer;
|
||||
CAN_timer = HAL_GetTick() + 5000;
|
||||
}
|
||||
|
||||
#warning change amsState here
|
||||
@ -41,7 +44,9 @@ void sm_update(){
|
||||
sm_check_errors();
|
||||
sm_precharge_discharge_manager();
|
||||
sm_calibrate_powerground();
|
||||
|
||||
if (CAN_timer < HAL_GetTick())
|
||||
state.current_state = state.target_state = STATE_ERROR;
|
||||
|
||||
int16_t base_offset = 0;
|
||||
if (state.current_state == STATE_INACTIVE){
|
||||
base_offset = module.auxVoltages[0];
|
||||
@ -288,6 +293,7 @@ void sm_calibrate_powerground(){
|
||||
}
|
||||
|
||||
void sm_handle_ams_in(const uint8_t *data){
|
||||
CAN_timer = HAL_GetTick() + CAN_TIMEOUT;
|
||||
switch (data[0]) {
|
||||
case 0x00:
|
||||
if (state.current_state != STATE_INACTIVE){
|
||||
@ -337,10 +343,10 @@ bool sm_is_errored(){
|
||||
|
||||
#warning TODO: add error checking for everything here
|
||||
void sm_check_errors(){
|
||||
state.error_type.temperature_error = (error_data.data_kind == SEK_OVERTEMP || error_data.data_kind == SEK_UNDERTEMP || error_data.data_kind == SEK_TOO_FEW_TEMPS) ? 1 : 0;
|
||||
state.error_type.voltage_error = (error_data.data_kind == SEK_OVERVOLT || error_data.data_kind == SEK_UNDERVOLT || error_data.data_kind == SEK_OPENWIRE || RELAY_BAT_SIDE_VOLTAGE < 30000) ? 1 : 0;
|
||||
state.error_type.bms_timeout = (error_data.data_kind == SEK_INTERNAL_BMS_TIMEOUT) ? 1 : 0;
|
||||
state.error_type.bms_fault = (error_data.data_kind == SEK_INTERNAL_BMS_CHECKSUM_FAIL || error_data.data_kind == SEK_INTERNAL_BMS_FAULT /*|| error_data.data_kind == SEK_INTERNAL_BMS_OVERTEMP*/) ? 1 : 0;
|
||||
state.error_type.temperature_error = (error_data.error_sources & (1 << 0) || error_data.error_sources & (1 << 1) || error_data.error_sources & (1 << 4)) ? 1 : 0;
|
||||
state.error_type.voltage_error = (error_data.error_sources & (1 << 2)|| error_data.error_sources & (1 << 3)|| error_data.error_sources & (1 << 5) || RELAY_BAT_SIDE_VOLTAGE < 30000) ? 1 : 0;
|
||||
state.error_type.bms_timeout = (error_data.error_sources & (1 << 7)) ? 1 : 0;
|
||||
state.error_type.bms_fault = (error_data.error_sources & (1 << 8) || error_data.error_sources & (1 << 10) || error_data.error_sources & (1 << 9)) ? 1 : 0;
|
||||
//SEK_EEPROM_ERR: state.error_type.eeprom_error = 1;
|
||||
state.error_type.current_error = (powerground_status > 10 && CURRENT_MEASUREMENT < 1000) ? 1 : 0;
|
||||
state.error_type.current_sensor_missing = (!CURRENT_MEASUREMENT_ON) ? 1 : 0;
|
||||
@ -354,8 +360,7 @@ void sm_check_errors(){
|
||||
state.current_state = STATE_DISCHARGE;
|
||||
state.target_state = STATE_ERROR;
|
||||
PWM_powerground_control(255);
|
||||
} else {
|
||||
if (state.current_state == STATE_ERROR)
|
||||
} else if (state.current_state == STATE_ERROR){
|
||||
state.target_state = STATE_INACTIVE;
|
||||
}
|
||||
sm_error_source();
|
||||
|
||||
Reference in New Issue
Block a user