FaSTTUBe/mv-bms
55
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed the code for the PWM signals

Browse Source
This commit is contained in:
hamza
2024-06-06 16:46:57 +03:00
parent 8983097b87
commit 5ed35b605b
6 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Core/Src/state_machine.c
View File

@ -46,6 +46,7 @@ void sm_update(){
}
sm_set_relay_positions(state.current_state);
state.target_state = state.current_state;
}
State sm_update_inactive(){
@ -63,9 +64,12 @@ State sm_update_precharge(){
switch (state.target_state) {
case STATE_INACTIVE: // if CAN Signal 0000 0000 then immidiete shutdown
return STATE_DISCHARGE;
case STATE_READY:
if (roundf(RELAY_BAT_SIDE_VOLTAGE) == roundf(RELAY_ESC_SIDE_VOLTAGE))
case STATE_PRECHARGE:
if (RELAY_BAT_SIDE_VOLTAGE-RELAY_ESC_SIDE_VOLTAGE < 100)
return STATE_READY;
break;
case STATE_DISCHARGE:
return STATE_DISCHARGE;
default:
return STATE_PRECHARGE;
}
@ -95,8 +99,8 @@ State sm_update_active(){
State sm_update_discharge(){
switch (state.target_state) {
case STATE_INACTIVE:
if (RELAY_ESC_SIDE_VOLTAGE < 12)
case STATE_DISCHARGE:
if (RELAY_ESC_SIDE_VOLTAGE < 5000)
return STATE_INACTIVE;
case STATE_PRECHARGE: // if CAN Signal 1000 0000 then get ready
return STATE_PRECHARGE;
@ -136,7 +140,7 @@ State sm_update_error(){
}
void sm_set_relay_positions(State current_state){
switch (state.target_state) {
switch (state.current_state) {
case STATE_INACTIVE:
sm_set_relay(RELAY_MAIN, 0);
sm_set_relay(RELAY_PRECHARGE, 0);
@ -152,13 +156,18 @@ void sm_set_relay_positions(State current_state){
case STATE_ACTIVE:
sm_set_relay(RELAY_MAIN, 1);
sm_set_relay(RELAY_PRECHARGE, 0);
break;
case STATE_DISCHARGE:
sm_set_relay(RELAY_MAIN, 0);
sm_set_relay(RELAY_PRECHARGE, 0);
break;
case STATE_CHARGING_PRECHARGE:
sm_set_relay(RELAY_MAIN, 0);
sm_set_relay(RELAY_PRECHARGE, 1);
break;
case STATE_CHARGING:
sm_set_relay(RELAY_MAIN, 1);
sm_set_relay(RELAY_PRECHARGE, 1);
sm_set_relay(RELAY_PRECHARGE, 0);
break;
case STATE_ERROR:
sm_set_relay(RELAY_MAIN, 0);
@ -181,7 +190,6 @@ void sm_set_relay(Relay relay, bool closed){
}
}
void sm_check_charging(){
if (RELAY_BAT_SIDE_VOLTAGE < RELAY_ESC_SIDE_VOLTAGE && timestamp == 0)
timestamp = HAL_GetTick() + 5000;
@ -199,13 +207,13 @@ void sm_check_cell_temps(int8_t *id, int16_t *temp){
void sm_handle_ams_in(const uint8_t *data){
switch (data[0]) {
case 0b00000000:
case 0x00:
if (state.current_state != STATE_INACTIVE){
PWM_powerground_control(0);
state.target_state = STATE_DISCHARGE;
}
break;
case 0b10000000:
case 0x01:
if (state.target_state == STATE_INACTIVE || state.target_state == STATE_DISCHARGE){
PWM_powerground_control(0);
state.target_state = STATE_PRECHARGE;
@ -214,9 +222,11 @@ void sm_handle_ams_in(const uint8_t *data){
state.target_state = STATE_READY;
}
break;
case 0b11000000:
PWM_powerground_control(data[1]);
state.target_state = STATE_ACTIVE; // READY -> ACTIVE
case 0x02:
if (state.current_state == STATE_READY){
PWM_powerground_control(data[1]);
state.target_state = STATE_ACTIVE; // READY -> ACTIVE
}
break;
}
}