Skip to content

Commit

Permalink
Make runner command selectable (#74)
Browse files Browse the repository at this point in the history
  • Loading branch information
ithinuel authored Apr 6, 2024
1 parent 1a85e03 commit bd81c40
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 3 deletions.
15 changes: 12 additions & 3 deletions cargo-generate.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
cargo_generate_version = ">=0.9.0"

[hooks]
pre = [
"cargo-generate/remove_rprs.rhai"
]
pre = ["cargo-generate/remove_rprs.rhai"]

[placeholders]
flash_method = { prompt = "Which flashing method do you intend to use?", choices = [
"probe-rs",
"elf2uf2-rs",
"custom",
"none"
], default = "probe-rs", type = "string" }

[conditional.'flash_method == "custom"'.placeholders]
flash_method_custom = { prompt = "Enter the runner command to use", type = "string" }
36 changes: 36 additions & 0 deletions cargo-generate/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
# Choose a default "cargo run" tool (see README for more info)
# - `probe-rs` provides flashing and defmt via a hardware debugger, and stack unwind on panic
# - elf2uf2-rs loads firmware over USB when the rp2040 is in boot mode
# runner = "probe-rs run --chip RP2040 --protocol swd"
# runner = "elf2uf2-rs -d"
{% case flash_method -%}
{%- when "probe-rs" -%}
runner = "probe-rs run --chip RP2040 --protocol swd"
{%- when "elf2uf2-rs" -%}
runner = "elf2uf2-rs -d"
{%- when "none" -%}
{%- else -%}
{%- if flash_method != "" -%}
runner = "{{ flash_method_custom }}"
{%- endif -%}
{%- endcase %}
rustflags = [
"-C", "linker=flip-link",
"-C", "link-arg=--nmagic",
"-C", "link-arg=-Tlink.x",
"-C", "link-arg=-Tdefmt.x",

# Code-size optimizations.
# trap unreachable can save a lot of space, but requires nightly compiler.
# uncomment the next line if you wish to enable it
# "-Z", "trap-unreachable=no",
"-C", "inline-threshold=5",
"-C", "no-vectorize-loops",
]

[build]
target = "thumbv6m-none-eabi"

[env]
DEFMT_LOG = "debug"
1 change: 1 addition & 0 deletions cargo-generate/remove_rprs.rhai
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ file::delete("debug_probes.md");
file::delete("CODE_OF_CONDUCT.md");
file::delete("Cargo.toml");
file::rename("cargo-generate/Cargo.toml", "Cargo.toml");
file::rename("cargo-generate/config.toml", ".cargo/config.toml");
file::delete("cargo-generate")

0 comments on commit bd81c40

Please sign in to comment.