Skip to content

Commit

Permalink
gooodbye thruna (#1238)
Browse files Browse the repository at this point in the history
Delete all traces of Thruna.
  • Loading branch information
gtaharaedmonds authored Apr 15, 2024
1 parent d5336a4 commit f6f7126
Show file tree
Hide file tree
Showing 354 changed files with 33 additions and 50,896 deletions.
4 changes: 2 additions & 2 deletions .github/actions/build_dbc/action.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Build DBC Action
description: Builds the DBC file from the JSON files to ./CanMsgs.dbc
description: Builds the DBC file from the JSON files to ./quadruna.dbc
runs:
using: "composite"
steps:
- name: Generate DBC
shell: bash
run: |
python3 scripts/code_generation/jsoncan/generate_can_from_json.py \
--only_dbc --can_data_dir "can_bus/thruna" --dbc_output "CanMsgs.dbc"
--only_dbc --can_data_dir "can_bus/quadruna" --dbc_output "quadruna.dbc"
34 changes: 4 additions & 30 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,6 @@ jobs:
fail-fast: false
matrix:
include:
- board: BMS
ioc_dir: firmware/thruna/BMS/src/cubemx
- board: DCM
ioc_dir: firmware/thruna/DCM/src/cubemx
- board: FSM
ioc_dir: firmware/thruna/FSM/src/cubemx
- board: PDM
ioc_dir: firmware/thruna/PDM/src/cubemx
- board: DIM
ioc_dir: firmware/thruna/DIM/src/cubemx
- board: VC
ioc_dir: firmware/quadruna/VC/src/cubemx
- board: BMS
Expand Down Expand Up @@ -100,11 +90,6 @@ jobs:
fail-fast: false
matrix:
board:
- thruna_BMS
- thruna_DCM
- thruna_FSM
- thruna_PDM
- thruna_DIM
- quadruna_VC
- quadruna_BMS
- quadruna_FSM
Expand Down Expand Up @@ -135,27 +120,16 @@ jobs:
fail-fast: false
matrix:
include:
- board: FSM
car: thruna
- board: PDM
car: thruna
- board: BMS
car: thruna
- board: DCM
car: thruna
- board: DIM
car: thruna
- board: VC
car: quadruna
- board: BMS
car: quadruna
- board: FSM
car: quadruna
# TODO uncomment when RSM and CRIT tests are readys
# - board: RSM
# car: quadruna
# - board: CRIT
# car: quadruna
- board: RSM
car: quadruna
- board: CRIT
car: quadruna

container:
image: ubcformulaelectric/environment:latest
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dbc-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ jobs:
- name: Upload DBC to Artifact
uses: actions/upload-artifact@v4
with:
name: CanMsgs.dbc
path: CanMsgs.dbc
name: quadruna.dbc
path: quadruna.dbc

release-dbc:
name: Create Release for DBC
Expand All @@ -66,14 +66,14 @@ jobs:
- name: Download DBC from Artifact
uses: actions/download-artifact@v4
with:
name: CanMsgs.dbc
name: quadruna.dbc
- name: Log Files in Current Directory
run: ls -l -a
# ========= MAKE THE RELEASE =========
- name: Create Release for DBC
uses: ./.github/actions/push_release
with:
files: CanMsgs.dbc
files: quadruna.dbc
title: "DBC for ${{ github.head_ref }}"
body: "DBC for ${{ github.head_ref }} generated by UBC Formula Electric Continuous Integration."
tag_name: "${{ github.head_ref }}_tag"
Expand Down
68 changes: 19 additions & 49 deletions .github/workflows/master_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,44 +13,21 @@ jobs:
fail-fast: false
matrix:
include:
- board: thruna_DIM
bin_name: thruna_DIM_app_metadata.hex
build_dir: firmware/thruna/DIM
- board: thruna_FSM
bin_name: thruna_FSM_app_metadata.hex
build_dir: firmware/thruna/FSM
- board: thruna_PDM
bin_name: thruna_PDM_app_metadata.hex
build_dir: firmware/thruna/PDM
- board: thruna_DCM
bin_name: thruna_DCM_app_metadata.hex
build_dir: firmware/thruna/DCM
- board: thruna_BMS
bin_name: thruna_BMS_app_metadata.hex
build_dir: firmware/thruna/BMS

- board: quadruna_BMS
bin_name: quadruna_BMS_app_metadata.hex
build_dir: firmware/quadruna/BMS
# - board: quadruna_CRIT
# bin_name: quadruna_CRIT_app_metadata.hex
# build_dir: firmware/quadruna/CRIT
# - board: quadruna_FSM
# bin_name: quadruna_FSM_app_metadata.hex
# build_dir: firmware/quadruna/FSM
# - board: quadruna_RSM
# bin_name: quadruna_RSM_app_metadata.hex
# build_dir: firmware/quadruna/RSM
- board: quadruna_VC
bin_name: quadruna_VC_app_metadata.hex
build_dir: firmware/quadruna/VC

- board: f4dev
bin_name: f4dev.hex
build_dir: firmware/dev/f4dev
- board: h7dev
bin_name: h7dev.hex
build_dir: firmware/dev/h7dev
- board: quadruna_BMS
bin_name: quadruna_BMS_app_metadata.hex
build_dir: firmware/quadruna/BMS
- board: quadruna_FSM
bin_name: quadruna_FSM_app_metadata.hex
build_dir: firmware/quadruna/FSM
- board: quadruna_RSM
bin_name: quadruna_RSM_app_metadata.hex
build_dir: firmware/quadruna/RSM
- board: quadruna_CRIT
bin_name: quadruna_CRIT_app_metadata.hex
build_dir: firmware/quadruna/CRIT
container:
image: ubcformulaelectric/environment:latest
credentials:
Expand Down Expand Up @@ -94,8 +71,8 @@ jobs:
- name: Upload DBC to Artifact
uses: actions/upload-artifact@v4
with:
name: CanMsgs.dbc
path: CanMsgs.dbc
name: quadruna.dbc
path: quadruna.dbc


# ======= MAKE THE RELEASE =======
Expand All @@ -119,20 +96,13 @@ jobs:
uses: ./.github/actions/push_release
with:
# https://github.com/actions/download-artifact#download-all-artifacts
# quadruna_CRIT_app_metadata.hex/quadruna_CRIT_app_metadata.hex
# quadruna_FSM_app_metadata.hex/quadruna_FSM_app_metadata.hex
# quadruna_RSM_app_metadata.hex/quadruna_RSM_app_metadata.hex
files: |
thruna_BMS_app_metadata.hex/thruna_BMS_app_metadata.hex
thruna_DCM_app_metadata.hex/thruna_DCM_app_metadata.hex
thruna_DIM_app_metadata.hex/thruna_DIM_app_metadata.hex
thruna_FSM_app_metadata.hex/thruna_FSM_app_metadata.hex
thruna_PDM_app_metadata.hex/thruna_PDM_app_metadata.hex
quadruna_BMS_app_metadata.hex/quadruna_BMS_app_metadata.hex
quadruna_VC_app_metadata.hex/quadruna_VC_app_metadata.hex
f4dev.hex/f4dev.hex
h7dev.hex/h7dev.hex
CanMsgs.dbc/CanMsgs.dbc
quadruna_BMS_app_metadata.hex/quadruna_BMS_app_metadata.hex
quadruna_FSM_app_metadata.hex/quadruna_FSM_app_metadata.hex
quadruna_RSM_app_metadata.hex/quadruna_RSM_app_metadata.hex
quadruna_CRIT_app_metadata.hex/quadruna_CRIT_app_metadata.hex
quadruna.dbc/quadruna.dbc
latest: true
title: "Stable Binaries and DBCs"
body: "This release contains the latest stable binaries and DBCs."
Expand Down
10 changes: 0 additions & 10 deletions .idea/runConfigurations/thruna_BMS_hex.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/runConfigurations/thruna_DCM_hex.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/runConfigurations/thruna_DIM_hex.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/runConfigurations/thruna_FSM_hex.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/runConfigurations/thruna_PDM_hex.xml

This file was deleted.

Loading

0 comments on commit f6f7126

Please sign in to comment.