Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2025 IOCs #1430

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open

2025 IOCs #1430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
0f522d7
SSM/DAM/FSM
Lucien950 Jan 21, 2025
c6973d6
FSM done
Lucien950 Jan 21, 2025
c9e8ac0
crit ioc
Aditya-Dhiman4 Jan 21, 2025
c6ef51f
BMS ioc pinout finalized
DJ90864 Jan 25, 2025
fa4db75
try to compile DAM
Jiajun-Huang Jan 25, 2025
c572cf2
new crit
Lucien950 Jan 25, 2025
da1dec7
going crazy mode
Lucien950 Jan 25, 2025
b28fdb4
going crazy mode
Lucien950 Jan 25, 2025
b63004f
DAM boot
Jiajun-Huang Jan 25, 2025
0a0b32d
fix boot, add CAN irq
Jiajun-Huang Jan 26, 2025
6f0437f
Dam ioc
Jiajun-Huang Jan 26, 2025
da05988
add a laybel
Jiajun-Huang Jan 26, 2025
c9d8b4d
fsm codegen
Lucien950 Jan 26, 2025
02a0f8b
more FSM changs
Lucien950 Jan 27, 2025
4ee9f77
Quintuna BMS ioc WIP
DJ90864 Jan 27, 2025
d9c5331
Merge branch 'master' into 2025_ioc_approvals
Lucien950 Jan 28, 2025
5c4e3e6
Quintuna BMS ioc done
DJ90864 Jan 28, 2025
036aa1c
Merge branch '2025_ioc_approvals' of https://github.com/UBCFormulaEle…
DJ90864 Jan 28, 2025
e524d0a
DAM build and BMS IOC
Lucien950 Jan 28, 2025
04cdd69
small addition to user constants
DJ90864 Jan 28, 2025
8dcefec
DAM and no CPP
Lucien950 Jan 28, 2025
1ac542a
DAM CMake formatting
Lucien950 Jan 28, 2025
043ab33
DAM building
Lucien950 Jan 28, 2025
83670f4
yoosh
Lucien950 Jan 28, 2025
de74d52
DAM and SSM approvals
Lucien950 Jan 30, 2025
ab1877e
DAM and SSM generate steps
Lucien950 Jan 30, 2025
6ea3dd6
new SSM
Lucien950 Jan 31, 2025
1e18826
RSM IOC
Lucien950 Feb 1, 2025
7c3c7b5
last ioc check
Lucien950 Feb 1, 2025
f163daf
formatting
Lucien950 Feb 1, 2025
21ac4a5
Merge branch 'master' into 2025_ioc_approvals
Lucien950 Feb 1, 2025
07db84f
RSM ADCs configured
pranay-o Feb 1, 2025
5093610
Small chnages to BMS ioc
DJ90864 Feb 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
342 changes: 160 additions & 182 deletions .vscode/tasks.json
View file
Open in desktop
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO add quintuna targets

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
Open in desktop
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
Loading
Loading