Skip to content

Commit

Permalink
Merge branch 'support/generation2' of github.com:SSL-A-Team/firmware
Browse files Browse the repository at this point in the history
  • Loading branch information
guyfleeman committed Dec 25, 2024
2 parents e59ff73 + d21586e commit 4f97cfd
Show file tree
Hide file tree
Showing 170 changed files with 14,224 additions and 7,596 deletions.
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"github.vscode-github-actions",
"rust-lang.rust-analyzer",
"ms-vscode.cpptools-extension-pack",
"tamasfe.even-better-toml"
"tamasfe.even-better-toml",
"fill-labs.dependi"
]
}
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,9 @@
// don't show notifications for unlinked Cargo.toml files. This is misleads folks into
// including projects under incorrect ABIs.
"rust-analyzer.showUnlinkedFileNotification": false,
// disable type hints by default
// this gnarly in too many files
// ctrl + alt to show
"editor.inlayHints.enabled": "offUnlessPressed",
"ros.distro": "humble"
}
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ define create-kicker-board-rust-targets
$1--$2:
cd $1 && \
cargo build --release --bin $2 && \
arm-none-eabi-objcopy -Obinary target/thumbv6m-none-eabi/release/$2 target/thumbv6m-none-eabi/release/$2.bin
arm-none-eabi-objcopy -Obinary target/thumbv7em-none-eabihf/release/$2 target/thumbv7em-none-eabihf/release/$2.bin
kicker-board--all:: $1--$2

$1--$2--run: $1--$2
Expand All @@ -121,7 +121,7 @@ $1--$2--run: $1--$2
$1--$2--debug: $1--$2
cd $1 && \
cargo build --release --bin $2 && \
../util/program.sh $3 $1/target/thumbv6m-none-eabi/release/$2
../util/program.sh $3 $1/target/thumbv7em-none-eabihf/release/$2
endef
$(foreach element,$(kicker_binaries),$(eval $(call create-kicker-board-rust-targets,kicker-board,$(element),$(kicker_openocd_cfg_file))))

Expand Down
Loading

0 comments on commit 4f97cfd

Please sign in to comment.