FaSTTUBe/ams-master-23
54
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: FaSTTUBe:61155995f84b24efb0692014724e780fb57be17d
Branches Tags
FaSTTUBe:main FaSTTUBe:sdc-plausibility FaSTTUBe:stm32h7a3-conversion FaSTTUBe:ft23 FaSTTUBe:new-error-types-adbms6830 FaSTTUBe:status-leds FaSTTUBe:max_algo_dev_branch
...
compare: FaSTTUBe:main
Branches Tags
FaSTTUBe:sdc-plausibility FaSTTUBe:stm32h7a3-conversion FaSTTUBe:ft23 FaSTTUBe:new-error-types-adbms6830 FaSTTUBe:status-leds FaSTTUBe:main FaSTTUBe:max_algo_dev_branch

2 Commits
61155995f8 ... main

Author SHA1 Message Date
Kilian Bracher
de184afd03 add -Wextra compiler flag 
(but turn off warnings for unused parameters)
 2023-12-04 18:43:17 +01:00
Jasper v. Blanckenburg
cef05f52bc Multiply SoC delta by 100 to get percentage 2023-08-01 14:39:01 +02:00
4 changed files with 1167 additions and 9 deletions
Expand all files Collapse all files

6
Core/Src/soc_estimation.c
View File

@ -21,7 +21,6 @@ float current_soc;
int current_was_flowing; int current_was_flowing;
uint32_t last_current_time; uint32_t last_current_time;
uint32_t first_current_time;
float soc_before_current; float soc_before_current;
float mAs_before_current; float mAs_before_current;
@ -36,7 +35,6 @@ void soc_update() {
if (shunt_data.current >= SOC_ESTIMATION_NO_CURRENT_THRESH) { if (shunt_data.current >= SOC_ESTIMATION_NO_CURRENT_THRESH) {
last_current_time = now; last_current_time = now;
if (!current_was_flowing) { if (!current_was_flowing) {
first_current_time = now;
soc_before_current = current_soc; soc_before_current = current_soc;
mAs_before_current = shunt_data.current_counter; mAs_before_current = shunt_data.current_counter;
} }
@ -53,8 +51,8 @@ void soc_update() {
} else { } else {
// Otherwise, use the current counter to update SoC // Otherwise, use the current counter to update SoC
float as_delta = shunt_data.current_counter - mAs_before_current; float as_delta = shunt_data.current_counter - mAs_before_current;
current_soc = float soc_delta = as_delta / SOC_ESTIMATION_BATTERY_CAPACITY * 100;
soc_before_current + as_delta / SOC_ESTIMATION_BATTERY_CAPACITY; current_soc = soc_before_current + soc_delta;
} }
} }

2
STM32-for-VSCode.config.yaml
View File

@ -40,7 +40,7 @@ cxxDefinitionsFile:
asDefinitionsFile: asDefinitionsFile:
# Compiler flags # Compiler flags
cFlags: [] cFlags: [-Wall, -Wextra, -Wno-unused-parameter]
cxxFlags: [] cxxFlags: []
assemblyFlags: [] assemblyFlags: []
linkerFlags: linkerFlags:

9
STM32Make.make
View File

@ -43,6 +43,7 @@ Core/Src/main.c \
Core/Src/shunt_monitoring.c \ Core/Src/shunt_monitoring.c \
Core/Src/slave_monitoring.c \ Core/Src/slave_monitoring.c \
Core/Src/soc_estimation.c \ Core/Src/soc_estimation.c \
Core/Src/status_led.c \
Core/Src/stm32f3xx_hal_msp.c \ Core/Src/stm32f3xx_hal_msp.c \
Core/Src/stm32f3xx_it.c \ Core/Src/stm32f3xx_it.c \
Core/Src/system_stm32f3xx.c \ Core/Src/system_stm32f3xx.c \
@ -86,7 +87,7 @@ PREFIX = arm-none-eabi-
POSTFIX = " POSTFIX = "
# The gcc compiler bin path can be either defined in make command via GCC_PATH variable (> make GCC_PATH=xxx) # The gcc compiler bin path can be either defined in make command via GCC_PATH variable (> make GCC_PATH=xxx)
# either it can be added to the PATH environment variable. # either it can be added to the PATH environment variable.
GCC_PATH="/home/jasper/.config/Code/User/globalStorage/bmd.stm32-for-vscode/@xpack-dev-tools/arm-none-eabi-gcc/11.3.1-1.1.2/.content/bin GCC_PATH="/home/kbracher/.vscode-server/data/User/globalStorage/bmd.stm32-for-vscode/@xpack-dev-tools/arm-none-eabi-gcc/12.3.1-1.2.1/.content/bin
ifdef GCC_PATH ifdef GCC_PATH
CXX = $(GCC_PATH)/$(PREFIX)g++$(POSTFIX) CXX = $(GCC_PATH)/$(PREFIX)g++$(POSTFIX)
CC = $(GCC_PATH)/$(PREFIX)gcc$(POSTFIX) CC = $(GCC_PATH)/$(PREFIX)gcc$(POSTFIX)
@ -162,7 +163,7 @@ CXXFLAGS += -g -gdwarf -ggdb
endif endif
# Add additional flags # Add additional flags
CFLAGS += CFLAGS += -Wall -Wextra -Wno-unused-parameter
ASFLAGS += ASFLAGS +=
CXXFLAGS += CXXFLAGS +=
@ -242,13 +243,13 @@ $(BUILD_DIR):
# flash # flash
####################################### #######################################
flash: $(BUILD_DIR)/$(TARGET).elf flash: $(BUILD_DIR)/$(TARGET).elf
"/home/jasper/.config/Code/User/globalStorage/bmd.stm32-for-vscode/@xpack-dev-tools/openocd/0.11.0-5.1/.content/bin/openocd" -f ./openocd.cfg -c "program $(BUILD_DIR)/$(TARGET).elf verify reset exit" "/home/kbracher/.vscode-server/data/User/globalStorage/bmd.stm32-for-vscode/@xpack-dev-tools/openocd/0.12.0-2.1/.content/bin/openocd" -f ./openocd.cfg -c "program $(BUILD_DIR)/$(TARGET).elf verify reset exit"
####################################### #######################################
# erase # erase
####################################### #######################################
erase: $(BUILD_DIR)/$(TARGET).elf erase: $(BUILD_DIR)/$(TARGET).elf
"/home/jasper/.config/Code/User/globalStorage/bmd.stm32-for-vscode/@xpack-dev-tools/openocd/0.11.0-5.1/.content/bin/openocd" -f ./openocd.cfg -c "init; reset halt; stm32f3x mass_erase 0; exit" "/home/kbracher/.vscode-server/data/User/globalStorage/bmd.stm32-for-vscode/@xpack-dev-tools/openocd/0.12.0-2.1/.content/bin/openocd" -f ./openocd.cfg -c "init; reset halt; stm32f3x mass_erase 0; exit"
####################################### #######################################
# clean up # clean up

1159
compile_commands.json Normal file
View File

File diff suppressed because it is too large Load Diff