Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/UBCFormulaElectric/Consol…
Browse files Browse the repository at this point in the history 
…idated-Firmware into mattiasjack/lv/bat_mtr
  • Loading branch information
@yawollopkcaj
yawollopkcaj committed Feb 4, 2025
2 parents e356310 + 3d4cd44 commit 7284053
Show file tree
Hide file tree
Showing 97 changed files with 14,499 additions and 1,958 deletions.
342 changes: 160 additions & 182 deletions .vscode/tasks.json
View file
Original file line number Diff line number Diff line change
@@ -1,188 +1,166 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Launch: STM32CubeMX",
"type": "shell",
"command": "./STM32CubeMX",
"group": "build",
"linux": {
"options": {
"cwd": "/usr/local/STM32CubeMX/"
}
},
"osx": {
"options": {
"cwd": "/Applications/STMicroelectronics/STM32CubeMX.app/Contents/MacOs"
}
}
},
{
"label": "Format: Codebase",
"type": "shell",
"command": "python3 fix_formatting.py",
"group": "build",
"options": {
"cwd": "${workspaceFolder}/scripts/utilities/"
}
},
{
"label": "CMake: Load",
"detail": "CMake Generate step",
"group": "build",
"type": "cmake",
"command": "configure",
"preset": "${command:cmake.activeConfigurePresetName}"
},
{
"label": "CMake: Clean",
"detail": "CMake template clean task",
"group": "build",
"type": "cmake",
"command": "clean",
"preset": "${command:cmake.activeBuildPresetName}"
},
{
"label": "Build Embedded: BMS (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": [
"quadruna_BMS.hex", "can_bus_load_quadruna"
]
},
{
"label": "Build Embedded: CRIT (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": [
"quadruna_CRIT.hex", "can_bus_load_quadruna"
]
},
{
"label": "Build Embedded: FSM (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": [
"quadruna_FSM.hex", "can_bus_load_quadruna"
]
},
{
"label": "Build Embedded: RSM (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": [
"quadruna_RSM.hex", "can_bus_load_quadruna"
]
},
{
"label": "Build Embedded: VC (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": ["quadruna_VC.hex", "can_bus_load_quadruna"],
},
{
"label": "Build Embedded: BMS (Quintuna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": [
"quintuna_BMS.hex", "can_bus_load_quadruna"
]
},
{
"label": "Build Embedded: CRIT (Quintuna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": [
"quintuna_CRIT.hex", "can_bus_load_quintuna"
]
},
{
"label": "Build Embedded: f4dev",
"group": "build",
"type": "cmake",
"command": "build",
"targets": [
"f4dev.hex"
]
},
{
"label": "Build Embedded: h7dev",
"group": "build",
"type": "cmake",
"command": "build",
"targets": [
"h7dev.hex"
]
},
{
"label": "Build Tests: BMS (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": [
"quadruna_BMS_test"
]
},
{
"label": "Build Tests: CRIT (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": [
"quadruna_CRIT_test"
]
},
{
"label": "Build Tests: CRIT (Quintuna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": [
"quintuna_CRIT_test"
]
},
{
"label": "Build Tests: FSM (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": [
"quadruna_FSM_test"
]
},
{
"label": "Build Tests: RSM (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": [
"quadruna_RSM_test"
]
},
{
"label": "Build Tests: VC (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": [
"quadruna_VC_test"
]
},
{
"label": "Build Tests: Shared",
"group": "build",
"type": "cmake",
"command": "build",
"targets": [
"shared_test"
]
{
"label": "Launch: STM32CubeMX",
"type": "shell",
"command": "./STM32CubeMX",
"group": "build",
"linux": {
"options": {
"cwd": "/usr/local/STM32CubeMX/"
}
},
"osx": {
"options": {
"cwd": "/Applications/STMicroelectronics/STM32CubeMX.app/Contents/MacOs"
}
}
},
{
"label": "Format: Codebase",
"type": "shell",
"command": "python3 fix_formatting.py",
"group": "build",
"options": {
"cwd": "${workspaceFolder}/scripts/utilities/"
}
},
{
"label": "CMake: Load",
"detail": "CMake Generate step",
"group": "build",
"type": "cmake",
"command": "configure",
"preset": "${command:cmake.activeConfigurePresetName}"
},
{
"label": "CMake: Clean",
"detail": "CMake template clean task",
"group": "build",
"type": "cmake",
"command": "clean",
"preset": "${command:cmake.activeBuildPresetName}"
},
{
"label": "Build Embedded: BMS (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": ["quadruna_BMS.hex", "can_bus_load_quadruna"]
},
{
"label": "Build Embedded: CRIT (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": ["quadruna_CRIT.hex", "can_bus_load_quadruna"]
},
{
"label": "Build Embedded: FSM (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": ["quadruna_FSM.hex", "can_bus_load_quadruna"]
},
{
"label": "Build Embedded: RSM (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": ["quadruna_RSM.hex", "can_bus_load_quadruna"]
},
{
"label": "Build Embedded: VC (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": ["quadruna_VC.hex", "can_bus_load_quadruna"]
},
{
"label": "Build Embedded: BMS (Quintuna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": ["quintuna_BMS.hex", "can_bus_load_quadruna"]
},
{
"label": "Build Embedded: CRIT (Quintuna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": ["quintuna_CRIT.hex", "can_bus_load_quintuna"]
},
{
"label": "Build Embedded: DAM (Quintuna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": ["quintuna_DAM.hex", "can_bus_load_quintuna"]
},
{
"label": "Build Embedded: f4dev",
"group": "build",
"type": "cmake",
"command": "build",
"targets": ["f4dev.hex"]
},
{
"label": "Build Embedded: h7dev",
"group": "build",
"type": "cmake",
"command": "build",
"targets": ["h7dev.hex"]
},
{
"label": "Build Tests: BMS (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": ["quadruna_BMS_test"]
},
{
"label": "Build Tests: CRIT (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": ["quadruna_CRIT_test"]
},
{
"label": "Build Tests: CRIT (Quintuna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": ["quintuna_CRIT_test"]
},

{
"label": "Build Tests: FSM (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": ["quadruna_FSM_test"]
},
{
"label": "Build Tests: RSM (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": ["quadruna_RSM_test"]
},
{
"label": "Build Tests: VC (Quadruna)",
"group": "build",
"type": "cmake",
"command": "build",
"targets": ["quadruna_VC_test"]
},
{
"label": "Build Tests: Shared",
"group": "build",
"type": "cmake",
"command": "build",
"targets": ["shared_test"]
}
]
}
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ message("⚙️ Configuring for \"${PLATFORM}\" platform and \"${TARGET}\" build
IF ("${PLATFORM}" STREQUAL "firmware")
# ======== Compiler ========
IF ("${TARGET}" STREQUAL "binary")
project("UBC Formula Electric Software" C CXX ASM)
project("UBC Formula Electric Software" C ASM)
ELSEIF ("${TARGET}" STREQUAL "test")
project("UBC Formula Electric Software" C CXX)
ELSE ()
Expand Down
2 changes: 0 additions & 2 deletions firmware/cmake/bootlib.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ function(stm32f4_boot_binary
# Pass syscalls to the cube library so we can build without warnings.
stm32f412rx_cube_library(
"${BOOT_NAME}_stm32cube"
"${INCLUDE_DIRS}"
"${STM32_HAL_SRCS}"
"${SYSCALLS}"
"${MD5_LOCATION}"
Expand Down Expand Up @@ -119,7 +118,6 @@ function(stm32h7_boot_binary
# Pass syscalls to the cube library so we can build without warnings.
stm32h733xx_cube_library(
"${BOOT_NAME}_stm32cube"
"${INCLUDE_DIRS}"
"${STM32_HAL_SRCS}"
"${SYSCALLS}"
"${MD5_LOCATION}"
Expand Down
Loading

0 comments on commit 7284053

Please sign in to comment.