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

Compare commits

base: FaSTTUBe:c5343f9cddf5279620447c29d9dc669c899d5b19
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:b24fc66cafb5db05883023f51e8dea245d8c43e2
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

No commits in common. "c5343f9cddf5279620447c29d9dc669c899d5b19" and "b24fc66cafb5db05883023f51e8dea245d8c43e2" have entirely different histories.
c5343f9cdd ... b24fc66caf

4 changed files with 6 additions and 1167 deletions
Show Stats Expand all files Collapse all files

3
Core/Src/status_led.c
View File

@ -13,8 +13,7 @@
#define STATUS_LED_2_GREEN_PIN GPIO_PIN_14 #define STATUS_LED_2_GREEN_PIN GPIO_PIN_14
#define STATUS_LED_2_BLUE_PIN GPIO_PIN_15 #define STATUS_LED_2_BLUE_PIN GPIO_PIN_15
//TODO: change to correct values for the board #warning "GPIO pins for status LEDs are not set correctly"
#error "GPIO pins for status LEDs are not set correctly"
typedef struct { typedef struct {
uint8_t red : 1; uint8_t red : 1;

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

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

9
STM32Make.make
View File

@ -43,7 +43,6 @@ 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 \
@ -87,7 +86,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/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 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
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)
@ -163,7 +162,7 @@ CXXFLAGS += -g -gdwarf -ggdb
endif endif
# Add additional flags # Add additional flags
CFLAGS += -Wall -Wextra -Wno-unused-parameter CFLAGS +=
ASFLAGS += ASFLAGS +=
CXXFLAGS += CXXFLAGS +=
@ -243,13 +242,13 @@ $(BUILD_DIR):
# flash # flash
####################################### #######################################
flash: $(BUILD_DIR)/$(TARGET).elf flash: $(BUILD_DIR)/$(TARGET).elf
"/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" "/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"
####################################### #######################################
# erase # erase
####################################### #######################################
erase: $(BUILD_DIR)/$(TARGET).elf erase: $(BUILD_DIR)/$(TARGET).elf
"/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" "/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"
####################################### #######################################
# clean up # clean up

1159
compile_commands.json
View File

File diff suppressed because it is too large Load Diff