Skip to content

Commit ad136b1

Browse files
committed
Merge branch '✅-wio-terminal' into 🦆
2 parents 3563142 + 187f5d7 commit ad136b1

File tree

11 files changed

+1411
-4
lines changed

11 files changed

+1411
-4
lines changed

Cargo.lock

Lines changed: 446 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ members = [
44
"examples/basic_gr_peach",
55
"examples/basic_nucleo_f401re",
66
"examples/basic_rp_pico",
7+
"examples/basic_wio_terminal",
8+
"examples/common",
79
"examples/smp_rp_pico",
810
"src/arm_semihosting",
911
"src/r3",
@@ -20,6 +22,7 @@ members = [
2022
"src/r3_test_runner",
2123
"src/r3_test_suite",
2224
]
25+
resolver = "2"
2326

2427
[patch.crates-io.riscv]
2528
# We need to enable `riscv/inline-asm` to work around
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[target.thumbv7em-none-eabihf]
2+
runner = "arm-none-eabi-gdb"
3+
#runner = "probe-run --chip ATSAMD51P19A"
4+
rustflags = [
5+
# This is needed if your flash or ram addresses are not aligned to 0x10000 in memory.x
6+
# See https://github.com/rust-embedded/cortex-m-quickstart/pull/95
7+
"-C", "link-arg=--nmagic",
8+
9+
"-C", "link-arg=-Tlink.x",
10+
]
11+
12+
[build]
13+
target = "thumbv7em-none-eabihf"
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
[package]
2+
name = "r3_example_basic_wio_terminal"
3+
version = "0.0.0"
4+
authors = ["yvt <i@yvt.jp>"]
5+
edition = "2021"
6+
publish = false
7+
8+
# `cortex-m-rt` and other crates don't build on a hosted target. We don't want
9+
# `cargo test --all` to fail because of this, so we put dependencies in the
10+
# target-specific section.
11+
[target."cfg(target_os = \"none\")".dependencies]
12+
r3_example_common = { path = "../common"}
13+
r3_port_arm_m = { path = "../../src/r3_port_arm_m" }
14+
r3 = { path = "../../src/r3", features = ["system_time"] }
15+
16+
embedded-graphics = { version = "0.7.1" }
17+
wio_terminal = { version = "0.4" }
18+
cortex-m-rt = { version = "0.6.12" }
19+
usbd-serial = { version = "0.1" }
20+
usb-device = { version = "0.2.7" }
21+
atsamd-hal = { version = "0.13", features = ["samd51p"] }
22+
arrayvec = { version = "0.7.1", default-features = false }
23+
cortex-m = { version = "*" }
24+
spin = { version = "0.9.2", default-features = false, features = ["spin_mutex"] }

examples/basic_wio_terminal/README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
This directory contains an example R3 application for [Wio Terminal][1].
2+
3+
Build the application by `cargo build --release`.
4+
5+
See <https://github.com/atsamd-rs/atsamd/blob/master/boards/wio_terminal/examples/README.md#wio-terminal-examples> for how to flash the application. The recommended way is to use [cargo-hf2][2], but you need a version that has [hf2-rs#44][1] merged:
6+
7+
```shell
8+
cargo install cargo-hf2 --git https://github.com/yvt/hf2-rs.git --rev 3b0743d0d7fd4005973e6b44f45b391f05336bed
9+
cargo hf2 --release --vid 0x2886 --pid 0x002d
10+
```
11+
12+
[1]: https://github.com/jacobrosenthal/hf2-rs/pull/44

0 commit comments

Comments
 (0)