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

changed variables from static to extern for use in other functions

This commit is contained in:
hamza 2024-06-03 01:32:33 +03:00
parent f52abb8ef0
commit 757165c9bf
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Core/Inc/state_machine.h
View File

@ -64,9 +64,9 @@ typedef struct {
extern StateHandle state; extern StateHandle state;
static bool relay_closed = 0; static bool relay_closed = 0;
static bool precharge_closed = 0; static bool precharge_closed = 0;
static int16_t RELAY_BAT_SIDE_VOLTAGE; extern int16_t RELAY_BAT_SIDE_VOLTAGE;
static int16_t RELAY_ESC_SIDE_VOLTAGE; extern int16_t RELAY_ESC_SIDE_VOLTAGE;
static int16_t CURRENT_MEASUREMENT; extern int16_t CURRENT_MEASUREMENT;
void sm_init(); void sm_init();
void sm_update(); void sm_update();

11
Core/Src/state_machine.c
View File

@ -2,7 +2,10 @@
#include "stm32f3xx_hal.h" #include "stm32f3xx_hal.h"
StateHandle state; StateHandle state;
static uint32_t timestamp; int16_t RELAY_BAT_SIDE_VOLTAGE;
int16_t RELAY_ESC_SIDE_VOLTAGE;
int16_t CURRENT_MEASUREMENT;
uint32_t timestamp;
void sm_init(){ void sm_init(){
state.current_state = STATE_INACTIVE; state.current_state = STATE_INACTIVE;
@ -11,9 +14,9 @@ void sm_init(){
} }
void sm_update(){ void sm_update(){
RELAY_BAT_SIDE_VOLTAGE = module.auxVoltages[0] * 11.989; RELAY_BAT_SIDE_VOLTAGE = module.auxVoltages[0] * 12.42; // the calculation says the factor is 11.989. 12.42 yields the better result
RELAY_ESC_SIDE_VOLTAGE = module.auxVoltages[1] * 11.989; RELAY_ESC_SIDE_VOLTAGE = module.auxVoltages[1] * 12.42;
CURRENT_MEASUREMENT = module.auxVoltages[2] ; CURRENT_MEASUREMENT = module.auxVoltages[2] / 2.2;
switch (state.current_state) { switch (state.current_state) {
case STATE_INACTIVE: case STATE_INACTIVE: