diff options
| author | Tyler <[email protected]> | 2023-07-16 19:08:01 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-07-16 19:08:01 -0500 |
| commit | 6d8a5c6c20953c998df6ddd26906abe520df946d (patch) | |
| tree | 32cfdf85a1aa132cb0f1aac56a934ceed93fc597 /examples | |
| parent | 3aedbce5c2775ff1ab10c3ca95ea1311043f4be4 (diff) | |
| parent | c7ec45a004750f590c1d9ea4a721972efe133b8e (diff) | |
Merge pull request #2 from embassy-rs/main
Pull changes from base embassy repo
Diffstat (limited to 'examples')
90 files changed, 1603 insertions, 123 deletions
diff --git a/examples/boot/application/nrf/Cargo.toml b/examples/boot/application/nrf/Cargo.toml index b98f73f39..2a0cf7818 100644 --- a/examples/boot/application/nrf/Cargo.toml +++ b/examples/boot/application/nrf/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../../../embassy-sync" } | 8 | embassy-sync = { version = "0.2.0", path = "../../../../embassy-sync" } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers", "arch-cortex-m", "executor-thread"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers", "arch-cortex-m", "executor-thread"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../../../embassy-time", features = ["nightly"] } | 10 | embassy-time = { version = "0.1.2", path = "../../../../embassy-time", features = ["nightly"] } |
| 11 | embassy-nrf = { version = "0.1.0", path = "../../../../embassy-nrf", features = ["time-driver-rtc1", "gpiote", "nightly"] } | 11 | embassy-nrf = { version = "0.1.0", path = "../../../../embassy-nrf", features = ["time-driver-rtc1", "gpiote", "nightly"] } |
| 12 | embassy-boot = { version = "0.1.0", path = "../../../../embassy-boot/boot", features = ["nightly"] } | 12 | embassy-boot = { version = "0.1.0", path = "../../../../embassy-boot/boot", features = ["nightly"] } |
| 13 | embassy-boot-nrf = { version = "0.1.0", path = "../../../../embassy-boot/nrf", features = ["nightly"] } | 13 | embassy-boot-nrf = { version = "0.1.0", path = "../../../../embassy-boot/nrf", features = ["nightly"] } |
diff --git a/examples/boot/application/rp/Cargo.toml b/examples/boot/application/rp/Cargo.toml index 007b6839c..95b2da954 100644 --- a/examples/boot/application/rp/Cargo.toml +++ b/examples/boot/application/rp/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../../../embassy-sync" } | 8 | embassy-sync = { version = "0.2.0", path = "../../../../embassy-sync" } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers", "arch-cortex-m", "executor-thread"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers", "arch-cortex-m", "executor-thread"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../../../embassy-time", features = ["nightly"] } | 10 | embassy-time = { version = "0.1.2", path = "../../../../embassy-time", features = ["nightly"] } |
| 11 | embassy-rp = { version = "0.1.0", path = "../../../../embassy-rp", features = ["time-driver", "unstable-traits", "nightly"] } | 11 | embassy-rp = { version = "0.1.0", path = "../../../../embassy-rp", features = ["time-driver", "unstable-traits", "nightly"] } |
| 12 | embassy-boot-rp = { version = "0.1.0", path = "../../../../embassy-boot/rp", features = ["nightly"] } | 12 | embassy-boot-rp = { version = "0.1.0", path = "../../../../embassy-boot/rp", features = ["nightly"] } |
| 13 | embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" } | 13 | embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" } |
diff --git a/examples/boot/application/stm32f3/Cargo.toml b/examples/boot/application/stm32f3/Cargo.toml index 5b3faf8f8..3b0fc4d9d 100644 --- a/examples/boot/application/stm32f3/Cargo.toml +++ b/examples/boot/application/stm32f3/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32f303re", "time-driver-any", "exti"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32f303re", "time-driver-any", "exti"] } |
| 12 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | 12 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } |
| 13 | embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" } | 13 | embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" } |
diff --git a/examples/boot/application/stm32f7/Cargo.toml b/examples/boot/application/stm32f7/Cargo.toml index b6a6f9cd8..323b4ab2c 100644 --- a/examples/boot/application/stm32f7/Cargo.toml +++ b/examples/boot/application/stm32f7/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32f767zi", "time-driver-any", "exti"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32f767zi", "time-driver-any", "exti"] } |
| 12 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | 12 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } |
| 13 | embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" } | 13 | embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" } |
diff --git a/examples/boot/application/stm32h7/Cargo.toml b/examples/boot/application/stm32h7/Cargo.toml index 0a7e19b1d..b2abdc891 100644 --- a/examples/boot/application/stm32h7/Cargo.toml +++ b/examples/boot/application/stm32h7/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../../../embassy-sync" } | 8 | embassy-sync = { version = "0.2.0", path = "../../../../embassy-sync" } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32h743zi", "time-driver-any", "exti"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32h743zi", "time-driver-any", "exti"] } |
| 12 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | 12 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } |
| 13 | embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" } | 13 | embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" } |
diff --git a/examples/boot/application/stm32l0/Cargo.toml b/examples/boot/application/stm32l0/Cargo.toml index 998df4dc0..0b7e72d5e 100644 --- a/examples/boot/application/stm32l0/Cargo.toml +++ b/examples/boot/application/stm32l0/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l072cz", "time-driver-any", "exti", "memory-x"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l072cz", "time-driver-any", "exti", "memory-x"] } |
| 12 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | 12 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } |
| 13 | embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" } | 13 | embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" } |
diff --git a/examples/boot/application/stm32l1/Cargo.toml b/examples/boot/application/stm32l1/Cargo.toml index 10b58c172..5f3f365c1 100644 --- a/examples/boot/application/stm32l1/Cargo.toml +++ b/examples/boot/application/stm32l1/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l151cb-a", "time-driver-any", "exti"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l151cb-a", "time-driver-any", "exti"] } |
| 12 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | 12 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } |
| 13 | embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" } | 13 | embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" } |
diff --git a/examples/boot/application/stm32l4/Cargo.toml b/examples/boot/application/stm32l4/Cargo.toml index 713a6527e..44eb5aba8 100644 --- a/examples/boot/application/stm32l4/Cargo.toml +++ b/examples/boot/application/stm32l4/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l475vg", "time-driver-any", "exti"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l475vg", "time-driver-any", "exti"] } |
| 12 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | 12 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } |
| 13 | embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" } | 13 | embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" } |
diff --git a/examples/boot/application/stm32wl/Cargo.toml b/examples/boot/application/stm32wl/Cargo.toml index 4c8bbd73f..fdad55060 100644 --- a/examples/boot/application/stm32wl/Cargo.toml +++ b/examples/boot/application/stm32wl/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32wl55jc-cm4", "time-driver-any", "exti"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32wl55jc-cm4", "time-driver-any", "exti"] } |
| 12 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | 12 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } |
| 13 | embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" } | 13 | embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" } |
diff --git a/examples/nrf-rtos-trace/Cargo.toml b/examples/nrf-rtos-trace/Cargo.toml index a3acc56b8..30b67b7b2 100644 --- a/examples/nrf-rtos-trace/Cargo.toml +++ b/examples/nrf-rtos-trace/Cargo.toml | |||
| @@ -18,7 +18,7 @@ log = [ | |||
| 18 | [dependencies] | 18 | [dependencies] |
| 19 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync" } | 19 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync" } |
| 20 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "rtos-trace", "rtos-trace-interrupt", "integrated-timers"] } | 20 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "rtos-trace", "rtos-trace-interrupt", "integrated-timers"] } |
| 21 | embassy-time = { version = "0.1.0", path = "../../embassy-time" } | 21 | embassy-time = { version = "0.1.2", path = "../../embassy-time" } |
| 22 | embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac"] } | 22 | embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac"] } |
| 23 | 23 | ||
| 24 | cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } | 24 | cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } |
diff --git a/examples/nrf52840-rtic/Cargo.toml b/examples/nrf52840-rtic/Cargo.toml index 0f9048b0f..ded3b7db8 100644 --- a/examples/nrf52840-rtic/Cargo.toml +++ b/examples/nrf52840-rtic/Cargo.toml | |||
| @@ -9,7 +9,7 @@ rtic = { version = "2", features = ["thumbv7-backend"] } | |||
| 9 | 9 | ||
| 10 | embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } | 10 | embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } |
| 11 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 11 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 12 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["nightly", "unstable-traits", "defmt", "defmt-timestamp-uptime", "generic-queue"] } | 12 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["nightly", "unstable-traits", "defmt", "defmt-timestamp-uptime", "generic-queue"] } |
| 13 | embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["nightly", "unstable-traits", "defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] } | 13 | embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["nightly", "unstable-traits", "defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] } |
| 14 | 14 | ||
| 15 | defmt = "0.3" | 15 | defmt = "0.3" |
diff --git a/examples/nrf52840/Cargo.toml b/examples/nrf52840/Cargo.toml index 8c4175966..7b9c371bb 100644 --- a/examples/nrf52840/Cargo.toml +++ b/examples/nrf52840/Cargo.toml | |||
| @@ -29,7 +29,7 @@ nightly = [ | |||
| 29 | embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } | 29 | embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } |
| 30 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 30 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 31 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } | 31 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } |
| 32 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime"] } | 32 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime"] } |
| 33 | embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] } | 33 | embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] } |
| 34 | embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet"], optional = true } | 34 | embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet"], optional = true } |
| 35 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt", "msos-descriptor",], optional = true } | 35 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt", "msos-descriptor",], optional = true } |
| @@ -52,4 +52,7 @@ rand = { version = "0.8.4", default-features = false } | |||
| 52 | embedded-storage = "0.3.0" | 52 | embedded-storage = "0.3.0" |
| 53 | usbd-hid = "0.6.0" | 53 | usbd-hid = "0.6.0" |
| 54 | serde = { version = "1.0.136", default-features = false } | 54 | serde = { version = "1.0.136", default-features = false } |
| 55 | embedded-hal-async = { version = "0.2.0-alpha.1", optional = true } | 55 | embedded-hal-async = { version = "0.2.0-alpha.2", optional = true } |
| 56 | |||
| 57 | [patch.crates-io] | ||
| 58 | lora-phy = { git = "https://github.com/embassy-rs/lora-phy", rev = "ad289428fd44b02788e2fa2116445cc8f640a265" } | ||
diff --git a/examples/nrf52840/src/bin/wifi_esp_hosted.rs b/examples/nrf52840/src/bin/wifi_esp_hosted.rs index 4eb31b105..112e41bcd 100644 --- a/examples/nrf52840/src/bin/wifi_esp_hosted.rs +++ b/examples/nrf52840/src/bin/wifi_esp_hosted.rs | |||
| @@ -10,11 +10,15 @@ use embassy_nrf::gpio::{AnyPin, Input, Level, Output, OutputDrive, Pin, Pull}; | |||
| 10 | use embassy_nrf::rng::Rng; | 10 | use embassy_nrf::rng::Rng; |
| 11 | use embassy_nrf::spim::{self, Spim}; | 11 | use embassy_nrf::spim::{self, Spim}; |
| 12 | use embassy_nrf::{bind_interrupts, peripherals}; | 12 | use embassy_nrf::{bind_interrupts, peripherals}; |
| 13 | use embassy_time::Delay; | ||
| 13 | use embedded_hal_async::spi::ExclusiveDevice; | 14 | use embedded_hal_async::spi::ExclusiveDevice; |
| 14 | use embedded_io::asynch::Write; | 15 | use embedded_io::asynch::Write; |
| 15 | use static_cell::make_static; | 16 | use static_cell::make_static; |
| 16 | use {defmt_rtt as _, embassy_net_esp_hosted as hosted, panic_probe as _}; | 17 | use {defmt_rtt as _, embassy_net_esp_hosted as hosted, panic_probe as _}; |
| 17 | 18 | ||
| 19 | const WIFI_NETWORK: &str = "EmbassyTest"; | ||
| 20 | const WIFI_PASSWORD: &str = "V8YxhKt5CdIAJFud"; | ||
| 21 | |||
| 18 | bind_interrupts!(struct Irqs { | 22 | bind_interrupts!(struct Irqs { |
| 19 | SPIM3 => spim::InterruptHandler<peripherals::SPI3>; | 23 | SPIM3 => spim::InterruptHandler<peripherals::SPI3>; |
| 20 | RNG => embassy_nrf::rng::InterruptHandler<peripherals::RNG>; | 24 | RNG => embassy_nrf::rng::InterruptHandler<peripherals::RNG>; |
| @@ -24,7 +28,7 @@ bind_interrupts!(struct Irqs { | |||
| 24 | async fn wifi_task( | 28 | async fn wifi_task( |
| 25 | runner: hosted::Runner< | 29 | runner: hosted::Runner< |
| 26 | 'static, | 30 | 'static, |
| 27 | ExclusiveDevice<Spim<'static, peripherals::SPI3>, Output<'static, peripherals::P0_31>>, | 31 | ExclusiveDevice<Spim<'static, peripherals::SPI3>, Output<'static, peripherals::P0_31>, Delay>, |
| 28 | Input<'static, AnyPin>, | 32 | Input<'static, AnyPin>, |
| 29 | Output<'static, peripherals::P1_05>, | 33 | Output<'static, peripherals::P1_05>, |
| 30 | >, | 34 | >, |
| @@ -55,7 +59,7 @@ async fn main(spawner: Spawner) { | |||
| 55 | config.frequency = spim::Frequency::M32; | 59 | config.frequency = spim::Frequency::M32; |
| 56 | config.mode = spim::MODE_2; // !!! | 60 | config.mode = spim::MODE_2; // !!! |
| 57 | let spi = spim::Spim::new(p.SPI3, Irqs, sck, miso, mosi, config); | 61 | let spi = spim::Spim::new(p.SPI3, Irqs, sck, miso, mosi, config); |
| 58 | let spi = ExclusiveDevice::new(spi, cs); | 62 | let spi = ExclusiveDevice::new(spi, cs, Delay); |
| 59 | 63 | ||
| 60 | let (device, mut control, runner) = embassy_net_esp_hosted::new( | 64 | let (device, mut control, runner) = embassy_net_esp_hosted::new( |
| 61 | make_static!(embassy_net_esp_hosted::State::new()), | 65 | make_static!(embassy_net_esp_hosted::State::new()), |
| @@ -69,7 +73,7 @@ async fn main(spawner: Spawner) { | |||
| 69 | unwrap!(spawner.spawn(wifi_task(runner))); | 73 | unwrap!(spawner.spawn(wifi_task(runner))); |
| 70 | 74 | ||
| 71 | control.init().await; | 75 | control.init().await; |
| 72 | control.join(env!("WIFI_NETWORK"), env!("WIFI_PASSWORD")).await; | 76 | control.join(WIFI_NETWORK, WIFI_PASSWORD).await; |
| 73 | 77 | ||
| 74 | let config = embassy_net::Config::dhcpv4(Default::default()); | 78 | let config = embassy_net::Config::dhcpv4(Default::default()); |
| 75 | // let config = embassy_net::Config::ipv4_static(embassy_net::StaticConfigV4 { | 79 | // let config = embassy_net::Config::ipv4_static(embassy_net::StaticConfigV4 { |
diff --git a/examples/nrf5340/Cargo.toml b/examples/nrf5340/Cargo.toml index efb66bae6..f1d45f336 100644 --- a/examples/nrf5340/Cargo.toml +++ b/examples/nrf5340/Cargo.toml | |||
| @@ -14,7 +14,7 @@ embassy-executor = { version = "0.2.0", path = "../../embassy-executor", feature | |||
| 14 | "defmt", | 14 | "defmt", |
| 15 | "integrated-timers", | 15 | "integrated-timers", |
| 16 | ] } | 16 | ] } |
| 17 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = [ | 17 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = [ |
| 18 | "defmt", | 18 | "defmt", |
| 19 | "defmt-timestamp-uptime", | 19 | "defmt-timestamp-uptime", |
| 20 | ] } | 20 | ] } |
diff --git a/examples/rp/Cargo.toml b/examples/rp/Cargo.toml index 48f3a26bb..c812cb3ee 100644 --- a/examples/rp/Cargo.toml +++ b/examples/rp/Cargo.toml | |||
| @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0" | |||
| 9 | embassy-embedded-hal = { version = "0.1.0", path = "../../embassy-embedded-hal", features = ["defmt"] } | 9 | embassy-embedded-hal = { version = "0.1.0", path = "../../embassy-embedded-hal", features = ["defmt"] } |
| 10 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 10 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 11 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } | 11 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } |
| 12 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["nightly", "unstable-traits", "defmt", "defmt-timestamp-uptime"] } | 12 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["nightly", "unstable-traits", "defmt", "defmt-timestamp-uptime"] } |
| 13 | embassy-rp = { version = "0.1.0", path = "../../embassy-rp", features = ["defmt", "unstable-traits", "nightly", "unstable-pac", "time-driver", "critical-section-impl"] } | 13 | embassy-rp = { version = "0.1.0", path = "../../embassy-rp", features = ["defmt", "unstable-traits", "nightly", "unstable-pac", "time-driver", "critical-section-impl"] } |
| 14 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | 14 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } |
| 15 | embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "udp", "dhcpv4", "medium-ethernet"] } | 15 | embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "udp", "dhcpv4", "medium-ethernet"] } |
| @@ -40,9 +40,10 @@ display-interface = "0.4.1" | |||
| 40 | byte-slice-cast = { version = "1.2.0", default-features = false } | 40 | byte-slice-cast = { version = "1.2.0", default-features = false } |
| 41 | smart-leds = "0.3.0" | 41 | smart-leds = "0.3.0" |
| 42 | heapless = "0.7.15" | 42 | heapless = "0.7.15" |
| 43 | usbd-hid = "0.6.1" | ||
| 43 | 44 | ||
| 44 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.10" } | 45 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } |
| 45 | embedded-hal-async = "0.2.0-alpha.1" | 46 | embedded-hal-async = "0.2.0-alpha.2" |
| 46 | embedded-io = { version = "0.4.0", features = ["async", "defmt"] } | 47 | embedded-io = { version = "0.4.0", features = ["async", "defmt"] } |
| 47 | embedded-storage = { version = "0.3" } | 48 | embedded-storage = { version = "0.3" } |
| 48 | static_cell = { version = "1.1", features = ["nightly"]} | 49 | static_cell = { version = "1.1", features = ["nightly"]} |
| @@ -53,3 +54,6 @@ rand = { version = "0.8.5", default-features = false } | |||
| 53 | 54 | ||
| 54 | [profile.release] | 55 | [profile.release] |
| 55 | debug = true | 56 | debug = true |
| 57 | |||
| 58 | [patch.crates-io] | ||
| 59 | lora-phy = { git = "https://github.com/embassy-rs/lora-phy", rev = "ad289428fd44b02788e2fa2116445cc8f640a265" } | ||
diff --git a/examples/rp/src/bin/adc.rs b/examples/rp/src/bin/adc.rs index 7c2ca19f7..81a8b8340 100644 --- a/examples/rp/src/bin/adc.rs +++ b/examples/rp/src/bin/adc.rs | |||
| @@ -1,11 +1,15 @@ | |||
| 1 | //! This example test the ADC (Analog to Digital Conversion) of the RS2040 pin 26, 27 and 28. | ||
| 2 | //! It also reads the temperature sensor in the chip. | ||
| 3 | |||
| 1 | #![no_std] | 4 | #![no_std] |
| 2 | #![no_main] | 5 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 6 | #![feature(type_alias_impl_trait)] |
| 4 | 7 | ||
| 5 | use defmt::*; | 8 | use defmt::*; |
| 6 | use embassy_executor::Spawner; | 9 | use embassy_executor::Spawner; |
| 7 | use embassy_rp::adc::{Adc, Config, InterruptHandler}; | 10 | use embassy_rp::adc::{Adc, Config, InterruptHandler, Pin}; |
| 8 | use embassy_rp::bind_interrupts; | 11 | use embassy_rp::bind_interrupts; |
| 12 | use embassy_rp::gpio::Pull; | ||
| 9 | use embassy_time::{Duration, Timer}; | 13 | use embassy_time::{Duration, Timer}; |
| 10 | use {defmt_rtt as _, panic_probe as _}; | 14 | use {defmt_rtt as _, panic_probe as _}; |
| 11 | 15 | ||
| @@ -18,18 +22,18 @@ async fn main(_spawner: Spawner) { | |||
| 18 | let p = embassy_rp::init(Default::default()); | 22 | let p = embassy_rp::init(Default::default()); |
| 19 | let mut adc = Adc::new(p.ADC, Irqs, Config::default()); | 23 | let mut adc = Adc::new(p.ADC, Irqs, Config::default()); |
| 20 | 24 | ||
| 21 | let mut p26 = p.PIN_26; | 25 | let mut p26 = Pin::new(p.PIN_26, Pull::None); |
| 22 | let mut p27 = p.PIN_27; | 26 | let mut p27 = Pin::new(p.PIN_27, Pull::None); |
| 23 | let mut p28 = p.PIN_28; | 27 | let mut p28 = Pin::new(p.PIN_28, Pull::None); |
| 24 | 28 | ||
| 25 | loop { | 29 | loop { |
| 26 | let level = adc.read(&mut p26).await; | 30 | let level = adc.read(&mut p26).await.unwrap(); |
| 27 | info!("Pin 26 ADC: {}", level); | 31 | info!("Pin 26 ADC: {}", level); |
| 28 | let level = adc.read(&mut p27).await; | 32 | let level = adc.read(&mut p27).await.unwrap(); |
| 29 | info!("Pin 27 ADC: {}", level); | 33 | info!("Pin 27 ADC: {}", level); |
| 30 | let level = adc.read(&mut p28).await; | 34 | let level = adc.read(&mut p28).await.unwrap(); |
| 31 | info!("Pin 28 ADC: {}", level); | 35 | info!("Pin 28 ADC: {}", level); |
| 32 | let temp = adc.read_temperature().await; | 36 | let temp = adc.read_temperature().await.unwrap(); |
| 33 | info!("Temp: {} degrees", convert_to_celsius(temp)); | 37 | info!("Temp: {} degrees", convert_to_celsius(temp)); |
| 34 | Timer::after(Duration::from_secs(1)).await; | 38 | Timer::after(Duration::from_secs(1)).await; |
| 35 | } | 39 | } |
| @@ -37,5 +41,8 @@ async fn main(_spawner: Spawner) { | |||
| 37 | 41 | ||
| 38 | fn convert_to_celsius(raw_temp: u16) -> f32 { | 42 | fn convert_to_celsius(raw_temp: u16) -> f32 { |
| 39 | // According to chapter 4.9.5. Temperature Sensor in RP2040 datasheet | 43 | // According to chapter 4.9.5. Temperature Sensor in RP2040 datasheet |
| 40 | 27.0 - (raw_temp as f32 * 3.3 / 4096.0 - 0.706) / 0.001721 as f32 | 44 | let temp = 27.0 - (raw_temp as f32 * 3.3 / 4096.0 - 0.706) / 0.001721; |
| 45 | let sign = if temp < 0.0 { -1.0 } else { 1.0 }; | ||
| 46 | let rounded_temp_x10: i16 = ((temp * 10.0) + 0.5 * sign) as i16; | ||
| 47 | (rounded_temp_x10 as f32) / 10.0 | ||
| 41 | } | 48 | } |
diff --git a/examples/rp/src/bin/blinky.rs b/examples/rp/src/bin/blinky.rs index 7aa36a19f..295b000f3 100644 --- a/examples/rp/src/bin/blinky.rs +++ b/examples/rp/src/bin/blinky.rs | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | //! This example test the RP Pico on board LED. | ||
| 2 | //! | ||
| 3 | //! It does not work with the RP Pico W board. See wifi_blinky.rs. | ||
| 4 | |||
| 1 | #![no_std] | 5 | #![no_std] |
| 2 | #![no_main] | 6 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 7 | #![feature(type_alias_impl_trait)] |
diff --git a/examples/rp/src/bin/button.rs b/examples/rp/src/bin/button.rs index 0d246c093..d7aa89410 100644 --- a/examples/rp/src/bin/button.rs +++ b/examples/rp/src/bin/button.rs | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | //! This example uses the RP Pico on board LED to test input pin 28. This is not the button on the board. | ||
| 2 | //! | ||
| 3 | //! It does not work with the RP Pico W board. Use wifi_blinky.rs and add input pin. | ||
| 4 | |||
| 1 | #![no_std] | 5 | #![no_std] |
| 2 | #![no_main] | 6 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 7 | #![feature(type_alias_impl_trait)] |
diff --git a/examples/rp/src/bin/ethernet_w5500_multisocket.rs b/examples/rp/src/bin/ethernet_w5500_multisocket.rs index 82568254a..e81da177b 100644 --- a/examples/rp/src/bin/ethernet_w5500_multisocket.rs +++ b/examples/rp/src/bin/ethernet_w5500_multisocket.rs | |||
| @@ -15,7 +15,7 @@ use embassy_rp::clocks::RoscRng; | |||
| 15 | use embassy_rp::gpio::{Input, Level, Output, Pull}; | 15 | use embassy_rp::gpio::{Input, Level, Output, Pull}; |
| 16 | use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; | 16 | use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; |
| 17 | use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; | 17 | use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; |
| 18 | use embassy_time::Duration; | 18 | use embassy_time::{Delay, Duration}; |
| 19 | use embedded_hal_async::spi::ExclusiveDevice; | 19 | use embedded_hal_async::spi::ExclusiveDevice; |
| 20 | use embedded_io::asynch::Write; | 20 | use embedded_io::asynch::Write; |
| 21 | use rand::RngCore; | 21 | use rand::RngCore; |
| @@ -26,7 +26,7 @@ use {defmt_rtt as _, panic_probe as _}; | |||
| 26 | async fn ethernet_task( | 26 | async fn ethernet_task( |
| 27 | runner: Runner< | 27 | runner: Runner< |
| 28 | 'static, | 28 | 'static, |
| 29 | ExclusiveDevice<Spi<'static, SPI0, Async>, Output<'static, PIN_17>>, | 29 | ExclusiveDevice<Spi<'static, SPI0, Async>, Output<'static, PIN_17>, Delay>, |
| 30 | Input<'static, PIN_21>, | 30 | Input<'static, PIN_21>, |
| 31 | Output<'static, PIN_20>, | 31 | Output<'static, PIN_20>, |
| 32 | >, | 32 | >, |
| @@ -54,8 +54,14 @@ async fn main(spawner: Spawner) { | |||
| 54 | 54 | ||
| 55 | let mac_addr = [0x02, 0x00, 0x00, 0x00, 0x00, 0x00]; | 55 | let mac_addr = [0x02, 0x00, 0x00, 0x00, 0x00, 0x00]; |
| 56 | let state = make_static!(State::<8, 8>::new()); | 56 | let state = make_static!(State::<8, 8>::new()); |
| 57 | let (device, runner) = | 57 | let (device, runner) = embassy_net_w5500::new( |
| 58 | embassy_net_w5500::new(mac_addr, state, ExclusiveDevice::new(spi, cs), w5500_int, w5500_reset).await; | 58 | mac_addr, |
| 59 | state, | ||
| 60 | ExclusiveDevice::new(spi, cs, Delay), | ||
| 61 | w5500_int, | ||
| 62 | w5500_reset, | ||
| 63 | ) | ||
| 64 | .await; | ||
| 59 | unwrap!(spawner.spawn(ethernet_task(runner))); | 65 | unwrap!(spawner.spawn(ethernet_task(runner))); |
| 60 | 66 | ||
| 61 | // Generate random seed | 67 | // Generate random seed |
diff --git a/examples/rp/src/bin/ethernet_w5500_tcp_client.rs b/examples/rp/src/bin/ethernet_w5500_tcp_client.rs index d562defad..9dd7ae973 100644 --- a/examples/rp/src/bin/ethernet_w5500_tcp_client.rs +++ b/examples/rp/src/bin/ethernet_w5500_tcp_client.rs | |||
| @@ -17,7 +17,7 @@ use embassy_rp::clocks::RoscRng; | |||
| 17 | use embassy_rp::gpio::{Input, Level, Output, Pull}; | 17 | use embassy_rp::gpio::{Input, Level, Output, Pull}; |
| 18 | use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; | 18 | use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; |
| 19 | use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; | 19 | use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; |
| 20 | use embassy_time::{Duration, Timer}; | 20 | use embassy_time::{Delay, Duration, Timer}; |
| 21 | use embedded_hal_async::spi::ExclusiveDevice; | 21 | use embedded_hal_async::spi::ExclusiveDevice; |
| 22 | use embedded_io::asynch::Write; | 22 | use embedded_io::asynch::Write; |
| 23 | use rand::RngCore; | 23 | use rand::RngCore; |
| @@ -28,7 +28,7 @@ use {defmt_rtt as _, panic_probe as _}; | |||
| 28 | async fn ethernet_task( | 28 | async fn ethernet_task( |
| 29 | runner: Runner< | 29 | runner: Runner< |
| 30 | 'static, | 30 | 'static, |
| 31 | ExclusiveDevice<Spi<'static, SPI0, Async>, Output<'static, PIN_17>>, | 31 | ExclusiveDevice<Spi<'static, SPI0, Async>, Output<'static, PIN_17>, Delay>, |
| 32 | Input<'static, PIN_21>, | 32 | Input<'static, PIN_21>, |
| 33 | Output<'static, PIN_20>, | 33 | Output<'static, PIN_20>, |
| 34 | >, | 34 | >, |
| @@ -57,8 +57,14 @@ async fn main(spawner: Spawner) { | |||
| 57 | 57 | ||
| 58 | let mac_addr = [0x02, 0x00, 0x00, 0x00, 0x00, 0x00]; | 58 | let mac_addr = [0x02, 0x00, 0x00, 0x00, 0x00, 0x00]; |
| 59 | let state = make_static!(State::<8, 8>::new()); | 59 | let state = make_static!(State::<8, 8>::new()); |
| 60 | let (device, runner) = | 60 | let (device, runner) = embassy_net_w5500::new( |
| 61 | embassy_net_w5500::new(mac_addr, state, ExclusiveDevice::new(spi, cs), w5500_int, w5500_reset).await; | 61 | mac_addr, |
| 62 | state, | ||
| 63 | ExclusiveDevice::new(spi, cs, Delay), | ||
| 64 | w5500_int, | ||
| 65 | w5500_reset, | ||
| 66 | ) | ||
| 67 | .await; | ||
| 62 | unwrap!(spawner.spawn(ethernet_task(runner))); | 68 | unwrap!(spawner.spawn(ethernet_task(runner))); |
| 63 | 69 | ||
| 64 | // Generate random seed | 70 | // Generate random seed |
diff --git a/examples/rp/src/bin/ethernet_w5500_tcp_server.rs b/examples/rp/src/bin/ethernet_w5500_tcp_server.rs index 7f521cdb4..db21c2b6f 100644 --- a/examples/rp/src/bin/ethernet_w5500_tcp_server.rs +++ b/examples/rp/src/bin/ethernet_w5500_tcp_server.rs | |||
| @@ -16,7 +16,7 @@ use embassy_rp::clocks::RoscRng; | |||
| 16 | use embassy_rp::gpio::{Input, Level, Output, Pull}; | 16 | use embassy_rp::gpio::{Input, Level, Output, Pull}; |
| 17 | use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; | 17 | use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; |
| 18 | use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; | 18 | use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; |
| 19 | use embassy_time::Duration; | 19 | use embassy_time::{Delay, Duration}; |
| 20 | use embedded_hal_async::spi::ExclusiveDevice; | 20 | use embedded_hal_async::spi::ExclusiveDevice; |
| 21 | use embedded_io::asynch::Write; | 21 | use embedded_io::asynch::Write; |
| 22 | use rand::RngCore; | 22 | use rand::RngCore; |
| @@ -26,7 +26,7 @@ use {defmt_rtt as _, panic_probe as _}; | |||
| 26 | async fn ethernet_task( | 26 | async fn ethernet_task( |
| 27 | runner: Runner< | 27 | runner: Runner< |
| 28 | 'static, | 28 | 'static, |
| 29 | ExclusiveDevice<Spi<'static, SPI0, Async>, Output<'static, PIN_17>>, | 29 | ExclusiveDevice<Spi<'static, SPI0, Async>, Output<'static, PIN_17>, Delay>, |
| 30 | Input<'static, PIN_21>, | 30 | Input<'static, PIN_21>, |
| 31 | Output<'static, PIN_20>, | 31 | Output<'static, PIN_20>, |
| 32 | >, | 32 | >, |
| @@ -55,8 +55,14 @@ async fn main(spawner: Spawner) { | |||
| 55 | 55 | ||
| 56 | let mac_addr = [0x02, 0x00, 0x00, 0x00, 0x00, 0x00]; | 56 | let mac_addr = [0x02, 0x00, 0x00, 0x00, 0x00, 0x00]; |
| 57 | let state = make_static!(State::<8, 8>::new()); | 57 | let state = make_static!(State::<8, 8>::new()); |
| 58 | let (device, runner) = | 58 | let (device, runner) = embassy_net_w5500::new( |
| 59 | embassy_net_w5500::new(mac_addr, state, ExclusiveDevice::new(spi, cs), w5500_int, w5500_reset).await; | 59 | mac_addr, |
| 60 | state, | ||
| 61 | ExclusiveDevice::new(spi, cs, Delay), | ||
| 62 | w5500_int, | ||
| 63 | w5500_reset, | ||
| 64 | ) | ||
| 65 | .await; | ||
| 60 | unwrap!(spawner.spawn(ethernet_task(runner))); | 66 | unwrap!(spawner.spawn(ethernet_task(runner))); |
| 61 | 67 | ||
| 62 | // Generate random seed | 68 | // Generate random seed |
diff --git a/examples/rp/src/bin/ethernet_w5500_udp.rs b/examples/rp/src/bin/ethernet_w5500_udp.rs index ada86ae55..038432b17 100644 --- a/examples/rp/src/bin/ethernet_w5500_udp.rs +++ b/examples/rp/src/bin/ethernet_w5500_udp.rs | |||
| @@ -16,6 +16,7 @@ use embassy_rp::clocks::RoscRng; | |||
| 16 | use embassy_rp::gpio::{Input, Level, Output, Pull}; | 16 | use embassy_rp::gpio::{Input, Level, Output, Pull}; |
| 17 | use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; | 17 | use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; |
| 18 | use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; | 18 | use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; |
| 19 | use embassy_time::Delay; | ||
| 19 | use embedded_hal_async::spi::ExclusiveDevice; | 20 | use embedded_hal_async::spi::ExclusiveDevice; |
| 20 | use rand::RngCore; | 21 | use rand::RngCore; |
| 21 | use static_cell::make_static; | 22 | use static_cell::make_static; |
| @@ -24,7 +25,7 @@ use {defmt_rtt as _, panic_probe as _}; | |||
| 24 | async fn ethernet_task( | 25 | async fn ethernet_task( |
| 25 | runner: Runner< | 26 | runner: Runner< |
| 26 | 'static, | 27 | 'static, |
| 27 | ExclusiveDevice<Spi<'static, SPI0, Async>, Output<'static, PIN_17>>, | 28 | ExclusiveDevice<Spi<'static, SPI0, Async>, Output<'static, PIN_17>, Delay>, |
| 28 | Input<'static, PIN_21>, | 29 | Input<'static, PIN_21>, |
| 29 | Output<'static, PIN_20>, | 30 | Output<'static, PIN_20>, |
| 30 | >, | 31 | >, |
| @@ -52,8 +53,14 @@ async fn main(spawner: Spawner) { | |||
| 52 | 53 | ||
| 53 | let mac_addr = [0x02, 0x00, 0x00, 0x00, 0x00, 0x00]; | 54 | let mac_addr = [0x02, 0x00, 0x00, 0x00, 0x00, 0x00]; |
| 54 | let state = make_static!(State::<8, 8>::new()); | 55 | let state = make_static!(State::<8, 8>::new()); |
| 55 | let (device, runner) = | 56 | let (device, runner) = embassy_net_w5500::new( |
| 56 | embassy_net_w5500::new(mac_addr, state, ExclusiveDevice::new(spi, cs), w5500_int, w5500_reset).await; | 57 | mac_addr, |
| 58 | state, | ||
| 59 | ExclusiveDevice::new(spi, cs, Delay), | ||
| 60 | w5500_int, | ||
| 61 | w5500_reset, | ||
| 62 | ) | ||
| 63 | .await; | ||
| 57 | unwrap!(spawner.spawn(ethernet_task(runner))); | 64 | unwrap!(spawner.spawn(ethernet_task(runner))); |
| 58 | 65 | ||
| 59 | // Generate random seed | 66 | // Generate random seed |
diff --git a/examples/rp/src/bin/flash.rs b/examples/rp/src/bin/flash.rs index 19076150c..4c4982acc 100644 --- a/examples/rp/src/bin/flash.rs +++ b/examples/rp/src/bin/flash.rs | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | //! This example test the flash connected to the RP2040 chip. | ||
| 2 | |||
| 1 | #![no_std] | 3 | #![no_std] |
| 2 | #![no_main] | 4 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 5 | #![feature(type_alias_impl_trait)] |
diff --git a/examples/rp/src/bin/gpio_async.rs b/examples/rp/src/bin/gpio_async.rs index 52d13a9d5..bf58044d5 100644 --- a/examples/rp/src/bin/gpio_async.rs +++ b/examples/rp/src/bin/gpio_async.rs | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | //! This example shows how async gpio can be used with a RP2040. | ||
| 2 | //! | ||
| 3 | //! The LED on the RP Pico W board is connected differently. See wifi_blinky.rs. | ||
| 4 | |||
| 1 | #![no_std] | 5 | #![no_std] |
| 2 | #![no_main] | 6 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 7 | #![feature(type_alias_impl_trait)] |
| @@ -9,8 +13,6 @@ use embassy_time::{Duration, Timer}; | |||
| 9 | use gpio::{Input, Level, Output, Pull}; | 13 | use gpio::{Input, Level, Output, Pull}; |
| 10 | use {defmt_rtt as _, panic_probe as _}; | 14 | use {defmt_rtt as _, panic_probe as _}; |
| 11 | 15 | ||
| 12 | /// This example shows how async gpio can be used with a RP2040. | ||
| 13 | /// | ||
| 14 | /// It requires an external signal to be manually triggered on PIN 16. For | 16 | /// It requires an external signal to be manually triggered on PIN 16. For |
| 15 | /// example, this could be accomplished using an external power source with a | 17 | /// example, this could be accomplished using an external power source with a |
| 16 | /// button so that it is possible to toggle the signal from low to high. | 18 | /// button so that it is possible to toggle the signal from low to high. |
diff --git a/examples/rp/src/bin/gpout.rs b/examples/rp/src/bin/gpout.rs index 64461fc5f..0a3b5fa98 100644 --- a/examples/rp/src/bin/gpout.rs +++ b/examples/rp/src/bin/gpout.rs | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | //! This example shows how GPOUT (General purpose clock outputs) can toggle a output pin. | ||
| 2 | //! | ||
| 3 | //! The LED on the RP Pico W board is connected differently. Add a LED and resistor to another pin. | ||
| 4 | |||
| 1 | #![no_std] | 5 | #![no_std] |
| 2 | #![no_main] | 6 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 7 | #![feature(type_alias_impl_trait)] |
diff --git a/examples/rp/src/bin/i2c_async.rs b/examples/rp/src/bin/i2c_async.rs index cf3cf742c..93224bc43 100644 --- a/examples/rp/src/bin/i2c_async.rs +++ b/examples/rp/src/bin/i2c_async.rs | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | //! This example shows how to communicate asynchronous using i2c with external chips. | ||
| 2 | //! | ||
| 3 | //! Example written for the [`MCP23017 16-Bit I2C I/O Expander with Serial Interface`] chip. | ||
| 4 | //! (https://www.microchip.com/en-us/product/mcp23017) | ||
| 5 | |||
| 1 | #![no_std] | 6 | #![no_std] |
| 2 | #![no_main] | 7 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 8 | #![feature(type_alias_impl_trait)] |
diff --git a/examples/rp/src/bin/i2c_blocking.rs b/examples/rp/src/bin/i2c_blocking.rs index 7623e33c8..1c8c2039d 100644 --- a/examples/rp/src/bin/i2c_blocking.rs +++ b/examples/rp/src/bin/i2c_blocking.rs | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | //! This example shows how to communicate using i2c with external chips. | ||
| 2 | //! | ||
| 3 | //! Example written for the [`MCP23017 16-Bit I2C I/O Expander with Serial Interface`] chip. | ||
| 4 | //! (https://www.microchip.com/en-us/product/mcp23017) | ||
| 5 | |||
| 1 | #![no_std] | 6 | #![no_std] |
| 2 | #![no_main] | 7 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 8 | #![feature(type_alias_impl_trait)] |
diff --git a/examples/rp/src/bin/lora_lorawan.rs b/examples/rp/src/bin/lora_lorawan.rs index a9c84bf95..d631fafa1 100644 --- a/examples/rp/src/bin/lora_lorawan.rs +++ b/examples/rp/src/bin/lora_lorawan.rs | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | //! This example runs on the Raspberry Pi Pico with a Waveshare board containing a Semtech Sx1262 radio. | 1 | //! This example runs on the Raspberry Pi Pico with a Waveshare board containing a Semtech Sx1262 radio. |
| 2 | //! It demonstrates LoRaWAN join functionality. | 2 | //! It demonstrates LoRaWAN join functionality. |
| 3 | |||
| 3 | #![no_std] | 4 | #![no_std] |
| 4 | #![no_main] | 5 | #![no_main] |
| 5 | #![macro_use] | 6 | #![macro_use] |
diff --git a/examples/rp/src/bin/lora_p2p_receive.rs b/examples/rp/src/bin/lora_p2p_receive.rs index 250419202..396d669de 100644 --- a/examples/rp/src/bin/lora_p2p_receive.rs +++ b/examples/rp/src/bin/lora_p2p_receive.rs | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | //! This example runs on the Raspberry Pi Pico with a Waveshare board containing a Semtech Sx1262 radio. | 1 | //! This example runs on the Raspberry Pi Pico with a Waveshare board containing a Semtech Sx1262 radio. |
| 2 | //! It demonstrates LORA P2P receive functionality in conjunction with the lora_p2p_send example. | 2 | //! It demonstrates LORA P2P receive functionality in conjunction with the lora_p2p_send example. |
| 3 | |||
| 3 | #![no_std] | 4 | #![no_std] |
| 4 | #![no_main] | 5 | #![no_main] |
| 5 | #![macro_use] | 6 | #![macro_use] |
diff --git a/examples/rp/src/bin/lora_p2p_send.rs b/examples/rp/src/bin/lora_p2p_send.rs index 3a0544b17..a0f70fa5c 100644 --- a/examples/rp/src/bin/lora_p2p_send.rs +++ b/examples/rp/src/bin/lora_p2p_send.rs | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | //! This example runs on the Raspberry Pi Pico with a Waveshare board containing a Semtech Sx1262 radio. | 1 | //! This example runs on the Raspberry Pi Pico with a Waveshare board containing a Semtech Sx1262 radio. |
| 2 | //! It demonstrates LORA P2P send functionality. | 2 | //! It demonstrates LORA P2P send functionality. |
| 3 | |||
| 3 | #![no_std] | 4 | #![no_std] |
| 4 | #![no_main] | 5 | #![no_main] |
| 5 | #![macro_use] | 6 | #![macro_use] |
diff --git a/examples/rp/src/bin/lora_p2p_send_multicore.rs b/examples/rp/src/bin/lora_p2p_send_multicore.rs index eef2f7a53..89a62818d 100644 --- a/examples/rp/src/bin/lora_p2p_send_multicore.rs +++ b/examples/rp/src/bin/lora_p2p_send_multicore.rs | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | //! This example runs on the Raspberry Pi Pico with a Waveshare board containing a Semtech Sx1262 radio. | 1 | //! This example runs on the Raspberry Pi Pico with a Waveshare board containing a Semtech Sx1262 radio. |
| 2 | //! It demonstrates LORA P2P send functionality using the second core, with data provided by the first core. | 2 | //! It demonstrates LORA P2P send functionality using the second core, with data provided by the first core. |
| 3 | |||
| 3 | #![no_std] | 4 | #![no_std] |
| 4 | #![no_main] | 5 | #![no_main] |
| 5 | #![macro_use] | 6 | #![macro_use] |
diff --git a/examples/rp/src/bin/multicore.rs b/examples/rp/src/bin/multicore.rs index 57278dd6c..893b724bf 100644 --- a/examples/rp/src/bin/multicore.rs +++ b/examples/rp/src/bin/multicore.rs | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | //! This example shows how to send messages between the two cores in the RP2040 chip. | ||
| 2 | //! | ||
| 3 | //! The LED on the RP Pico W board is connected differently. See wifi_blinky.rs. | ||
| 4 | |||
| 1 | #![no_std] | 5 | #![no_std] |
| 2 | #![no_main] | 6 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 7 | #![feature(type_alias_impl_trait)] |
diff --git a/examples/rp/src/bin/pio_async.rs b/examples/rp/src/bin/pio_async.rs index 79eda1a09..c001d6440 100644 --- a/examples/rp/src/bin/pio_async.rs +++ b/examples/rp/src/bin/pio_async.rs | |||
| @@ -1,15 +1,22 @@ | |||
| 1 | //! This example shows powerful PIO module in the RP2040 chip. | ||
| 2 | |||
| 1 | #![no_std] | 3 | #![no_std] |
| 2 | #![no_main] | 4 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 5 | #![feature(type_alias_impl_trait)] |
| 4 | use defmt::info; | 6 | use defmt::info; |
| 5 | use embassy_executor::Spawner; | 7 | use embassy_executor::Spawner; |
| 8 | use embassy_rp::bind_interrupts; | ||
| 6 | use embassy_rp::peripherals::PIO0; | 9 | use embassy_rp::peripherals::PIO0; |
| 7 | use embassy_rp::pio::{Common, Config, Irq, Pio, PioPin, ShiftDirection, StateMachine}; | 10 | use embassy_rp::pio::{Common, Config, InterruptHandler, Irq, Pio, PioPin, ShiftDirection, StateMachine}; |
| 8 | use embassy_rp::relocate::RelocatedProgram; | 11 | use embassy_rp::relocate::RelocatedProgram; |
| 9 | use fixed::traits::ToFixed; | 12 | use fixed::traits::ToFixed; |
| 10 | use fixed_macro::types::U56F8; | 13 | use fixed_macro::types::U56F8; |
| 11 | use {defmt_rtt as _, panic_probe as _}; | 14 | use {defmt_rtt as _, panic_probe as _}; |
| 12 | 15 | ||
| 16 | bind_interrupts!(struct Irqs { | ||
| 17 | PIO0_IRQ_0 => InterruptHandler<PIO0>; | ||
| 18 | }); | ||
| 19 | |||
| 13 | fn setup_pio_task_sm0<'a>(pio: &mut Common<'a, PIO0>, sm: &mut StateMachine<'a, PIO0, 0>, pin: impl PioPin) { | 20 | fn setup_pio_task_sm0<'a>(pio: &mut Common<'a, PIO0>, sm: &mut StateMachine<'a, PIO0, 0>, pin: impl PioPin) { |
| 14 | // Setup sm0 | 21 | // Setup sm0 |
| 15 | 22 | ||
| @@ -49,7 +56,14 @@ fn setup_pio_task_sm1<'a>(pio: &mut Common<'a, PIO0>, sm: &mut StateMachine<'a, | |||
| 49 | // Setupm sm1 | 56 | // Setupm sm1 |
| 50 | 57 | ||
| 51 | // Read 0b10101 repeatedly until ISR is full | 58 | // Read 0b10101 repeatedly until ISR is full |
| 52 | let prg = pio_proc::pio_asm!(".origin 8", "set x, 0x15", ".wrap_target", "in x, 5 [31]", ".wrap",); | 59 | let prg = pio_proc::pio_asm!( |
| 60 | // | ||
| 61 | ".origin 8", | ||
| 62 | "set x, 0x15", | ||
| 63 | ".wrap_target", | ||
| 64 | "in x, 5 [31]", | ||
| 65 | ".wrap", | ||
| 66 | ); | ||
| 53 | 67 | ||
| 54 | let relocated = RelocatedProgram::new(&prg.program); | 68 | let relocated = RelocatedProgram::new(&prg.program); |
| 55 | let mut cfg = Config::default(); | 69 | let mut cfg = Config::default(); |
| @@ -110,7 +124,7 @@ async fn main(spawner: Spawner) { | |||
| 110 | mut sm1, | 124 | mut sm1, |
| 111 | mut sm2, | 125 | mut sm2, |
| 112 | .. | 126 | .. |
| 113 | } = Pio::new(pio); | 127 | } = Pio::new(pio, Irqs); |
| 114 | 128 | ||
| 115 | setup_pio_task_sm0(&mut common, &mut sm0, p.PIN_0); | 129 | setup_pio_task_sm0(&mut common, &mut sm0, p.PIN_0); |
| 116 | setup_pio_task_sm1(&mut common, &mut sm1); | 130 | setup_pio_task_sm1(&mut common, &mut sm1); |
diff --git a/examples/rp/src/bin/pio_dma.rs b/examples/rp/src/bin/pio_dma.rs index 05c0ebb16..9ab72e1f3 100644 --- a/examples/rp/src/bin/pio_dma.rs +++ b/examples/rp/src/bin/pio_dma.rs | |||
| @@ -1,16 +1,23 @@ | |||
| 1 | //! This example shows powerful PIO module in the RP2040 chip. | ||
| 2 | |||
| 1 | #![no_std] | 3 | #![no_std] |
| 2 | #![no_main] | 4 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 5 | #![feature(type_alias_impl_trait)] |
| 4 | use defmt::info; | 6 | use defmt::info; |
| 5 | use embassy_executor::Spawner; | 7 | use embassy_executor::Spawner; |
| 6 | use embassy_futures::join::join; | 8 | use embassy_futures::join::join; |
| 7 | use embassy_rp::pio::{Config, Pio, ShiftConfig, ShiftDirection}; | 9 | use embassy_rp::peripherals::PIO0; |
| 10 | use embassy_rp::pio::{Config, InterruptHandler, Pio, ShiftConfig, ShiftDirection}; | ||
| 8 | use embassy_rp::relocate::RelocatedProgram; | 11 | use embassy_rp::relocate::RelocatedProgram; |
| 9 | use embassy_rp::Peripheral; | 12 | use embassy_rp::{bind_interrupts, Peripheral}; |
| 10 | use fixed::traits::ToFixed; | 13 | use fixed::traits::ToFixed; |
| 11 | use fixed_macro::types::U56F8; | 14 | use fixed_macro::types::U56F8; |
| 12 | use {defmt_rtt as _, panic_probe as _}; | 15 | use {defmt_rtt as _, panic_probe as _}; |
| 13 | 16 | ||
| 17 | bind_interrupts!(struct Irqs { | ||
| 18 | PIO0_IRQ_0 => InterruptHandler<PIO0>; | ||
| 19 | }); | ||
| 20 | |||
| 14 | fn swap_nibbles(v: u32) -> u32 { | 21 | fn swap_nibbles(v: u32) -> u32 { |
| 15 | let v = (v & 0x0f0f_0f0f) << 4 | (v & 0xf0f0_f0f0) >> 4; | 22 | let v = (v & 0x0f0f_0f0f) << 4 | (v & 0xf0f0_f0f0) >> 4; |
| 16 | let v = (v & 0x00ff_00ff) << 8 | (v & 0xff00_ff00) >> 8; | 23 | let v = (v & 0x00ff_00ff) << 8 | (v & 0xff00_ff00) >> 8; |
| @@ -25,7 +32,7 @@ async fn main(_spawner: Spawner) { | |||
| 25 | mut common, | 32 | mut common, |
| 26 | sm0: mut sm, | 33 | sm0: mut sm, |
| 27 | .. | 34 | .. |
| 28 | } = Pio::new(pio); | 35 | } = Pio::new(pio, Irqs); |
| 29 | 36 | ||
| 30 | let prg = pio_proc::pio_asm!( | 37 | let prg = pio_proc::pio_asm!( |
| 31 | ".origin 0", | 38 | ".origin 0", |
diff --git a/examples/rp/src/bin/pio_hd44780.rs b/examples/rp/src/bin/pio_hd44780.rs index bfc6c9908..8aedd24b6 100644 --- a/examples/rp/src/bin/pio_hd44780.rs +++ b/examples/rp/src/bin/pio_hd44780.rs | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | //! This example shows powerful PIO module in the RP2040 chip to communicate with a HD44780 display. | ||
| 2 | //! See (https://www.sparkfun.com/datasheets/LCD/HD44780.pdf) | ||
| 3 | |||
| 1 | #![no_std] | 4 | #![no_std] |
| 2 | #![no_main] | 5 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 6 | #![feature(type_alias_impl_trait)] |
| @@ -7,13 +10,19 @@ use core::fmt::Write; | |||
| 7 | use embassy_executor::Spawner; | 10 | use embassy_executor::Spawner; |
| 8 | use embassy_rp::dma::{AnyChannel, Channel}; | 11 | use embassy_rp::dma::{AnyChannel, Channel}; |
| 9 | use embassy_rp::peripherals::PIO0; | 12 | use embassy_rp::peripherals::PIO0; |
| 10 | use embassy_rp::pio::{Config, Direction, FifoJoin, Pio, PioPin, ShiftConfig, ShiftDirection, StateMachine}; | 13 | use embassy_rp::pio::{ |
| 14 | Config, Direction, FifoJoin, InterruptHandler, Pio, PioPin, ShiftConfig, ShiftDirection, StateMachine, | ||
| 15 | }; | ||
| 11 | use embassy_rp::pwm::{self, Pwm}; | 16 | use embassy_rp::pwm::{self, Pwm}; |
| 12 | use embassy_rp::relocate::RelocatedProgram; | 17 | use embassy_rp::relocate::RelocatedProgram; |
| 13 | use embassy_rp::{into_ref, Peripheral, PeripheralRef}; | 18 | use embassy_rp::{bind_interrupts, into_ref, Peripheral, PeripheralRef}; |
| 14 | use embassy_time::{Duration, Instant, Timer}; | 19 | use embassy_time::{Duration, Instant, Timer}; |
| 15 | use {defmt_rtt as _, panic_probe as _}; | 20 | use {defmt_rtt as _, panic_probe as _}; |
| 16 | 21 | ||
| 22 | bind_interrupts!(pub struct Irqs { | ||
| 23 | PIO0_IRQ_0 => InterruptHandler<PIO0>; | ||
| 24 | }); | ||
| 25 | |||
| 17 | #[embassy_executor::main] | 26 | #[embassy_executor::main] |
| 18 | async fn main(_spawner: Spawner) { | 27 | async fn main(_spawner: Spawner) { |
| 19 | // this test assumes a 2x16 HD44780 display attached as follow: | 28 | // this test assumes a 2x16 HD44780 display attached as follow: |
| @@ -37,7 +46,7 @@ async fn main(_spawner: Spawner) { | |||
| 37 | }); | 46 | }); |
| 38 | 47 | ||
| 39 | let mut hd = HD44780::new( | 48 | let mut hd = HD44780::new( |
| 40 | p.PIO0, p.DMA_CH3, p.PIN_0, p.PIN_1, p.PIN_2, p.PIN_3, p.PIN_4, p.PIN_5, p.PIN_6, | 49 | p.PIO0, Irqs, p.DMA_CH3, p.PIN_0, p.PIN_1, p.PIN_2, p.PIN_3, p.PIN_4, p.PIN_5, p.PIN_6, |
| 41 | ) | 50 | ) |
| 42 | .await; | 51 | .await; |
| 43 | 52 | ||
| @@ -72,6 +81,7 @@ pub struct HD44780<'l> { | |||
| 72 | impl<'l> HD44780<'l> { | 81 | impl<'l> HD44780<'l> { |
| 73 | pub async fn new( | 82 | pub async fn new( |
| 74 | pio: impl Peripheral<P = PIO0> + 'l, | 83 | pio: impl Peripheral<P = PIO0> + 'l, |
| 84 | irq: Irqs, | ||
| 75 | dma: impl Peripheral<P = impl Channel> + 'l, | 85 | dma: impl Peripheral<P = impl Channel> + 'l, |
| 76 | rs: impl PioPin, | 86 | rs: impl PioPin, |
| 77 | rw: impl PioPin, | 87 | rw: impl PioPin, |
| @@ -88,7 +98,7 @@ impl<'l> HD44780<'l> { | |||
| 88 | mut irq0, | 98 | mut irq0, |
| 89 | mut sm0, | 99 | mut sm0, |
| 90 | .. | 100 | .. |
| 91 | } = Pio::new(pio); | 101 | } = Pio::new(pio, irq); |
| 92 | 102 | ||
| 93 | // takes command words (<wait:24> <command:4> <0:4>) | 103 | // takes command words (<wait:24> <command:4> <0:4>) |
| 94 | let prg = pio_proc::pio_asm!( | 104 | let prg = pio_proc::pio_asm!( |
diff --git a/examples/rp/src/bin/pio_ws2812.rs b/examples/rp/src/bin/pio_ws2812.rs index 26422421f..3de2bd48d 100644 --- a/examples/rp/src/bin/pio_ws2812.rs +++ b/examples/rp/src/bin/pio_ws2812.rs | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | //! This example shows powerful PIO module in the RP2040 chip to communicate with WS2812 LED modules. | ||
| 2 | //! See (https://www.sparkfun.com/categories/tags/ws2812) | ||
| 3 | |||
| 1 | #![no_std] | 4 | #![no_std] |
| 2 | #![no_main] | 5 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 6 | #![feature(type_alias_impl_trait)] |
| @@ -5,15 +8,22 @@ | |||
| 5 | use defmt::*; | 8 | use defmt::*; |
| 6 | use embassy_executor::Spawner; | 9 | use embassy_executor::Spawner; |
| 7 | use embassy_rp::dma::{AnyChannel, Channel}; | 10 | use embassy_rp::dma::{AnyChannel, Channel}; |
| 8 | use embassy_rp::pio::{Common, Config, FifoJoin, Instance, Pio, PioPin, ShiftConfig, ShiftDirection, StateMachine}; | 11 | use embassy_rp::peripherals::PIO0; |
| 12 | use embassy_rp::pio::{ | ||
| 13 | Common, Config, FifoJoin, Instance, InterruptHandler, Pio, PioPin, ShiftConfig, ShiftDirection, StateMachine, | ||
| 14 | }; | ||
| 9 | use embassy_rp::relocate::RelocatedProgram; | 15 | use embassy_rp::relocate::RelocatedProgram; |
| 10 | use embassy_rp::{clocks, into_ref, Peripheral, PeripheralRef}; | 16 | use embassy_rp::{bind_interrupts, clocks, into_ref, Peripheral, PeripheralRef}; |
| 11 | use embassy_time::{Duration, Timer}; | 17 | use embassy_time::{Duration, Timer}; |
| 12 | use fixed::types::U24F8; | 18 | use fixed::types::U24F8; |
| 13 | use fixed_macro::fixed; | 19 | use fixed_macro::fixed; |
| 14 | use smart_leds::RGB8; | 20 | use smart_leds::RGB8; |
| 15 | use {defmt_rtt as _, panic_probe as _}; | 21 | use {defmt_rtt as _, panic_probe as _}; |
| 16 | 22 | ||
| 23 | bind_interrupts!(struct Irqs { | ||
| 24 | PIO0_IRQ_0 => InterruptHandler<PIO0>; | ||
| 25 | }); | ||
| 26 | |||
| 17 | pub struct Ws2812<'d, P: Instance, const S: usize, const N: usize> { | 27 | pub struct Ws2812<'d, P: Instance, const S: usize, const N: usize> { |
| 18 | dma: PeripheralRef<'d, AnyChannel>, | 28 | dma: PeripheralRef<'d, AnyChannel>, |
| 19 | sm: StateMachine<'d, P, S>, | 29 | sm: StateMachine<'d, P, S>, |
| @@ -123,7 +133,7 @@ async fn main(_spawner: Spawner) { | |||
| 123 | info!("Start"); | 133 | info!("Start"); |
| 124 | let p = embassy_rp::init(Default::default()); | 134 | let p = embassy_rp::init(Default::default()); |
| 125 | 135 | ||
| 126 | let Pio { mut common, sm0, .. } = Pio::new(p.PIO0); | 136 | let Pio { mut common, sm0, .. } = Pio::new(p.PIO0, Irqs); |
| 127 | 137 | ||
| 128 | // This is the number of leds in the string. Helpfully, the sparkfun thing plus and adafruit | 138 | // This is the number of leds in the string. Helpfully, the sparkfun thing plus and adafruit |
| 129 | // feather boards for the 2040 both have one built in. | 139 | // feather boards for the 2040 both have one built in. |
diff --git a/examples/rp/src/bin/pwm.rs b/examples/rp/src/bin/pwm.rs index 2b3d5d97a..9d919287c 100644 --- a/examples/rp/src/bin/pwm.rs +++ b/examples/rp/src/bin/pwm.rs | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | //! This example shows how to use PWM (Pulse Width Modulation) in the RP2040 chip. | ||
| 2 | //! | ||
| 3 | //! The LED on the RP Pico W board is connected differently. Add a LED and resistor to another pin. | ||
| 4 | |||
| 1 | #![no_std] | 5 | #![no_std] |
| 2 | #![no_main] | 6 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 7 | #![feature(type_alias_impl_trait)] |
diff --git a/examples/rp/src/bin/rtc.rs b/examples/rp/src/bin/rtc.rs new file mode 100644 index 000000000..15aa8243f --- /dev/null +++ b/examples/rp/src/bin/rtc.rs | |||
| @@ -0,0 +1,46 @@ | |||
| 1 | //! This example shows how to use RTC (Real Time Clock) in the RP2040 chip. | ||
| 2 | |||
| 3 | #![no_std] | ||
| 4 | #![no_main] | ||
| 5 | #![feature(type_alias_impl_trait)] | ||
| 6 | |||
| 7 | use defmt::*; | ||
| 8 | use embassy_executor::Spawner; | ||
| 9 | use embassy_rp::rtc::{DateTime, DayOfWeek, Rtc}; | ||
| 10 | use embassy_time::{Duration, Timer}; | ||
| 11 | use {defmt_rtt as _, panic_probe as _}; | ||
| 12 | |||
| 13 | #[embassy_executor::main] | ||
| 14 | async fn main(_spawner: Spawner) { | ||
| 15 | let p = embassy_rp::init(Default::default()); | ||
| 16 | info!("Wait for 20s"); | ||
| 17 | |||
| 18 | let mut rtc = Rtc::new(p.RTC); | ||
| 19 | |||
| 20 | if !rtc.is_running() { | ||
| 21 | info!("Start RTC"); | ||
| 22 | let now = DateTime { | ||
| 23 | year: 2000, | ||
| 24 | month: 1, | ||
| 25 | day: 1, | ||
| 26 | day_of_week: DayOfWeek::Saturday, | ||
| 27 | hour: 0, | ||
| 28 | minute: 0, | ||
| 29 | second: 0, | ||
| 30 | }; | ||
| 31 | rtc.set_datetime(now).unwrap(); | ||
| 32 | } | ||
| 33 | |||
| 34 | Timer::after(Duration::from_millis(20000)).await; | ||
| 35 | |||
| 36 | if let Ok(dt) = rtc.now() { | ||
| 37 | info!( | ||
| 38 | "Now: {}-{:02}-{:02} {}:{:02}:{:02}", | ||
| 39 | dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second, | ||
| 40 | ); | ||
| 41 | } | ||
| 42 | |||
| 43 | info!("Reboot."); | ||
| 44 | Timer::after(Duration::from_millis(200)).await; | ||
| 45 | cortex_m::peripheral::SCB::sys_reset(); | ||
| 46 | } | ||
diff --git a/examples/rp/src/bin/spi.rs b/examples/rp/src/bin/spi.rs index a830a17a2..602348f7a 100644 --- a/examples/rp/src/bin/spi.rs +++ b/examples/rp/src/bin/spi.rs | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | //! This example shows how to use SPI (Serial Peripheral Interface) in the RP2040 chip. | ||
| 2 | //! | ||
| 3 | //! Example for resistive touch sensor in Waveshare Pico-ResTouch | ||
| 4 | |||
| 1 | #![no_std] | 5 | #![no_std] |
| 2 | #![no_main] | 6 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 7 | #![feature(type_alias_impl_trait)] |
diff --git a/examples/rp/src/bin/spi_async.rs b/examples/rp/src/bin/spi_async.rs index 671a9caaf..328074e8b 100644 --- a/examples/rp/src/bin/spi_async.rs +++ b/examples/rp/src/bin/spi_async.rs | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | //! This example shows how to use SPI (Serial Peripheral Interface) in the RP2040 chip. | ||
| 2 | //! No specific hardware is specified in this example. If you connect pin 11 and 12 you should get the same data back. | ||
| 3 | |||
| 1 | #![no_std] | 4 | #![no_std] |
| 2 | #![no_main] | 5 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 6 | #![feature(type_alias_impl_trait)] |
diff --git a/examples/rp/src/bin/spi_display.rs b/examples/rp/src/bin/spi_display.rs index 85a19ce07..26c258e1c 100644 --- a/examples/rp/src/bin/spi_display.rs +++ b/examples/rp/src/bin/spi_display.rs | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | //! This example shows how to use SPI (Serial Peripheral Interface) in the RP2040 chip. | ||
| 2 | //! | ||
| 3 | //! Example written for a display using the ST7789 chip. Possibly the Waveshare Pico-ResTouch | ||
| 4 | //! (https://www.waveshare.com/wiki/Pico-ResTouch-LCD-2.8) | ||
| 5 | |||
| 1 | #![no_std] | 6 | #![no_std] |
| 2 | #![no_main] | 7 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 8 | #![feature(type_alias_impl_trait)] |
| @@ -175,7 +180,7 @@ mod touch { | |||
| 175 | mod my_display_interface { | 180 | mod my_display_interface { |
| 176 | use display_interface::{DataFormat, DisplayError, WriteOnlyDataCommand}; | 181 | use display_interface::{DataFormat, DisplayError, WriteOnlyDataCommand}; |
| 177 | use embedded_hal_1::digital::OutputPin; | 182 | use embedded_hal_1::digital::OutputPin; |
| 178 | use embedded_hal_1::spi::SpiDeviceWrite; | 183 | use embedded_hal_1::spi::SpiDevice; |
| 179 | 184 | ||
| 180 | /// SPI display interface. | 185 | /// SPI display interface. |
| 181 | /// | 186 | /// |
| @@ -187,7 +192,7 @@ mod my_display_interface { | |||
| 187 | 192 | ||
| 188 | impl<SPI, DC> SPIDeviceInterface<SPI, DC> | 193 | impl<SPI, DC> SPIDeviceInterface<SPI, DC> |
| 189 | where | 194 | where |
| 190 | SPI: SpiDeviceWrite, | 195 | SPI: SpiDevice, |
| 191 | DC: OutputPin, | 196 | DC: OutputPin, |
| 192 | { | 197 | { |
| 193 | /// Create new SPI interface for communciation with a display driver | 198 | /// Create new SPI interface for communciation with a display driver |
| @@ -198,7 +203,7 @@ mod my_display_interface { | |||
| 198 | 203 | ||
| 199 | impl<SPI, DC> WriteOnlyDataCommand for SPIDeviceInterface<SPI, DC> | 204 | impl<SPI, DC> WriteOnlyDataCommand for SPIDeviceInterface<SPI, DC> |
| 200 | where | 205 | where |
| 201 | SPI: SpiDeviceWrite, | 206 | SPI: SpiDevice, |
| 202 | DC: OutputPin, | 207 | DC: OutputPin, |
| 203 | { | 208 | { |
| 204 | fn send_commands(&mut self, cmds: DataFormat<'_>) -> Result<(), DisplayError> { | 209 | fn send_commands(&mut self, cmds: DataFormat<'_>) -> Result<(), DisplayError> { |
| @@ -218,7 +223,7 @@ mod my_display_interface { | |||
| 218 | } | 223 | } |
| 219 | } | 224 | } |
| 220 | 225 | ||
| 221 | fn send_u8<T: SpiDeviceWrite>(spi: &mut T, words: DataFormat<'_>) -> Result<(), T::Error> { | 226 | fn send_u8<T: SpiDevice>(spi: &mut T, words: DataFormat<'_>) -> Result<(), T::Error> { |
| 222 | match words { | 227 | match words { |
| 223 | DataFormat::U8(slice) => spi.write(slice), | 228 | DataFormat::U8(slice) => spi.write(slice), |
| 224 | DataFormat::U16(slice) => { | 229 | DataFormat::U16(slice) => { |
diff --git a/examples/rp/src/bin/uart.rs b/examples/rp/src/bin/uart.rs index 05177a6b4..451c3c396 100644 --- a/examples/rp/src/bin/uart.rs +++ b/examples/rp/src/bin/uart.rs | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | //! This example shows how to use UART (Universal asynchronous receiver-transmitter) in the RP2040 chip. | ||
| 2 | //! | ||
| 3 | //! No specific hardware is specified in this example. Only output on pin 0 is tested. | ||
| 4 | //! The Raspberry Pi Debug Probe (https://www.raspberrypi.com/products/debug-probe/) could be used | ||
| 5 | //! with its UART port. | ||
| 6 | |||
| 1 | #![no_std] | 7 | #![no_std] |
| 2 | #![no_main] | 8 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 9 | #![feature(type_alias_impl_trait)] |
diff --git a/examples/rp/src/bin/uart_buffered_split.rs b/examples/rp/src/bin/uart_buffered_split.rs index 9df99bd58..735201718 100644 --- a/examples/rp/src/bin/uart_buffered_split.rs +++ b/examples/rp/src/bin/uart_buffered_split.rs | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | //! This example shows how to use UART (Universal asynchronous receiver-transmitter) in the RP2040 chip. | ||
| 2 | //! | ||
| 3 | //! No specific hardware is specified in this example. If you connect pin 0 and 1 you should get the same data back. | ||
| 4 | //! The Raspberry Pi Debug Probe (https://www.raspberrypi.com/products/debug-probe/) could be used | ||
| 5 | //! with its UART port. | ||
| 6 | |||
| 1 | #![no_std] | 7 | #![no_std] |
| 2 | #![no_main] | 8 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 9 | #![feature(type_alias_impl_trait)] |
diff --git a/examples/rp/src/bin/uart_unidir.rs b/examples/rp/src/bin/uart_unidir.rs index c0943a1b8..c1515a911 100644 --- a/examples/rp/src/bin/uart_unidir.rs +++ b/examples/rp/src/bin/uart_unidir.rs | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | //! test TX-only and RX-only UARTs. You need to connect GPIO0 to GPIO5 for | 1 | //! This example shows how to use UART (Universal asynchronous receiver-transmitter) in the RP2040 chip. |
| 2 | //! | ||
| 3 | //! Test TX-only and RX-only on two different UARTs. You need to connect GPIO0 to GPIO5 for | ||
| 2 | //! this to work | 4 | //! this to work |
| 5 | //! The Raspberry Pi Debug Probe (https://www.raspberrypi.com/products/debug-probe/) could be used | ||
| 6 | //! with its UART port. | ||
| 3 | 7 | ||
| 4 | #![no_std] | 8 | #![no_std] |
| 5 | #![no_main] | 9 | #![no_main] |
diff --git a/examples/rp/src/bin/usb_ethernet.rs b/examples/rp/src/bin/usb_ethernet.rs index 91d1ec8e7..0a08f667e 100644 --- a/examples/rp/src/bin/usb_ethernet.rs +++ b/examples/rp/src/bin/usb_ethernet.rs | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | //! This example shows how to use USB (Universal Serial Bus) in the RP2040 chip. | ||
| 2 | //! | ||
| 3 | //! This is a CDC-NCM class implementation, aka Ethernet over USB. | ||
| 4 | |||
| 1 | #![no_std] | 5 | #![no_std] |
| 2 | #![no_main] | 6 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 7 | #![feature(type_alias_impl_trait)] |
diff --git a/examples/rp/src/bin/usb_hid_keyboard.rs b/examples/rp/src/bin/usb_hid_keyboard.rs new file mode 100644 index 000000000..99af1f02f --- /dev/null +++ b/examples/rp/src/bin/usb_hid_keyboard.rs | |||
| @@ -0,0 +1,188 @@ | |||
| 1 | #![no_std] | ||
| 2 | #![no_main] | ||
| 3 | #![feature(type_alias_impl_trait)] | ||
| 4 | |||
| 5 | use core::sync::atomic::{AtomicBool, Ordering}; | ||
| 6 | |||
| 7 | use defmt::*; | ||
| 8 | use embassy_executor::Spawner; | ||
| 9 | use embassy_futures::join::join; | ||
| 10 | use embassy_rp::bind_interrupts; | ||
| 11 | use embassy_rp::gpio::{Input, Pull}; | ||
| 12 | use embassy_rp::peripherals::USB; | ||
| 13 | use embassy_rp::usb::{Driver, InterruptHandler}; | ||
| 14 | use embassy_usb::class::hid::{HidReaderWriter, ReportId, RequestHandler, State}; | ||
| 15 | use embassy_usb::control::OutResponse; | ||
| 16 | use embassy_usb::{Builder, Config, Handler}; | ||
| 17 | use usbd_hid::descriptor::{KeyboardReport, SerializedDescriptor}; | ||
| 18 | use {defmt_rtt as _, panic_probe as _}; | ||
| 19 | |||
| 20 | bind_interrupts!(struct Irqs { | ||
| 21 | USBCTRL_IRQ => InterruptHandler<USB>; | ||
| 22 | }); | ||
| 23 | |||
| 24 | #[embassy_executor::main] | ||
| 25 | async fn main(_spawner: Spawner) { | ||
| 26 | let p = embassy_rp::init(Default::default()); | ||
| 27 | // Create the driver, from the HAL. | ||
| 28 | let driver = Driver::new(p.USB, Irqs); | ||
| 29 | |||
| 30 | // Create embassy-usb Config | ||
| 31 | let mut config = Config::new(0xc0de, 0xcafe); | ||
| 32 | config.manufacturer = Some("Embassy"); | ||
| 33 | config.product = Some("HID keyboard example"); | ||
| 34 | config.serial_number = Some("12345678"); | ||
| 35 | config.max_power = 100; | ||
| 36 | config.max_packet_size_0 = 64; | ||
| 37 | |||
| 38 | // Create embassy-usb DeviceBuilder using the driver and config. | ||
| 39 | // It needs some buffers for building the descriptors. | ||
| 40 | let mut device_descriptor = [0; 256]; | ||
| 41 | let mut config_descriptor = [0; 256]; | ||
| 42 | let mut bos_descriptor = [0; 256]; | ||
| 43 | // You can also add a Microsoft OS descriptor. | ||
| 44 | // let mut msos_descriptor = [0; 256]; | ||
| 45 | let mut control_buf = [0; 64]; | ||
| 46 | let request_handler = MyRequestHandler {}; | ||
| 47 | let mut device_handler = MyDeviceHandler::new(); | ||
| 48 | |||
| 49 | let mut state = State::new(); | ||
| 50 | |||
| 51 | let mut builder = Builder::new( | ||
| 52 | driver, | ||
| 53 | config, | ||
| 54 | &mut device_descriptor, | ||
| 55 | &mut config_descriptor, | ||
| 56 | &mut bos_descriptor, | ||
| 57 | // &mut msos_descriptor, | ||
| 58 | &mut control_buf, | ||
| 59 | ); | ||
| 60 | |||
| 61 | builder.handler(&mut device_handler); | ||
| 62 | |||
| 63 | // Create classes on the builder. | ||
| 64 | let config = embassy_usb::class::hid::Config { | ||
| 65 | report_descriptor: KeyboardReport::desc(), | ||
| 66 | request_handler: Some(&request_handler), | ||
| 67 | poll_ms: 60, | ||
| 68 | max_packet_size: 64, | ||
| 69 | }; | ||
| 70 | let hid = HidReaderWriter::<_, 1, 8>::new(&mut builder, &mut state, config); | ||
| 71 | |||
| 72 | // Build the builder. | ||
| 73 | let mut usb = builder.build(); | ||
| 74 | |||
| 75 | // Run the USB device. | ||
| 76 | let usb_fut = usb.run(); | ||
| 77 | |||
| 78 | // Set up the signal pin that will be used to trigger the keyboard. | ||
| 79 | let mut signal_pin = Input::new(p.PIN_16, Pull::None); | ||
| 80 | |||
| 81 | let (reader, mut writer) = hid.split(); | ||
| 82 | |||
| 83 | // Do stuff with the class! | ||
| 84 | let in_fut = async { | ||
| 85 | loop { | ||
| 86 | info!("Waiting for HIGH on pin 16"); | ||
| 87 | signal_pin.wait_for_high().await; | ||
| 88 | info!("HIGH DETECTED"); | ||
| 89 | // Create a report with the A key pressed. (no shift modifier) | ||
| 90 | let report = KeyboardReport { | ||
| 91 | keycodes: [4, 0, 0, 0, 0, 0], | ||
| 92 | leds: 0, | ||
| 93 | modifier: 0, | ||
| 94 | reserved: 0, | ||
| 95 | }; | ||
| 96 | // Send the report. | ||
| 97 | match writer.write_serialize(&report).await { | ||
| 98 | Ok(()) => {} | ||
| 99 | Err(e) => warn!("Failed to send report: {:?}", e), | ||
| 100 | }; | ||
| 101 | signal_pin.wait_for_low().await; | ||
| 102 | info!("LOW DETECTED"); | ||
| 103 | let report = KeyboardReport { | ||
| 104 | keycodes: [0, 0, 0, 0, 0, 0], | ||
| 105 | leds: 0, | ||
| 106 | modifier: 0, | ||
| 107 | reserved: 0, | ||
| 108 | }; | ||
| 109 | match writer.write_serialize(&report).await { | ||
| 110 | Ok(()) => {} | ||
| 111 | Err(e) => warn!("Failed to send report: {:?}", e), | ||
| 112 | }; | ||
| 113 | } | ||
| 114 | }; | ||
| 115 | |||
| 116 | let out_fut = async { | ||
| 117 | reader.run(false, &request_handler).await; | ||
| 118 | }; | ||
| 119 | |||
| 120 | // Run everything concurrently. | ||
| 121 | // If we had made everything `'static` above instead, we could do this using separate tasks instead. | ||
| 122 | join(usb_fut, join(in_fut, out_fut)).await; | ||
| 123 | } | ||
| 124 | |||
| 125 | struct MyRequestHandler {} | ||
| 126 | |||
| 127 | impl RequestHandler for MyRequestHandler { | ||
| 128 | fn get_report(&self, id: ReportId, _buf: &mut [u8]) -> Option<usize> { | ||
| 129 | info!("Get report for {:?}", id); | ||
| 130 | None | ||
| 131 | } | ||
| 132 | |||
| 133 | fn set_report(&self, id: ReportId, data: &[u8]) -> OutResponse { | ||
| 134 | info!("Set report for {:?}: {=[u8]}", id, data); | ||
| 135 | OutResponse::Accepted | ||
| 136 | } | ||
| 137 | |||
| 138 | fn set_idle_ms(&self, id: Option<ReportId>, dur: u32) { | ||
| 139 | info!("Set idle rate for {:?} to {:?}", id, dur); | ||
| 140 | } | ||
| 141 | |||
| 142 | fn get_idle_ms(&self, id: Option<ReportId>) -> Option<u32> { | ||
| 143 | info!("Get idle rate for {:?}", id); | ||
| 144 | None | ||
| 145 | } | ||
| 146 | } | ||
| 147 | |||
| 148 | struct MyDeviceHandler { | ||
| 149 | configured: AtomicBool, | ||
| 150 | } | ||
| 151 | |||
| 152 | impl MyDeviceHandler { | ||
| 153 | fn new() -> Self { | ||
| 154 | MyDeviceHandler { | ||
| 155 | configured: AtomicBool::new(false), | ||
| 156 | } | ||
| 157 | } | ||
| 158 | } | ||
| 159 | |||
| 160 | impl Handler for MyDeviceHandler { | ||
| 161 | fn enabled(&mut self, enabled: bool) { | ||
| 162 | self.configured.store(false, Ordering::Relaxed); | ||
| 163 | if enabled { | ||
| 164 | info!("Device enabled"); | ||
| 165 | } else { | ||
| 166 | info!("Device disabled"); | ||
| 167 | } | ||
| 168 | } | ||
| 169 | |||
| 170 | fn reset(&mut self) { | ||
| 171 | self.configured.store(false, Ordering::Relaxed); | ||
| 172 | info!("Bus reset, the Vbus current limit is 100mA"); | ||
| 173 | } | ||
| 174 | |||
| 175 | fn addressed(&mut self, addr: u8) { | ||
| 176 | self.configured.store(false, Ordering::Relaxed); | ||
| 177 | info!("USB address set to: {}", addr); | ||
| 178 | } | ||
| 179 | |||
| 180 | fn configured(&mut self, configured: bool) { | ||
| 181 | self.configured.store(configured, Ordering::Relaxed); | ||
| 182 | if configured { | ||
| 183 | info!("Device configured, it may now draw up to the configured current limit from Vbus.") | ||
| 184 | } else { | ||
| 185 | info!("Device is no longer configured, the Vbus current limit is 100mA."); | ||
| 186 | } | ||
| 187 | } | ||
| 188 | } | ||
diff --git a/examples/rp/src/bin/usb_logger.rs b/examples/rp/src/bin/usb_logger.rs index 7c90d0ca3..9c5e6897d 100644 --- a/examples/rp/src/bin/usb_logger.rs +++ b/examples/rp/src/bin/usb_logger.rs | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | //! This example shows how to use USB (Universal Serial Bus) in the RP2040 chip. | ||
| 2 | //! | ||
| 3 | //! This creates the possibility to send log::info/warn/error/debug! to USB serial port. | ||
| 4 | |||
| 1 | #![no_std] | 5 | #![no_std] |
| 2 | #![no_main] | 6 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 7 | #![feature(type_alias_impl_trait)] |
diff --git a/examples/rp/src/bin/usb_serial.rs b/examples/rp/src/bin/usb_serial.rs index ca728536c..164e2052d 100644 --- a/examples/rp/src/bin/usb_serial.rs +++ b/examples/rp/src/bin/usb_serial.rs | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | //! This example shows how to use USB (Universal Serial Bus) in the RP2040 chip. | ||
| 2 | //! | ||
| 3 | //! This creates a USB serial port that echos. | ||
| 4 | |||
| 1 | #![no_std] | 5 | #![no_std] |
| 2 | #![no_main] | 6 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 7 | #![feature(type_alias_impl_trait)] |
diff --git a/examples/rp/src/bin/watchdog.rs b/examples/rp/src/bin/watchdog.rs index ece5cfe38..fe5eaf926 100644 --- a/examples/rp/src/bin/watchdog.rs +++ b/examples/rp/src/bin/watchdog.rs | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | //! This example shows how to use Watchdog in the RP2040 chip. | ||
| 2 | //! | ||
| 3 | //! It does not work with the RP Pico W board. See wifi_blinky.rs or connect external LED and resistor. | ||
| 4 | |||
| 1 | #![no_std] | 5 | #![no_std] |
| 2 | #![no_main] | 6 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 7 | #![feature(type_alias_impl_trait)] |
diff --git a/examples/rp/src/bin/wifi_ap_tcp_server.rs b/examples/rp/src/bin/wifi_ap_tcp_server.rs index 310e84d92..e3e393445 100644 --- a/examples/rp/src/bin/wifi_ap_tcp_server.rs +++ b/examples/rp/src/bin/wifi_ap_tcp_server.rs | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | //! This example uses the RP Pico W board Wifi chip (cyw43). | ||
| 2 | //! Creates an Access point Wifi network and creates a TCP endpoint on port 1234. | ||
| 3 | |||
| 1 | #![no_std] | 4 | #![no_std] |
| 2 | #![no_main] | 5 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 6 | #![feature(type_alias_impl_trait)] |
| @@ -11,14 +14,19 @@ use defmt::*; | |||
| 11 | use embassy_executor::Spawner; | 14 | use embassy_executor::Spawner; |
| 12 | use embassy_net::tcp::TcpSocket; | 15 | use embassy_net::tcp::TcpSocket; |
| 13 | use embassy_net::{Config, Stack, StackResources}; | 16 | use embassy_net::{Config, Stack, StackResources}; |
| 17 | use embassy_rp::bind_interrupts; | ||
| 14 | use embassy_rp::gpio::{Level, Output}; | 18 | use embassy_rp::gpio::{Level, Output}; |
| 15 | use embassy_rp::peripherals::{DMA_CH0, PIN_23, PIN_25, PIO0}; | 19 | use embassy_rp::peripherals::{DMA_CH0, PIN_23, PIN_25, PIO0}; |
| 16 | use embassy_rp::pio::Pio; | 20 | use embassy_rp::pio::{InterruptHandler, Pio}; |
| 17 | use embassy_time::Duration; | 21 | use embassy_time::Duration; |
| 18 | use embedded_io::asynch::Write; | 22 | use embedded_io::asynch::Write; |
| 19 | use static_cell::make_static; | 23 | use static_cell::make_static; |
| 20 | use {defmt_rtt as _, panic_probe as _}; | 24 | use {defmt_rtt as _, panic_probe as _}; |
| 21 | 25 | ||
| 26 | bind_interrupts!(struct Irqs { | ||
| 27 | PIO0_IRQ_0 => InterruptHandler<PIO0>; | ||
| 28 | }); | ||
| 29 | |||
| 22 | #[embassy_executor::task] | 30 | #[embassy_executor::task] |
| 23 | async fn wifi_task( | 31 | async fn wifi_task( |
| 24 | runner: cyw43::Runner<'static, Output<'static, PIN_23>, PioSpi<'static, PIN_25, PIO0, 0, DMA_CH0>>, | 32 | runner: cyw43::Runner<'static, Output<'static, PIN_23>, PioSpi<'static, PIN_25, PIO0, 0, DMA_CH0>>, |
| @@ -49,7 +57,7 @@ async fn main(spawner: Spawner) { | |||
| 49 | 57 | ||
| 50 | let pwr = Output::new(p.PIN_23, Level::Low); | 58 | let pwr = Output::new(p.PIN_23, Level::Low); |
| 51 | let cs = Output::new(p.PIN_25, Level::High); | 59 | let cs = Output::new(p.PIN_25, Level::High); |
| 52 | let mut pio = Pio::new(p.PIO0); | 60 | let mut pio = Pio::new(p.PIO0, Irqs); |
| 53 | let spi = PioSpi::new(&mut pio.common, pio.sm0, pio.irq0, cs, p.PIN_24, p.PIN_29, p.DMA_CH0); | 61 | let spi = PioSpi::new(&mut pio.common, pio.sm0, pio.irq0, cs, p.PIN_24, p.PIN_29, p.DMA_CH0); |
| 54 | 62 | ||
| 55 | let state = make_static!(cyw43::State::new()); | 63 | let state = make_static!(cyw43::State::new()); |
diff --git a/examples/rp/src/bin/wifi_blinky.rs b/examples/rp/src/bin/wifi_blinky.rs index bbcb1b5ec..33d43788c 100644 --- a/examples/rp/src/bin/wifi_blinky.rs +++ b/examples/rp/src/bin/wifi_blinky.rs | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | //! This example test the RP Pico W on board LED. | ||
| 2 | //! | ||
| 3 | //! It does not work with the RP Pico board. See blinky.rs. | ||
| 4 | |||
| 1 | #![no_std] | 5 | #![no_std] |
| 2 | #![no_main] | 6 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 7 | #![feature(type_alias_impl_trait)] |
| @@ -5,13 +9,18 @@ | |||
| 5 | use cyw43_pio::PioSpi; | 9 | use cyw43_pio::PioSpi; |
| 6 | use defmt::*; | 10 | use defmt::*; |
| 7 | use embassy_executor::Spawner; | 11 | use embassy_executor::Spawner; |
| 12 | use embassy_rp::bind_interrupts; | ||
| 8 | use embassy_rp::gpio::{Level, Output}; | 13 | use embassy_rp::gpio::{Level, Output}; |
| 9 | use embassy_rp::peripherals::{DMA_CH0, PIN_23, PIN_25, PIO0}; | 14 | use embassy_rp::peripherals::{DMA_CH0, PIN_23, PIN_25, PIO0}; |
| 10 | use embassy_rp::pio::Pio; | 15 | use embassy_rp::pio::{InterruptHandler, Pio}; |
| 11 | use embassy_time::{Duration, Timer}; | 16 | use embassy_time::{Duration, Timer}; |
| 12 | use static_cell::make_static; | 17 | use static_cell::make_static; |
| 13 | use {defmt_rtt as _, panic_probe as _}; | 18 | use {defmt_rtt as _, panic_probe as _}; |
| 14 | 19 | ||
| 20 | bind_interrupts!(struct Irqs { | ||
| 21 | PIO0_IRQ_0 => InterruptHandler<PIO0>; | ||
| 22 | }); | ||
| 23 | |||
| 15 | #[embassy_executor::task] | 24 | #[embassy_executor::task] |
| 16 | async fn wifi_task( | 25 | async fn wifi_task( |
| 17 | runner: cyw43::Runner<'static, Output<'static, PIN_23>, PioSpi<'static, PIN_25, PIO0, 0, DMA_CH0>>, | 26 | runner: cyw43::Runner<'static, Output<'static, PIN_23>, PioSpi<'static, PIN_25, PIO0, 0, DMA_CH0>>, |
| @@ -34,7 +43,7 @@ async fn main(spawner: Spawner) { | |||
| 34 | 43 | ||
| 35 | let pwr = Output::new(p.PIN_23, Level::Low); | 44 | let pwr = Output::new(p.PIN_23, Level::Low); |
| 36 | let cs = Output::new(p.PIN_25, Level::High); | 45 | let cs = Output::new(p.PIN_25, Level::High); |
| 37 | let mut pio = Pio::new(p.PIO0); | 46 | let mut pio = Pio::new(p.PIO0, Irqs); |
| 38 | let spi = PioSpi::new(&mut pio.common, pio.sm0, pio.irq0, cs, p.PIN_24, p.PIN_29, p.DMA_CH0); | 47 | let spi = PioSpi::new(&mut pio.common, pio.sm0, pio.irq0, cs, p.PIN_24, p.PIN_29, p.DMA_CH0); |
| 39 | 48 | ||
| 40 | let state = make_static!(cyw43::State::new()); | 49 | let state = make_static!(cyw43::State::new()); |
diff --git a/examples/rp/src/bin/wifi_scan.rs b/examples/rp/src/bin/wifi_scan.rs index 391e12282..743fab617 100644 --- a/examples/rp/src/bin/wifi_scan.rs +++ b/examples/rp/src/bin/wifi_scan.rs | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | //! This example uses the RP Pico W board Wifi chip (cyw43). | ||
| 2 | //! Scans Wifi for ssid names. | ||
| 3 | |||
| 1 | #![no_std] | 4 | #![no_std] |
| 2 | #![no_main] | 5 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 6 | #![feature(type_alias_impl_trait)] |
| @@ -10,12 +13,17 @@ use cyw43_pio::PioSpi; | |||
| 10 | use defmt::*; | 13 | use defmt::*; |
| 11 | use embassy_executor::Spawner; | 14 | use embassy_executor::Spawner; |
| 12 | use embassy_net::Stack; | 15 | use embassy_net::Stack; |
| 16 | use embassy_rp::bind_interrupts; | ||
| 13 | use embassy_rp::gpio::{Level, Output}; | 17 | use embassy_rp::gpio::{Level, Output}; |
| 14 | use embassy_rp::peripherals::{DMA_CH0, PIN_23, PIN_25, PIO0}; | 18 | use embassy_rp::peripherals::{DMA_CH0, PIN_23, PIN_25, PIO0}; |
| 15 | use embassy_rp::pio::Pio; | 19 | use embassy_rp::pio::{InterruptHandler, Pio}; |
| 16 | use static_cell::make_static; | 20 | use static_cell::make_static; |
| 17 | use {defmt_rtt as _, panic_probe as _}; | 21 | use {defmt_rtt as _, panic_probe as _}; |
| 18 | 22 | ||
| 23 | bind_interrupts!(struct Irqs { | ||
| 24 | PIO0_IRQ_0 => InterruptHandler<PIO0>; | ||
| 25 | }); | ||
| 26 | |||
| 19 | #[embassy_executor::task] | 27 | #[embassy_executor::task] |
| 20 | async fn wifi_task( | 28 | async fn wifi_task( |
| 21 | runner: cyw43::Runner<'static, Output<'static, PIN_23>, PioSpi<'static, PIN_25, PIO0, 0, DMA_CH0>>, | 29 | runner: cyw43::Runner<'static, Output<'static, PIN_23>, PioSpi<'static, PIN_25, PIO0, 0, DMA_CH0>>, |
| @@ -46,7 +54,7 @@ async fn main(spawner: Spawner) { | |||
| 46 | 54 | ||
| 47 | let pwr = Output::new(p.PIN_23, Level::Low); | 55 | let pwr = Output::new(p.PIN_23, Level::Low); |
| 48 | let cs = Output::new(p.PIN_25, Level::High); | 56 | let cs = Output::new(p.PIN_25, Level::High); |
| 49 | let mut pio = Pio::new(p.PIO0); | 57 | let mut pio = Pio::new(p.PIO0, Irqs); |
| 50 | let spi = PioSpi::new(&mut pio.common, pio.sm0, pio.irq0, cs, p.PIN_24, p.PIN_29, p.DMA_CH0); | 58 | let spi = PioSpi::new(&mut pio.common, pio.sm0, pio.irq0, cs, p.PIN_24, p.PIN_29, p.DMA_CH0); |
| 51 | 59 | ||
| 52 | let state = make_static!(cyw43::State::new()); | 60 | let state = make_static!(cyw43::State::new()); |
diff --git a/examples/rp/src/bin/wifi_tcp_server.rs b/examples/rp/src/bin/wifi_tcp_server.rs index e9d1079a6..0223a3636 100644 --- a/examples/rp/src/bin/wifi_tcp_server.rs +++ b/examples/rp/src/bin/wifi_tcp_server.rs | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | //! This example uses the RP Pico W board Wifi chip (cyw43). | ||
| 2 | //! Connects to specified Wifi network and creates a TCP endpoint on port 1234. | ||
| 3 | |||
| 1 | #![no_std] | 4 | #![no_std] |
| 2 | #![no_main] | 5 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 6 | #![feature(type_alias_impl_trait)] |
| @@ -11,14 +14,22 @@ use defmt::*; | |||
| 11 | use embassy_executor::Spawner; | 14 | use embassy_executor::Spawner; |
| 12 | use embassy_net::tcp::TcpSocket; | 15 | use embassy_net::tcp::TcpSocket; |
| 13 | use embassy_net::{Config, Stack, StackResources}; | 16 | use embassy_net::{Config, Stack, StackResources}; |
| 17 | use embassy_rp::bind_interrupts; | ||
| 14 | use embassy_rp::gpio::{Level, Output}; | 18 | use embassy_rp::gpio::{Level, Output}; |
| 15 | use embassy_rp::peripherals::{DMA_CH0, PIN_23, PIN_25, PIO0}; | 19 | use embassy_rp::peripherals::{DMA_CH0, PIN_23, PIN_25, PIO0}; |
| 16 | use embassy_rp::pio::Pio; | 20 | use embassy_rp::pio::{InterruptHandler, Pio}; |
| 17 | use embassy_time::Duration; | 21 | use embassy_time::Duration; |
| 18 | use embedded_io::asynch::Write; | 22 | use embedded_io::asynch::Write; |
| 19 | use static_cell::make_static; | 23 | use static_cell::make_static; |
| 20 | use {defmt_rtt as _, panic_probe as _}; | 24 | use {defmt_rtt as _, panic_probe as _}; |
| 21 | 25 | ||
| 26 | bind_interrupts!(struct Irqs { | ||
| 27 | PIO0_IRQ_0 => InterruptHandler<PIO0>; | ||
| 28 | }); | ||
| 29 | |||
| 30 | const WIFI_NETWORK: &str = "EmbassyTest"; | ||
| 31 | const WIFI_PASSWORD: &str = "V8YxhKt5CdIAJFud"; | ||
| 32 | |||
| 22 | #[embassy_executor::task] | 33 | #[embassy_executor::task] |
| 23 | async fn wifi_task( | 34 | async fn wifi_task( |
| 24 | runner: cyw43::Runner<'static, Output<'static, PIN_23>, PioSpi<'static, PIN_25, PIO0, 0, DMA_CH0>>, | 35 | runner: cyw43::Runner<'static, Output<'static, PIN_23>, PioSpi<'static, PIN_25, PIO0, 0, DMA_CH0>>, |
| @@ -49,7 +60,7 @@ async fn main(spawner: Spawner) { | |||
| 49 | 60 | ||
| 50 | let pwr = Output::new(p.PIN_23, Level::Low); | 61 | let pwr = Output::new(p.PIN_23, Level::Low); |
| 51 | let cs = Output::new(p.PIN_25, Level::High); | 62 | let cs = Output::new(p.PIN_25, Level::High); |
| 52 | let mut pio = Pio::new(p.PIO0); | 63 | let mut pio = Pio::new(p.PIO0, Irqs); |
| 53 | let spi = PioSpi::new(&mut pio.common, pio.sm0, pio.irq0, cs, p.PIN_24, p.PIN_29, p.DMA_CH0); | 64 | let spi = PioSpi::new(&mut pio.common, pio.sm0, pio.irq0, cs, p.PIN_24, p.PIN_29, p.DMA_CH0); |
| 54 | 65 | ||
| 55 | let state = make_static!(cyw43::State::new()); | 66 | let state = make_static!(cyw43::State::new()); |
| @@ -82,8 +93,8 @@ async fn main(spawner: Spawner) { | |||
| 82 | unwrap!(spawner.spawn(net_task(stack))); | 93 | unwrap!(spawner.spawn(net_task(stack))); |
| 83 | 94 | ||
| 84 | loop { | 95 | loop { |
| 85 | //control.join_open(env!("WIFI_NETWORK")).await; | 96 | //control.join_open(WIFI_NETWORK).await; |
| 86 | match control.join_wpa2(env!("WIFI_NETWORK"), env!("WIFI_PASSWORD")).await { | 97 | match control.join_wpa2(WIFI_NETWORK, WIFI_PASSWORD).await { |
| 87 | Ok(_) => break, | 98 | Ok(_) => break, |
| 88 | Err(err) => { | 99 | Err(err) => { |
| 89 | info!("join failed with status={}", err.status); | 100 | info!("join failed with status={}", err.status); |
diff --git a/examples/std/Cargo.toml b/examples/std/Cargo.toml index 878ad8c5a..92933ab50 100644 --- a/examples/std/Cargo.toml +++ b/examples/std/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["log"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["log"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["arch-std", "executor-thread", "log", "nightly", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["arch-std", "executor-thread", "log", "nightly", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["log", "std", "nightly"] } | 10 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["log", "std", "nightly"] } |
| 11 | embassy-net = { version = "0.1.0", path = "../../embassy-net", features=[ "std", "nightly", "log", "medium-ethernet", "tcp", "udp", "dns", "dhcpv4", "unstable-traits", "proto-ipv6"] } | 11 | embassy-net = { version = "0.1.0", path = "../../embassy-net", features=[ "std", "nightly", "log", "medium-ethernet", "tcp", "udp", "dns", "dhcpv4", "unstable-traits", "proto-ipv6"] } |
| 12 | embassy-net-driver = { version = "0.1.0", path = "../../embassy-net-driver" } | 12 | embassy-net-driver = { version = "0.1.0", path = "../../embassy-net-driver" } |
| 13 | embedded-io = { version = "0.4.0", features = ["async", "std", "futures"] } | 13 | embedded-io = { version = "0.4.0", features = ["async", "std", "futures"] } |
diff --git a/examples/stm32c0/Cargo.toml b/examples/stm32c0/Cargo.toml index 43f432520..26837abef 100644 --- a/examples/stm32c0/Cargo.toml +++ b/examples/stm32c0/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "time-driver-any", "stm32c031c6", "memory-x", "unstable-pac", "exti"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "time-driver-any", "stm32c031c6", "memory-x", "unstable-pac", "exti"] } |
| 12 | 12 | ||
| 13 | defmt = "0.3" | 13 | defmt = "0.3" |
diff --git a/examples/stm32f0/Cargo.toml b/examples/stm32f0/Cargo.toml index 8d2248ed0..b7b5eaa99 100644 --- a/examples/stm32f0/Cargo.toml +++ b/examples/stm32f0/Cargo.toml | |||
| @@ -14,6 +14,6 @@ defmt-rtt = "0.4" | |||
| 14 | panic-probe = "0.3" | 14 | panic-probe = "0.3" |
| 15 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 15 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 16 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } | 16 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } |
| 17 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | 17 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } |
| 18 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "memory-x", "stm32f091rc", "time-driver-any", "exti", "unstable-pac"] } | 18 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "memory-x", "stm32f091rc", "time-driver-any", "exti", "unstable-pac"] } |
| 19 | static_cell = { version = "1.1", features = ["nightly"]} | 19 | static_cell = { version = "1.1", features = ["nightly"]} |
diff --git a/examples/stm32f1/Cargo.toml b/examples/stm32f1/Cargo.toml index d34fd439a..29cad5b67 100644 --- a/examples/stm32f1/Cargo.toml +++ b/examples/stm32f1/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f103c8", "unstable-pac", "memory-x", "time-driver-any", "unstable-traits" ] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f103c8", "unstable-pac", "memory-x", "time-driver-any", "unstable-traits" ] } |
| 12 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | 12 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } |
| 13 | embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } | 13 | embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } |
diff --git a/examples/stm32f2/Cargo.toml b/examples/stm32f2/Cargo.toml index 5e3e0d0f7..652210c7f 100644 --- a/examples/stm32f2/Cargo.toml +++ b/examples/stm32f2/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f207zg", "unstable-pac", "memory-x", "time-driver-any", "exti"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f207zg", "unstable-pac", "memory-x", "time-driver-any", "exti"] } |
| 12 | 12 | ||
| 13 | defmt = "0.3" | 13 | defmt = "0.3" |
diff --git a/examples/stm32f3/Cargo.toml b/examples/stm32f3/Cargo.toml index 29ab2009c..489d0ff4c 100644 --- a/examples/stm32f3/Cargo.toml +++ b/examples/stm32f3/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f303ze", "unstable-pac", "memory-x", "time-driver-any", "exti"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f303ze", "unstable-pac", "memory-x", "time-driver-any", "exti"] } |
| 12 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | 12 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } |
| 13 | embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } | 13 | embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } |
diff --git a/examples/stm32f4/Cargo.toml b/examples/stm32f4/Cargo.toml index 7ecb64fce..c1c821364 100644 --- a/examples/stm32f4/Cargo.toml +++ b/examples/stm32f4/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers", "arch-cortex-m", "executor-thread", "executor-interrupt"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers", "arch-cortex-m", "executor-thread", "executor-interrupt"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "unstable-traits", "defmt", "stm32f429zi", "unstable-pac", "memory-x", "time-driver-any", "exti", "embedded-sdmmc", "chrono"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "unstable-traits", "defmt", "stm32f429zi", "unstable-pac", "memory-x", "time-driver-any", "exti", "embedded-sdmmc", "chrono"] } |
| 12 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | 12 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } |
| 13 | embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet", "nightly"] } | 13 | embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet", "nightly"] } |
diff --git a/examples/stm32f4/src/bin/can.rs b/examples/stm32f4/src/bin/can.rs index da8955053..08bed88db 100644 --- a/examples/stm32f4/src/bin/can.rs +++ b/examples/stm32f4/src/bin/can.rs | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | #![no_main] | 2 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 3 | #![feature(type_alias_impl_trait)] |
| 4 | 4 | ||
| 5 | use cortex_m_rt::entry; | ||
| 6 | use defmt::*; | 5 | use defmt::*; |
| 6 | use embassy_executor::Spawner; | ||
| 7 | use embassy_stm32::bind_interrupts; | 7 | use embassy_stm32::bind_interrupts; |
| 8 | use embassy_stm32::can::bxcan::filter::Mask32; | 8 | use embassy_stm32::can::bxcan::filter::Mask32; |
| 9 | use embassy_stm32::can::bxcan::{Fifo, Frame, StandardId}; | 9 | use embassy_stm32::can::bxcan::{Fifo, Frame, StandardId}; |
| @@ -19,8 +19,8 @@ bind_interrupts!(struct Irqs { | |||
| 19 | CAN1_TX => TxInterruptHandler<CAN1>; | 19 | CAN1_TX => TxInterruptHandler<CAN1>; |
| 20 | }); | 20 | }); |
| 21 | 21 | ||
| 22 | #[entry] | 22 | #[embassy_executor::main] |
| 23 | fn main() -> ! { | 23 | async fn main(_spawner: Spawner) { |
| 24 | info!("Hello World!"); | 24 | info!("Hello World!"); |
| 25 | 25 | ||
| 26 | let mut p = embassy_stm32::init(Default::default()); | 26 | let mut p = embassy_stm32::init(Default::default()); |
| @@ -34,9 +34,12 @@ fn main() -> ! { | |||
| 34 | 34 | ||
| 35 | let mut can = Can::new(p.CAN1, p.PA11, p.PA12, Irqs); | 35 | let mut can = Can::new(p.CAN1, p.PA11, p.PA12, Irqs); |
| 36 | 36 | ||
| 37 | can.modify_filters().enable_bank(0, Fifo::Fifo0, Mask32::accept_all()); | 37 | can.as_mut() |
| 38 | .modify_filters() | ||
| 39 | .enable_bank(0, Fifo::Fifo0, Mask32::accept_all()); | ||
| 38 | 40 | ||
| 39 | can.modify_config() | 41 | can.as_mut() |
| 42 | .modify_config() | ||
| 40 | .set_bit_timing(0x001c0003) // http://www.bittiming.can-wiki.info/ | 43 | .set_bit_timing(0x001c0003) // http://www.bittiming.can-wiki.info/ |
| 41 | .set_loopback(true) // Receive own frames | 44 | .set_loopback(true) // Receive own frames |
| 42 | .set_silent(true) | 45 | .set_silent(true) |
| @@ -45,9 +48,8 @@ fn main() -> ! { | |||
| 45 | let mut i: u8 = 0; | 48 | let mut i: u8 = 0; |
| 46 | loop { | 49 | loop { |
| 47 | let tx_frame = Frame::new_data(unwrap!(StandardId::new(i as _)), [i]); | 50 | let tx_frame = Frame::new_data(unwrap!(StandardId::new(i as _)), [i]); |
| 48 | unwrap!(nb::block!(can.transmit(&tx_frame))); | 51 | can.write(&tx_frame).await; |
| 49 | while !can.is_transmitter_idle() {} | 52 | let (_, rx_frame) = can.read().await.unwrap(); |
| 50 | let rx_frame = unwrap!(nb::block!(can.receive())); | ||
| 51 | info!("loopback frame {=u8}", unwrap!(rx_frame.data())[0]); | 53 | info!("loopback frame {=u8}", unwrap!(rx_frame.data())[0]); |
| 52 | i += 1; | 54 | i += 1; |
| 53 | } | 55 | } |
diff --git a/examples/stm32f4/src/bin/eth.rs b/examples/stm32f4/src/bin/eth.rs new file mode 100644 index 000000000..d0b164393 --- /dev/null +++ b/examples/stm32f4/src/bin/eth.rs | |||
| @@ -0,0 +1,111 @@ | |||
| 1 | #![no_std] | ||
| 2 | #![no_main] | ||
| 3 | #![feature(type_alias_impl_trait)] | ||
| 4 | |||
| 5 | use defmt::*; | ||
| 6 | use embassy_executor::Spawner; | ||
| 7 | use embassy_net::tcp::TcpSocket; | ||
| 8 | use embassy_net::{Ipv4Address, Stack, StackResources}; | ||
| 9 | use embassy_stm32::eth::generic_smi::GenericSMI; | ||
| 10 | use embassy_stm32::eth::{Ethernet, PacketQueue}; | ||
| 11 | use embassy_stm32::peripherals::ETH; | ||
| 12 | use embassy_stm32::rng::Rng; | ||
| 13 | use embassy_stm32::time::mhz; | ||
| 14 | use embassy_stm32::{bind_interrupts, eth, Config}; | ||
| 15 | use embassy_time::{Duration, Timer}; | ||
| 16 | use embedded_io::asynch::Write; | ||
| 17 | use static_cell::make_static; | ||
| 18 | use {defmt_rtt as _, panic_probe as _}; | ||
| 19 | bind_interrupts!(struct Irqs { | ||
| 20 | ETH => eth::InterruptHandler; | ||
| 21 | }); | ||
| 22 | |||
| 23 | type Device = Ethernet<'static, ETH, GenericSMI>; | ||
| 24 | |||
| 25 | #[embassy_executor::task] | ||
| 26 | async fn net_task(stack: &'static Stack<Device>) -> ! { | ||
| 27 | stack.run().await | ||
| 28 | } | ||
| 29 | |||
| 30 | #[embassy_executor::main] | ||
| 31 | async fn main(spawner: Spawner) -> ! { | ||
| 32 | let mut config = Config::default(); | ||
| 33 | config.rcc.sys_ck = Some(mhz(200)); | ||
| 34 | let p = embassy_stm32::init(config); | ||
| 35 | |||
| 36 | info!("Hello World!"); | ||
| 37 | |||
| 38 | // Generate random seed. | ||
| 39 | let mut rng = Rng::new(p.RNG); | ||
| 40 | let mut seed = [0; 8]; | ||
| 41 | let _ = rng.async_fill_bytes(&mut seed).await; | ||
| 42 | let seed = u64::from_le_bytes(seed); | ||
| 43 | |||
| 44 | let mac_addr = [0x00, 0x00, 0xDE, 0xAD, 0xBE, 0xEF]; | ||
| 45 | |||
| 46 | let device = Ethernet::new( | ||
| 47 | make_static!(PacketQueue::<16, 16>::new()), | ||
| 48 | p.ETH, | ||
| 49 | Irqs, | ||
| 50 | p.PA1, | ||
| 51 | p.PA2, | ||
| 52 | p.PC1, | ||
| 53 | p.PA7, | ||
| 54 | p.PC4, | ||
| 55 | p.PC5, | ||
| 56 | p.PG13, | ||
| 57 | p.PB13, | ||
| 58 | p.PG11, | ||
| 59 | GenericSMI::new(), | ||
| 60 | mac_addr, | ||
| 61 | 0, | ||
| 62 | ); | ||
| 63 | |||
| 64 | let config = embassy_net::Config::dhcpv4(Default::default()); | ||
| 65 | //let config = embassy_net::Config::ipv4_static(embassy_net::StaticConfigV4 { | ||
| 66 | // address: Ipv4Cidr::new(Ipv4Address::new(10, 42, 0, 61), 24), | ||
| 67 | // dns_servers: Vec::new(), | ||
| 68 | // gateway: Some(Ipv4Address::new(10, 42, 0, 1)), | ||
| 69 | //}); | ||
| 70 | |||
| 71 | // Init network stack | ||
| 72 | let stack = &*make_static!(Stack::new( | ||
| 73 | device, | ||
| 74 | config, | ||
| 75 | make_static!(StackResources::<2>::new()), | ||
| 76 | seed | ||
| 77 | )); | ||
| 78 | |||
| 79 | // Launch network task | ||
| 80 | unwrap!(spawner.spawn(net_task(&stack))); | ||
| 81 | |||
| 82 | info!("Network task initialized"); | ||
| 83 | |||
| 84 | // Then we can use it! | ||
| 85 | let mut rx_buffer = [0; 4096]; | ||
| 86 | let mut tx_buffer = [0; 4096]; | ||
| 87 | |||
| 88 | loop { | ||
| 89 | let mut socket = TcpSocket::new(&stack, &mut rx_buffer, &mut tx_buffer); | ||
| 90 | |||
| 91 | socket.set_timeout(Some(embassy_time::Duration::from_secs(10))); | ||
| 92 | |||
| 93 | let remote_endpoint = (Ipv4Address::new(10, 42, 0, 1), 8000); | ||
| 94 | info!("connecting..."); | ||
| 95 | let r = socket.connect(remote_endpoint).await; | ||
| 96 | if let Err(e) = r { | ||
| 97 | info!("connect error: {:?}", e); | ||
| 98 | continue; | ||
| 99 | } | ||
| 100 | info!("connected!"); | ||
| 101 | let buf = [0; 1024]; | ||
| 102 | loop { | ||
| 103 | let r = socket.write_all(&buf).await; | ||
| 104 | if let Err(e) = r { | ||
| 105 | info!("write error: {:?}", e); | ||
| 106 | continue; | ||
| 107 | } | ||
| 108 | Timer::after(Duration::from_secs(1)).await; | ||
| 109 | } | ||
| 110 | } | ||
| 111 | } | ||
diff --git a/examples/stm32f7/Cargo.toml b/examples/stm32f7/Cargo.toml index 657251c50..84d7b79c5 100644 --- a/examples/stm32f7/Cargo.toml +++ b/examples/stm32f7/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f767zi", "unstable-pac", "time-driver-any", "exti"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f767zi", "unstable-pac", "time-driver-any", "exti"] } |
| 12 | embassy-net = { path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet"] } | 12 | embassy-net = { path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet"] } |
| 13 | embedded-io = { version = "0.4.0", features = ["async"] } | 13 | embedded-io = { version = "0.4.0", features = ["async"] } |
diff --git a/examples/stm32f7/src/bin/can.rs b/examples/stm32f7/src/bin/can.rs new file mode 100644 index 000000000..1b5b377ea --- /dev/null +++ b/examples/stm32f7/src/bin/can.rs | |||
| @@ -0,0 +1,66 @@ | |||
| 1 | #![no_std] | ||
| 2 | #![no_main] | ||
| 3 | #![feature(type_alias_impl_trait)] | ||
| 4 | |||
| 5 | use defmt::*; | ||
| 6 | use embassy_executor::Spawner; | ||
| 7 | use embassy_stm32::bind_interrupts; | ||
| 8 | use embassy_stm32::can::bxcan::filter::Mask32; | ||
| 9 | use embassy_stm32::can::bxcan::{Fifo, Frame, StandardId}; | ||
| 10 | use embassy_stm32::can::{ | ||
| 11 | Can, CanTx, Rx0InterruptHandler, Rx1InterruptHandler, SceInterruptHandler, TxInterruptHandler, | ||
| 12 | }; | ||
| 13 | use embassy_stm32::gpio::{Input, Pull}; | ||
| 14 | use embassy_stm32::peripherals::CAN3; | ||
| 15 | use {defmt_rtt as _, panic_probe as _}; | ||
| 16 | |||
| 17 | bind_interrupts!(struct Irqs { | ||
| 18 | CAN3_RX0 => Rx0InterruptHandler<CAN3>; | ||
| 19 | CAN3_RX1 => Rx1InterruptHandler<CAN3>; | ||
| 20 | CAN3_SCE => SceInterruptHandler<CAN3>; | ||
| 21 | CAN3_TX => TxInterruptHandler<CAN3>; | ||
| 22 | }); | ||
| 23 | |||
| 24 | #[embassy_executor::task] | ||
| 25 | pub async fn send_can_message(tx: &'static mut CanTx<'static, 'static, CAN3>) { | ||
| 26 | loop { | ||
| 27 | let frame = Frame::new_data(unwrap!(StandardId::new(0 as _)), [0]); | ||
| 28 | tx.write(&frame).await; | ||
| 29 | embassy_time::Timer::after(embassy_time::Duration::from_secs(1)).await; | ||
| 30 | } | ||
| 31 | } | ||
| 32 | |||
| 33 | #[embassy_executor::main] | ||
| 34 | async fn main(spawner: Spawner) { | ||
| 35 | info!("Hello World!"); | ||
| 36 | |||
| 37 | let mut p = embassy_stm32::init(Default::default()); | ||
| 38 | |||
| 39 | // The next two lines are a workaround for testing without transceiver. | ||
| 40 | // To synchronise to the bus the RX input needs to see a high level. | ||
| 41 | // Use `mem::forget()` to release the borrow on the pin but keep the | ||
| 42 | // pull-up resistor enabled. | ||
| 43 | let rx_pin = Input::new(&mut p.PA15, Pull::Up); | ||
| 44 | core::mem::forget(rx_pin); | ||
| 45 | |||
| 46 | let can: &'static mut Can<'static, CAN3> = static_cell::make_static!(Can::new(p.CAN3, p.PA8, p.PA15, Irqs)); | ||
| 47 | can.as_mut() | ||
| 48 | .modify_filters() | ||
| 49 | .enable_bank(0, Fifo::Fifo0, Mask32::accept_all()); | ||
| 50 | |||
| 51 | can.as_mut() | ||
| 52 | .modify_config() | ||
| 53 | .set_bit_timing(0x001c0001) // http://www.bittiming.can-wiki.info/ | ||
| 54 | .set_loopback(true) | ||
| 55 | .enable(); | ||
| 56 | |||
| 57 | let (tx, mut rx) = can.split(); | ||
| 58 | |||
| 59 | let tx: &'static mut CanTx<'static, 'static, CAN3> = static_cell::make_static!(tx); | ||
| 60 | spawner.spawn(send_can_message(tx)).unwrap(); | ||
| 61 | |||
| 62 | loop { | ||
| 63 | let frame = rx.read().await.unwrap(); | ||
| 64 | println!("Received: {:?}", frame); | ||
| 65 | } | ||
| 66 | } | ||
diff --git a/examples/stm32f7/src/bin/eth.rs b/examples/stm32f7/src/bin/eth.rs index fde6a7576..c6b2ba45c 100644 --- a/examples/stm32f7/src/bin/eth.rs +++ b/examples/stm32f7/src/bin/eth.rs | |||
| @@ -57,7 +57,7 @@ async fn main(spawner: Spawner) -> ! { | |||
| 57 | p.PG13, | 57 | p.PG13, |
| 58 | p.PB13, | 58 | p.PB13, |
| 59 | p.PG11, | 59 | p.PG11, |
| 60 | GenericSMI, | 60 | GenericSMI::new(), |
| 61 | mac_addr, | 61 | mac_addr, |
| 62 | 0, | 62 | 0, |
| 63 | ); | 63 | ); |
diff --git a/examples/stm32g0/Cargo.toml b/examples/stm32g0/Cargo.toml index c5245757b..c88282d91 100644 --- a/examples/stm32g0/Cargo.toml +++ b/examples/stm32g0/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "time-driver-any", "stm32g071rb", "memory-x", "unstable-pac", "exti"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "time-driver-any", "stm32g071rb", "memory-x", "unstable-pac", "exti"] } |
| 12 | 12 | ||
| 13 | defmt = "0.3" | 13 | defmt = "0.3" |
diff --git a/examples/stm32g4/Cargo.toml b/examples/stm32g4/Cargo.toml index fbfbc6408..18bd03c39 100644 --- a/examples/stm32g4/Cargo.toml +++ b/examples/stm32g4/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "time-driver-any", "stm32g491re", "memory-x", "unstable-pac", "exti"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "time-driver-any", "stm32g491re", "memory-x", "unstable-pac", "exti"] } |
| 12 | embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" } | 12 | embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" } |
| 13 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | 13 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } |
diff --git a/examples/stm32h5/Cargo.toml b/examples/stm32h5/Cargo.toml index ebe511347..227bc28b4 100644 --- a/examples/stm32h5/Cargo.toml +++ b/examples/stm32h5/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32h563zi", "time-driver-any", "exti", "unstable-pac", "unstable-traits"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32h563zi", "time-driver-any", "exti", "unstable-pac", "unstable-traits"] } |
| 12 | embassy-net = { path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet", "unstable-traits", "proto-ipv6"] } | 12 | embassy-net = { path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet", "unstable-traits", "proto-ipv6"] } |
| 13 | embedded-io = { version = "0.4.0", features = ["async"] } | 13 | embedded-io = { version = "0.4.0", features = ["async"] } |
| @@ -19,8 +19,8 @@ defmt-rtt = "0.4" | |||
| 19 | cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } | 19 | cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } |
| 20 | cortex-m-rt = "0.7.0" | 20 | cortex-m-rt = "0.7.0" |
| 21 | embedded-hal = "0.2.6" | 21 | embedded-hal = "0.2.6" |
| 22 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.10" } | 22 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } |
| 23 | embedded-hal-async = { version = "=0.2.0-alpha.1" } | 23 | embedded-hal-async = { version = "=0.2.0-alpha.2" } |
| 24 | embedded-nal-async = "0.4.0" | 24 | embedded-nal-async = "0.4.0" |
| 25 | panic-probe = { version = "0.3", features = ["print-defmt"] } | 25 | panic-probe = { version = "0.3", features = ["print-defmt"] } |
| 26 | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | 26 | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } |
diff --git a/examples/stm32h5/src/bin/eth.rs b/examples/stm32h5/src/bin/eth.rs index 78c8282a6..0bff85ed8 100644 --- a/examples/stm32h5/src/bin/eth.rs +++ b/examples/stm32h5/src/bin/eth.rs | |||
| @@ -76,7 +76,7 @@ async fn main(spawner: Spawner) -> ! { | |||
| 76 | p.PG13, | 76 | p.PG13, |
| 77 | p.PB15, | 77 | p.PB15, |
| 78 | p.PG11, | 78 | p.PG11, |
| 79 | GenericSMI, | 79 | GenericSMI::new(), |
| 80 | mac_addr, | 80 | mac_addr, |
| 81 | 0, | 81 | 0, |
| 82 | ); | 82 | ); |
diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml index 62ef5e9e4..768702fa9 100644 --- a/examples/stm32h7/Cargo.toml +++ b/examples/stm32h7/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32h743bi", "time-driver-any", "exti", "unstable-pac", "unstable-traits"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32h743bi", "time-driver-any", "exti", "unstable-pac", "unstable-traits"] } |
| 12 | embassy-net = { path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet", "unstable-traits", "proto-ipv6"] } | 12 | embassy-net = { path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet", "unstable-traits", "proto-ipv6"] } |
| 13 | embedded-io = { version = "0.4.0", features = ["async"] } | 13 | embedded-io = { version = "0.4.0", features = ["async"] } |
| @@ -19,8 +19,8 @@ defmt-rtt = "0.4" | |||
| 19 | cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } | 19 | cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } |
| 20 | cortex-m-rt = "0.7.0" | 20 | cortex-m-rt = "0.7.0" |
| 21 | embedded-hal = "0.2.6" | 21 | embedded-hal = "0.2.6" |
| 22 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.10" } | 22 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } |
| 23 | embedded-hal-async = { version = "=0.2.0-alpha.1" } | 23 | embedded-hal-async = { version = "=0.2.0-alpha.2" } |
| 24 | embedded-nal-async = "0.4.0" | 24 | embedded-nal-async = "0.4.0" |
| 25 | panic-probe = { version = "0.3", features = ["print-defmt"] } | 25 | panic-probe = { version = "0.3", features = ["print-defmt"] } |
| 26 | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | 26 | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } |
diff --git a/examples/stm32h7/src/bin/eth.rs b/examples/stm32h7/src/bin/eth.rs index 12d37f7a4..cfafcaed1 100644 --- a/examples/stm32h7/src/bin/eth.rs +++ b/examples/stm32h7/src/bin/eth.rs | |||
| @@ -58,7 +58,7 @@ async fn main(spawner: Spawner) -> ! { | |||
| 58 | p.PG13, | 58 | p.PG13, |
| 59 | p.PB13, | 59 | p.PB13, |
| 60 | p.PG11, | 60 | p.PG11, |
| 61 | GenericSMI, | 61 | GenericSMI::new(), |
| 62 | mac_addr, | 62 | mac_addr, |
| 63 | 0, | 63 | 0, |
| 64 | ); | 64 | ); |
diff --git a/examples/stm32h7/src/bin/eth_client.rs b/examples/stm32h7/src/bin/eth_client.rs index 6078fc3fe..4ed737578 100644 --- a/examples/stm32h7/src/bin/eth_client.rs +++ b/examples/stm32h7/src/bin/eth_client.rs | |||
| @@ -59,7 +59,7 @@ async fn main(spawner: Spawner) -> ! { | |||
| 59 | p.PG13, | 59 | p.PG13, |
| 60 | p.PB13, | 60 | p.PB13, |
| 61 | p.PG11, | 61 | p.PG11, |
| 62 | GenericSMI, | 62 | GenericSMI::new(), |
| 63 | mac_addr, | 63 | mac_addr, |
| 64 | 0, | 64 | 0, |
| 65 | ); | 65 | ); |
diff --git a/examples/stm32l0/Cargo.toml b/examples/stm32l0/Cargo.toml index 2ead714e4..747cec7bf 100644 --- a/examples/stm32l0/Cargo.toml +++ b/examples/stm32l0/Cargo.toml | |||
| @@ -12,7 +12,7 @@ nightly = ["embassy-stm32/nightly", "embassy-time/nightly", "embassy-time/unstab | |||
| 12 | [dependencies] | 12 | [dependencies] |
| 13 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 13 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 14 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | 14 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } |
| 15 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | 15 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } |
| 16 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32l072cz", "time-driver-any", "exti", "unstable-traits", "memory-x"] } | 16 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32l072cz", "time-driver-any", "exti", "unstable-traits", "memory-x"] } |
| 17 | embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["time", "defmt"], optional = true } | 17 | embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["time", "defmt"], optional = true } |
| 18 | lora-phy = { version = "1", optional = true } | 18 | lora-phy = { version = "1", optional = true } |
| @@ -32,3 +32,6 @@ futures = { version = "0.3.17", default-features = false, features = ["async-awa | |||
| 32 | heapless = { version = "0.7.5", default-features = false } | 32 | heapless = { version = "0.7.5", default-features = false } |
| 33 | embedded-hal = "0.2.6" | 33 | embedded-hal = "0.2.6" |
| 34 | static_cell = "1.1" | 34 | static_cell = "1.1" |
| 35 | |||
| 36 | [patch.crates-io] | ||
| 37 | lora-phy = { git = "https://github.com/embassy-rs/lora-phy", rev = "ad289428fd44b02788e2fa2116445cc8f640a265" } | ||
diff --git a/examples/stm32l1/Cargo.toml b/examples/stm32l1/Cargo.toml index 93d48abeb..dcca1cc3d 100644 --- a/examples/stm32l1/Cargo.toml +++ b/examples/stm32l1/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32l151cb-a", "time-driver-any", "memory-x"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32l151cb-a", "time-driver-any", "memory-x"] } |
| 12 | 12 | ||
| 13 | defmt = "0.3" | 13 | defmt = "0.3" |
diff --git a/examples/stm32l4/Cargo.toml b/examples/stm32l4/Cargo.toml index 3bb473ef5..c55558518 100644 --- a/examples/stm32l4/Cargo.toml +++ b/examples/stm32l4/Cargo.toml | |||
| @@ -7,9 +7,9 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } |
| 11 | embassy-embedded-hal = { version = "0.1.0", path = "../../embassy-embedded-hal" } | 11 | embassy-embedded-hal = { version = "0.1.0", path = "../../embassy-embedded-hal" } |
| 12 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "unstable-pac", "stm32l4s5vi", "time-driver-any", "exti", "unstable-traits"] } | 12 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "unstable-pac", "stm32l4s5vi", "time-driver-any", "exti", "unstable-traits", "chrono"] } |
| 13 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | 13 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } |
| 14 | 14 | ||
| 15 | defmt = "0.3" | 15 | defmt = "0.3" |
| @@ -18,10 +18,11 @@ defmt-rtt = "0.4" | |||
| 18 | cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] } | 18 | cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] } |
| 19 | cortex-m-rt = "0.7.0" | 19 | cortex-m-rt = "0.7.0" |
| 20 | embedded-hal = "0.2.6" | 20 | embedded-hal = "0.2.6" |
| 21 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.10" } | 21 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } |
| 22 | embedded-hal-async = { version = "=0.2.0-alpha.1" } | 22 | embedded-hal-async = { version = "=0.2.0-alpha.2" } |
| 23 | panic-probe = { version = "0.3", features = ["print-defmt"] } | 23 | panic-probe = { version = "0.3", features = ["print-defmt"] } |
| 24 | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | 24 | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } |
| 25 | heapless = { version = "0.7.5", default-features = false } | 25 | heapless = { version = "0.7.5", default-features = false } |
| 26 | chrono = { version = "^0.4", default-features = false } | ||
| 26 | 27 | ||
| 27 | micromath = "2.0.0" | 28 | micromath = "2.0.0" |
diff --git a/examples/stm32l4/src/bin/rtc.rs b/examples/stm32l4/src/bin/rtc.rs new file mode 100644 index 000000000..d72d5ddb6 --- /dev/null +++ b/examples/stm32l4/src/bin/rtc.rs | |||
| @@ -0,0 +1,49 @@ | |||
| 1 | #![no_std] | ||
| 2 | #![no_main] | ||
| 3 | #![feature(type_alias_impl_trait)] | ||
| 4 | |||
| 5 | use chrono::{NaiveDate, NaiveDateTime}; | ||
| 6 | use defmt::*; | ||
| 7 | use embassy_executor::Spawner; | ||
| 8 | use embassy_stm32::rcc::{self, ClockSrc, PLLClkDiv, PLLMul, PLLSource, PLLSrcDiv}; | ||
| 9 | use embassy_stm32::rtc::{Rtc, RtcConfig}; | ||
| 10 | use embassy_stm32::time::Hertz; | ||
| 11 | use embassy_stm32::Config; | ||
| 12 | use embassy_time::{Duration, Timer}; | ||
| 13 | use {defmt_rtt as _, panic_probe as _}; | ||
| 14 | |||
| 15 | #[embassy_executor::main] | ||
| 16 | async fn main(_spawner: Spawner) { | ||
| 17 | let p = { | ||
| 18 | let mut config = Config::default(); | ||
| 19 | config.rcc.mux = ClockSrc::PLL( | ||
| 20 | PLLSource::HSE(Hertz::mhz(8)), | ||
| 21 | PLLClkDiv::Div2, | ||
| 22 | PLLSrcDiv::Div1, | ||
| 23 | PLLMul::Mul20, | ||
| 24 | None, | ||
| 25 | ); | ||
| 26 | config.rcc.rtc_mux = rcc::RtcClockSource::LSE32; | ||
| 27 | embassy_stm32::init(config) | ||
| 28 | }; | ||
| 29 | info!("Hello World!"); | ||
| 30 | |||
| 31 | let now = NaiveDate::from_ymd_opt(2020, 5, 15) | ||
| 32 | .unwrap() | ||
| 33 | .and_hms_opt(10, 30, 15) | ||
| 34 | .unwrap(); | ||
| 35 | |||
| 36 | let mut rtc = Rtc::new( | ||
| 37 | p.RTC, | ||
| 38 | RtcConfig::default().clock_config(embassy_stm32::rtc::RtcClockSource::LSE), | ||
| 39 | ); | ||
| 40 | info!("Got RTC! {:?}", now.timestamp()); | ||
| 41 | |||
| 42 | rtc.set_datetime(now.into()).expect("datetime not set"); | ||
| 43 | |||
| 44 | // In reality the delay would be much longer | ||
| 45 | Timer::after(Duration::from_millis(20000)).await; | ||
| 46 | |||
| 47 | let then: NaiveDateTime = rtc.now().unwrap().into(); | ||
| 48 | info!("Got RTC! {:?}", then.timestamp()); | ||
| 49 | } | ||
diff --git a/examples/stm32l5/Cargo.toml b/examples/stm32l5/Cargo.toml index 6035c291f..54911482e 100644 --- a/examples/stm32l5/Cargo.toml +++ b/examples/stm32l5/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "unstable-pac", "stm32l552ze", "time-driver-any", "exti", "unstable-traits", "memory-x"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "unstable-pac", "stm32l552ze", "time-driver-any", "exti", "unstable-traits", "memory-x"] } |
| 12 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | 12 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } |
| 13 | embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet"] } | 13 | embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet"] } |
diff --git a/examples/stm32u5/Cargo.toml b/examples/stm32u5/Cargo.toml index e2318c3d6..835e32940 100644 --- a/examples/stm32u5/Cargo.toml +++ b/examples/stm32u5/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "unstable-pac", "stm32u585ai", "time-driver-any", "memory-x" ] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "unstable-pac", "stm32u585ai", "time-driver-any", "memory-x" ] } |
| 12 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | 12 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } |
| 13 | 13 | ||
diff --git a/examples/stm32wb/.cargo/config.toml b/examples/stm32wb/.cargo/config.toml index 8b6d6d754..51c499ee7 100644 --- a/examples/stm32wb/.cargo/config.toml +++ b/examples/stm32wb/.cargo/config.toml | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | [target.'cfg(all(target_arch = "arm", target_os = "none"))'] | 1 | [target.'cfg(all(target_arch = "arm", target_os = "none"))'] |
| 2 | # replace STM32WB55CCUx with your chip as listed in `probe-rs chip list` | 2 | # replace STM32WB55CCUx with your chip as listed in `probe-rs chip list` |
| 3 | # runner = "probe-rs run --chip STM32WB55RGVx --speed 1000 --connect-under-reset" | 3 | # runner = "probe-run --chip STM32WB55RGVx --speed 1000 --connect-under-reset" |
| 4 | runner = "teleprobe local run --chip STM32WB55RG --elf" | 4 | runner = "teleprobe local run --chip STM32WB55RG --elf" |
| 5 | 5 | ||
| 6 | [build] | 6 | [build] |
diff --git a/examples/stm32wb/Cargo.toml b/examples/stm32wb/Cargo.toml index fbb2d918b..becf2d3fb 100644 --- a/examples/stm32wb/Cargo.toml +++ b/examples/stm32wb/Cargo.toml | |||
| @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32wb55rg", "time-driver-any", "memory-x", "exti"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32wb55rg", "time-driver-any", "memory-x", "exti"] } |
| 12 | embassy-stm32-wpan = { version = "0.1.0", path = "../../embassy-stm32-wpan", features = ["defmt", "stm32wb55rg"] } | 12 | embassy-stm32-wpan = { version = "0.1.0", path = "../../embassy-stm32-wpan", features = ["defmt", "stm32wb55rg"] } |
| 13 | 13 | ||
| @@ -23,7 +23,7 @@ heapless = { version = "0.7.5", default-features = false } | |||
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | [features] | 25 | [features] |
| 26 | default = ["ble"] | 26 | default = ["ble", "mac"] |
| 27 | mac = ["embassy-stm32-wpan/mac"] | 27 | mac = ["embassy-stm32-wpan/mac"] |
| 28 | ble = ["embassy-stm32-wpan/ble"] | 28 | ble = ["embassy-stm32-wpan/ble"] |
| 29 | 29 | ||
| @@ -36,8 +36,13 @@ name = "tl_mbox_mac" | |||
| 36 | required-features = ["mac"] | 36 | required-features = ["mac"] |
| 37 | 37 | ||
| 38 | [[bin]] | 38 | [[bin]] |
| 39 | name = "mac_ffd" | ||
| 40 | required-features = ["mac"] | ||
| 41 | |||
| 42 | [[bin]] | ||
| 39 | name = "eddystone_beacon" | 43 | name = "eddystone_beacon" |
| 40 | required-features = ["ble"] | 44 | required-features = ["ble"] |
| 41 | 45 | ||
| 42 | [patch.crates-io] | 46 | [[bin]] |
| 43 | stm32wb-hci = { git = "https://github.com/OueslatiGhaith/stm32wb-hci", rev = "9f663be"} \ No newline at end of file | 47 | name = "gatt_server" |
| 48 | required-features = ["ble"] \ No newline at end of file | ||
diff --git a/examples/stm32wb/src/bin/eddystone_beacon.rs b/examples/stm32wb/src/bin/eddystone_beacon.rs index b99f8cb2e..451bd7d29 100644 --- a/examples/stm32wb/src/bin/eddystone_beacon.rs +++ b/examples/stm32wb/src/bin/eddystone_beacon.rs | |||
| @@ -63,7 +63,7 @@ async fn main(_spawner: Spawner) { | |||
| 63 | let sys_event = mbox.sys_subsystem.read().await; | 63 | let sys_event = mbox.sys_subsystem.read().await; |
| 64 | info!("sys event: {}", sys_event.payload()); | 64 | info!("sys event: {}", sys_event.payload()); |
| 65 | 65 | ||
| 66 | mbox.sys_subsystem.shci_c2_ble_init(Default::default()).await; | 66 | let _ = mbox.sys_subsystem.shci_c2_ble_init(Default::default()).await; |
| 67 | 67 | ||
| 68 | info!("resetting BLE..."); | 68 | info!("resetting BLE..."); |
| 69 | mbox.ble_subsystem.reset().await; | 69 | mbox.ble_subsystem.reset().await; |
diff --git a/examples/stm32wb/src/bin/gatt_server.rs b/examples/stm32wb/src/bin/gatt_server.rs new file mode 100644 index 000000000..0f6419d45 --- /dev/null +++ b/examples/stm32wb/src/bin/gatt_server.rs | |||
| @@ -0,0 +1,397 @@ | |||
| 1 | #![no_std] | ||
| 2 | #![no_main] | ||
| 3 | #![feature(type_alias_impl_trait)] | ||
| 4 | |||
| 5 | use core::time::Duration; | ||
| 6 | |||
| 7 | use defmt::*; | ||
| 8 | use embassy_executor::Spawner; | ||
| 9 | use embassy_stm32::bind_interrupts; | ||
| 10 | use embassy_stm32::ipcc::{Config, ReceiveInterruptHandler, TransmitInterruptHandler}; | ||
| 11 | use embassy_stm32_wpan::hci::event::command::{CommandComplete, ReturnParameters}; | ||
| 12 | use embassy_stm32_wpan::hci::host::uart::{Packet, UartHci}; | ||
| 13 | use embassy_stm32_wpan::hci::host::{AdvertisingFilterPolicy, EncryptionKey, HostHci, OwnAddressType}; | ||
| 14 | use embassy_stm32_wpan::hci::types::AdvertisingType; | ||
| 15 | use embassy_stm32_wpan::hci::vendor::stm32wb::command::gap::{ | ||
| 16 | AddressType, AuthenticationRequirements, DiscoverableParameters, GapCommands, IoCapability, LocalName, Pin, Role, | ||
| 17 | SecureConnectionSupport, | ||
| 18 | }; | ||
| 19 | use embassy_stm32_wpan::hci::vendor::stm32wb::command::gatt::{ | ||
| 20 | AddCharacteristicParameters, AddServiceParameters, CharacteristicEvent, CharacteristicPermission, | ||
| 21 | CharacteristicProperty, EncryptionKeySize, GattCommands, ServiceType, UpdateCharacteristicValueParameters, Uuid, | ||
| 22 | WriteResponseParameters, | ||
| 23 | }; | ||
| 24 | use embassy_stm32_wpan::hci::vendor::stm32wb::command::hal::{ConfigData, HalCommands, PowerLevel}; | ||
| 25 | use embassy_stm32_wpan::hci::vendor::stm32wb::event::{self, AttributeHandle, Stm32Wb5xEvent}; | ||
| 26 | use embassy_stm32_wpan::hci::{BdAddr, Event}; | ||
| 27 | use embassy_stm32_wpan::lhci::LhciC1DeviceInformationCcrp; | ||
| 28 | use embassy_stm32_wpan::sub::ble::Ble; | ||
| 29 | use embassy_stm32_wpan::TlMbox; | ||
| 30 | use {defmt_rtt as _, panic_probe as _}; | ||
| 31 | |||
| 32 | bind_interrupts!(struct Irqs{ | ||
| 33 | IPCC_C1_RX => ReceiveInterruptHandler; | ||
| 34 | IPCC_C1_TX => TransmitInterruptHandler; | ||
| 35 | }); | ||
| 36 | |||
| 37 | const BLE_GAP_DEVICE_NAME_LENGTH: u8 = 7; | ||
| 38 | |||
| 39 | #[embassy_executor::main] | ||
| 40 | async fn main(_spawner: Spawner) { | ||
| 41 | /* | ||
| 42 | How to make this work: | ||
| 43 | |||
| 44 | - Obtain a NUCLEO-STM32WB55 from your preferred supplier. | ||
| 45 | - Download and Install STM32CubeProgrammer. | ||
| 46 | - Download stm32wb5x_FUS_fw.bin, stm32wb5x_BLE_Stack_full_fw.bin, and Release_Notes.html from | ||
| 47 | gh:STMicroelectronics/STM32CubeWB@2234d97/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x | ||
| 48 | - Open STM32CubeProgrammer | ||
| 49 | - On the right-hand pane, click "firmware upgrade" to upgrade the st-link firmware. | ||
| 50 | - Once complete, click connect to connect to the device. | ||
| 51 | - On the left hand pane, click the RSS signal icon to open "Firmware Upgrade Services". | ||
| 52 | - In the Release_Notes.html, find the memory address that corresponds to your device for the stm32wb5x_FUS_fw.bin file | ||
| 53 | - Select that file, the memory address, "verify download", and then "Firmware Upgrade". | ||
| 54 | - Once complete, in the Release_Notes.html, find the memory address that corresponds to your device for the | ||
| 55 | stm32wb5x_BLE_Stack_full_fw.bin file. It should not be the same memory address. | ||
| 56 | - Select that file, the memory address, "verify download", and then "Firmware Upgrade". | ||
| 57 | - Select "Start Wireless Stack". | ||
| 58 | - Disconnect from the device. | ||
| 59 | - In the examples folder for stm32wb, modify the memory.x file to match your target device. | ||
| 60 | - Run this example. | ||
| 61 | |||
| 62 | Note: extended stack versions are not supported at this time. Do not attempt to install a stack with "extended" in the name. | ||
| 63 | */ | ||
| 64 | |||
| 65 | let p = embassy_stm32::init(Default::default()); | ||
| 66 | info!("Hello World!"); | ||
| 67 | |||
| 68 | let config = Config::default(); | ||
| 69 | let mut mbox = TlMbox::init(p.IPCC, Irqs, config); | ||
| 70 | |||
| 71 | let sys_event = mbox.sys_subsystem.read().await; | ||
| 72 | info!("sys event: {}", sys_event.payload()); | ||
| 73 | |||
| 74 | let _ = mbox.sys_subsystem.shci_c2_ble_init(Default::default()).await; | ||
| 75 | |||
| 76 | info!("resetting BLE..."); | ||
| 77 | mbox.ble_subsystem.reset().await; | ||
| 78 | let response = mbox.ble_subsystem.read().await; | ||
| 79 | defmt::debug!("{}", response); | ||
| 80 | |||
| 81 | info!("config public address..."); | ||
| 82 | mbox.ble_subsystem | ||
| 83 | .write_config_data(&ConfigData::public_address(get_bd_addr()).build()) | ||
| 84 | .await; | ||
| 85 | let response = mbox.ble_subsystem.read().await; | ||
| 86 | defmt::debug!("{}", response); | ||
| 87 | |||
| 88 | info!("config random address..."); | ||
| 89 | mbox.ble_subsystem | ||
| 90 | .write_config_data(&ConfigData::random_address(get_random_addr()).build()) | ||
| 91 | .await; | ||
| 92 | let response = mbox.ble_subsystem.read().await; | ||
| 93 | defmt::debug!("{}", response); | ||
| 94 | |||
| 95 | info!("config identity root..."); | ||
| 96 | mbox.ble_subsystem | ||
| 97 | .write_config_data(&ConfigData::identity_root(&get_irk()).build()) | ||
| 98 | .await; | ||
| 99 | let response = mbox.ble_subsystem.read().await; | ||
| 100 | defmt::debug!("{}", response); | ||
| 101 | |||
| 102 | info!("config encryption root..."); | ||
| 103 | mbox.ble_subsystem | ||
| 104 | .write_config_data(&ConfigData::encryption_root(&get_erk()).build()) | ||
| 105 | .await; | ||
| 106 | let response = mbox.ble_subsystem.read().await; | ||
| 107 | defmt::debug!("{}", response); | ||
| 108 | |||
| 109 | info!("config tx power level..."); | ||
| 110 | mbox.ble_subsystem.set_tx_power_level(PowerLevel::ZerodBm).await; | ||
| 111 | let response = mbox.ble_subsystem.read().await; | ||
| 112 | defmt::debug!("{}", response); | ||
| 113 | |||
| 114 | info!("GATT init..."); | ||
| 115 | mbox.ble_subsystem.init_gatt().await; | ||
| 116 | let response = mbox.ble_subsystem.read().await; | ||
| 117 | defmt::debug!("{}", response); | ||
| 118 | |||
| 119 | info!("GAP init..."); | ||
| 120 | mbox.ble_subsystem | ||
| 121 | .init_gap(Role::PERIPHERAL, false, BLE_GAP_DEVICE_NAME_LENGTH) | ||
| 122 | .await; | ||
| 123 | let response = mbox.ble_subsystem.read().await; | ||
| 124 | defmt::debug!("{}", response); | ||
| 125 | |||
| 126 | info!("set IO capabilities..."); | ||
| 127 | mbox.ble_subsystem.set_io_capability(IoCapability::DisplayConfirm).await; | ||
| 128 | let response = mbox.ble_subsystem.read().await; | ||
| 129 | defmt::debug!("{}", response); | ||
| 130 | |||
| 131 | info!("set authentication requirements..."); | ||
| 132 | mbox.ble_subsystem | ||
| 133 | .set_authentication_requirement(&AuthenticationRequirements { | ||
| 134 | bonding_required: false, | ||
| 135 | keypress_notification_support: false, | ||
| 136 | mitm_protection_required: false, | ||
| 137 | encryption_key_size_range: (8, 16), | ||
| 138 | fixed_pin: Pin::Requested, | ||
| 139 | identity_address_type: AddressType::Public, | ||
| 140 | secure_connection_support: SecureConnectionSupport::Optional, | ||
| 141 | }) | ||
| 142 | .await | ||
| 143 | .unwrap(); | ||
| 144 | let response = mbox.ble_subsystem.read().await; | ||
| 145 | defmt::debug!("{}", response); | ||
| 146 | |||
| 147 | info!("set scan response data..."); | ||
| 148 | mbox.ble_subsystem.le_set_scan_response_data(b"TXTX").await.unwrap(); | ||
| 149 | let response = mbox.ble_subsystem.read().await; | ||
| 150 | defmt::debug!("{}", response); | ||
| 151 | |||
| 152 | info!("set scan response data..."); | ||
| 153 | mbox.ble_subsystem.le_set_scan_response_data(b"TXTX").await.unwrap(); | ||
| 154 | let response = mbox.ble_subsystem.read().await; | ||
| 155 | defmt::debug!("{}", response); | ||
| 156 | |||
| 157 | defmt::info!("initializing services and characteristics..."); | ||
| 158 | let mut ble_context = init_gatt_services(&mut mbox.ble_subsystem).await.unwrap(); | ||
| 159 | defmt::info!("{}", ble_context); | ||
| 160 | |||
| 161 | let discovery_params = DiscoverableParameters { | ||
| 162 | advertising_type: AdvertisingType::ConnectableUndirected, | ||
| 163 | advertising_interval: Some((Duration::from_millis(100), Duration::from_millis(100))), | ||
| 164 | address_type: OwnAddressType::Public, | ||
| 165 | filter_policy: AdvertisingFilterPolicy::AllowConnectionAndScan, | ||
| 166 | local_name: Some(LocalName::Complete(b"TXTX")), | ||
| 167 | advertising_data: &[], | ||
| 168 | conn_interval: (None, None), | ||
| 169 | }; | ||
| 170 | |||
| 171 | info!("set discoverable..."); | ||
| 172 | mbox.ble_subsystem.set_discoverable(&discovery_params).await.unwrap(); | ||
| 173 | let response = mbox.ble_subsystem.read().await; | ||
| 174 | defmt::debug!("{}", response); | ||
| 175 | |||
| 176 | loop { | ||
| 177 | let response = mbox.ble_subsystem.read().await; | ||
| 178 | defmt::debug!("{}", response); | ||
| 179 | |||
| 180 | if let Ok(Packet::Event(event)) = response { | ||
| 181 | match event { | ||
| 182 | Event::LeConnectionComplete(_) => { | ||
| 183 | defmt::info!("connected"); | ||
| 184 | } | ||
| 185 | Event::DisconnectionComplete(_) => { | ||
| 186 | defmt::info!("disconnected"); | ||
| 187 | ble_context.is_subscribed = false; | ||
| 188 | mbox.ble_subsystem.set_discoverable(&discovery_params).await.unwrap(); | ||
| 189 | } | ||
| 190 | Event::Vendor(vendor_event) => match vendor_event { | ||
| 191 | Stm32Wb5xEvent::AttReadPermitRequest(read_req) => { | ||
| 192 | defmt::info!("read request received {}, allowing", read_req); | ||
| 193 | mbox.ble_subsystem.allow_read(read_req.conn_handle).await | ||
| 194 | } | ||
| 195 | Stm32Wb5xEvent::AttWritePermitRequest(write_req) => { | ||
| 196 | defmt::info!("write request received {}, allowing", write_req); | ||
| 197 | mbox.ble_subsystem | ||
| 198 | .write_response(&WriteResponseParameters { | ||
| 199 | conn_handle: write_req.conn_handle, | ||
| 200 | attribute_handle: write_req.attribute_handle, | ||
| 201 | status: Ok(()), | ||
| 202 | value: write_req.value(), | ||
| 203 | }) | ||
| 204 | .await | ||
| 205 | .unwrap() | ||
| 206 | } | ||
| 207 | Stm32Wb5xEvent::GattAttributeModified(attribute) => { | ||
| 208 | defmt::info!("{}", ble_context); | ||
| 209 | if attribute.attr_handle.0 == ble_context.chars.notify.0 + 2 { | ||
| 210 | if attribute.data()[0] == 0x01 { | ||
| 211 | defmt::info!("subscribed"); | ||
| 212 | ble_context.is_subscribed = true; | ||
| 213 | } else { | ||
| 214 | defmt::info!("unsubscribed"); | ||
| 215 | ble_context.is_subscribed = false; | ||
| 216 | } | ||
| 217 | } | ||
| 218 | } | ||
| 219 | _ => {} | ||
| 220 | }, | ||
| 221 | _ => {} | ||
| 222 | } | ||
| 223 | } | ||
| 224 | } | ||
| 225 | } | ||
| 226 | |||
| 227 | fn get_bd_addr() -> BdAddr { | ||
| 228 | let mut bytes = [0u8; 6]; | ||
| 229 | |||
| 230 | let lhci_info = LhciC1DeviceInformationCcrp::new(); | ||
| 231 | bytes[0] = (lhci_info.uid64 & 0xff) as u8; | ||
| 232 | bytes[1] = ((lhci_info.uid64 >> 8) & 0xff) as u8; | ||
| 233 | bytes[2] = ((lhci_info.uid64 >> 16) & 0xff) as u8; | ||
| 234 | bytes[3] = lhci_info.device_type_id; | ||
| 235 | bytes[4] = (lhci_info.st_company_id & 0xff) as u8; | ||
| 236 | bytes[5] = (lhci_info.st_company_id >> 8 & 0xff) as u8; | ||
| 237 | |||
| 238 | BdAddr(bytes) | ||
| 239 | } | ||
| 240 | |||
| 241 | fn get_random_addr() -> BdAddr { | ||
| 242 | let mut bytes = [0u8; 6]; | ||
| 243 | |||
| 244 | let lhci_info = LhciC1DeviceInformationCcrp::new(); | ||
| 245 | bytes[0] = (lhci_info.uid64 & 0xff) as u8; | ||
| 246 | bytes[1] = ((lhci_info.uid64 >> 8) & 0xff) as u8; | ||
| 247 | bytes[2] = ((lhci_info.uid64 >> 16) & 0xff) as u8; | ||
| 248 | bytes[3] = 0; | ||
| 249 | bytes[4] = 0x6E; | ||
| 250 | bytes[5] = 0xED; | ||
| 251 | |||
| 252 | BdAddr(bytes) | ||
| 253 | } | ||
| 254 | |||
| 255 | const BLE_CFG_IRK: [u8; 16] = [ | ||
| 256 | 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, | ||
| 257 | ]; | ||
| 258 | const BLE_CFG_ERK: [u8; 16] = [ | ||
| 259 | 0xfe, 0xdc, 0xba, 0x09, 0x87, 0x65, 0x43, 0x21, 0xfe, 0xdc, 0xba, 0x09, 0x87, 0x65, 0x43, 0x21, | ||
| 260 | ]; | ||
| 261 | |||
| 262 | fn get_irk() -> EncryptionKey { | ||
| 263 | EncryptionKey(BLE_CFG_IRK) | ||
| 264 | } | ||
| 265 | |||
| 266 | fn get_erk() -> EncryptionKey { | ||
| 267 | EncryptionKey(BLE_CFG_ERK) | ||
| 268 | } | ||
| 269 | |||
| 270 | #[derive(defmt::Format)] | ||
| 271 | pub struct BleContext { | ||
| 272 | pub service_handle: AttributeHandle, | ||
| 273 | pub chars: CharHandles, | ||
| 274 | pub is_subscribed: bool, | ||
| 275 | } | ||
| 276 | |||
| 277 | #[derive(defmt::Format)] | ||
| 278 | pub struct CharHandles { | ||
| 279 | pub read: AttributeHandle, | ||
| 280 | pub write: AttributeHandle, | ||
| 281 | pub notify: AttributeHandle, | ||
| 282 | } | ||
| 283 | |||
| 284 | pub async fn init_gatt_services(ble_subsystem: &mut Ble) -> Result<BleContext, ()> { | ||
| 285 | let service_handle = gatt_add_service(ble_subsystem, Uuid::Uuid16(0x500)).await?; | ||
| 286 | |||
| 287 | let read = gatt_add_char( | ||
| 288 | ble_subsystem, | ||
| 289 | service_handle, | ||
| 290 | Uuid::Uuid16(0x501), | ||
| 291 | CharacteristicProperty::READ, | ||
| 292 | Some(b"Hello from embassy!"), | ||
| 293 | ) | ||
| 294 | .await?; | ||
| 295 | |||
| 296 | let write = gatt_add_char( | ||
| 297 | ble_subsystem, | ||
| 298 | service_handle, | ||
| 299 | Uuid::Uuid16(0x502), | ||
| 300 | CharacteristicProperty::WRITE_WITHOUT_RESPONSE | CharacteristicProperty::WRITE | CharacteristicProperty::READ, | ||
| 301 | None, | ||
| 302 | ) | ||
| 303 | .await?; | ||
| 304 | |||
| 305 | let notify = gatt_add_char( | ||
| 306 | ble_subsystem, | ||
| 307 | service_handle, | ||
| 308 | Uuid::Uuid16(0x503), | ||
| 309 | CharacteristicProperty::NOTIFY | CharacteristicProperty::READ, | ||
| 310 | None, | ||
| 311 | ) | ||
| 312 | .await?; | ||
| 313 | |||
| 314 | Ok(BleContext { | ||
| 315 | service_handle, | ||
| 316 | is_subscribed: false, | ||
| 317 | chars: CharHandles { read, write, notify }, | ||
| 318 | }) | ||
| 319 | } | ||
| 320 | |||
| 321 | async fn gatt_add_service(ble_subsystem: &mut Ble, uuid: Uuid) -> Result<AttributeHandle, ()> { | ||
| 322 | ble_subsystem | ||
| 323 | .add_service(&AddServiceParameters { | ||
| 324 | uuid, | ||
| 325 | service_type: ServiceType::Primary, | ||
| 326 | max_attribute_records: 8, | ||
| 327 | }) | ||
| 328 | .await; | ||
| 329 | let response = ble_subsystem.read().await; | ||
| 330 | defmt::debug!("{}", response); | ||
| 331 | |||
| 332 | if let Ok(Packet::Event(Event::CommandComplete(CommandComplete { | ||
| 333 | return_params: | ||
| 334 | ReturnParameters::Vendor(event::command::ReturnParameters::GattAddService(event::command::GattService { | ||
| 335 | service_handle, | ||
| 336 | .. | ||
| 337 | })), | ||
| 338 | .. | ||
| 339 | }))) = response | ||
| 340 | { | ||
| 341 | Ok(service_handle) | ||
| 342 | } else { | ||
| 343 | Err(()) | ||
| 344 | } | ||
| 345 | } | ||
| 346 | |||
| 347 | async fn gatt_add_char( | ||
| 348 | ble_subsystem: &mut Ble, | ||
| 349 | service_handle: AttributeHandle, | ||
| 350 | characteristic_uuid: Uuid, | ||
| 351 | characteristic_properties: CharacteristicProperty, | ||
| 352 | default_value: Option<&[u8]>, | ||
| 353 | ) -> Result<AttributeHandle, ()> { | ||
| 354 | ble_subsystem | ||
| 355 | .add_characteristic(&AddCharacteristicParameters { | ||
| 356 | service_handle, | ||
| 357 | characteristic_uuid, | ||
| 358 | characteristic_properties, | ||
| 359 | characteristic_value_len: 32, | ||
| 360 | security_permissions: CharacteristicPermission::empty(), | ||
| 361 | gatt_event_mask: CharacteristicEvent::all(), | ||
| 362 | encryption_key_size: EncryptionKeySize::with_value(7).unwrap(), | ||
| 363 | is_variable: true, | ||
| 364 | }) | ||
| 365 | .await; | ||
| 366 | let response = ble_subsystem.read().await; | ||
| 367 | defmt::debug!("{}", response); | ||
| 368 | |||
| 369 | if let Ok(Packet::Event(Event::CommandComplete(CommandComplete { | ||
| 370 | return_params: | ||
| 371 | ReturnParameters::Vendor(event::command::ReturnParameters::GattAddCharacteristic( | ||
| 372 | event::command::GattCharacteristic { | ||
| 373 | characteristic_handle, .. | ||
| 374 | }, | ||
| 375 | )), | ||
| 376 | .. | ||
| 377 | }))) = response | ||
| 378 | { | ||
| 379 | if let Some(value) = default_value { | ||
| 380 | ble_subsystem | ||
| 381 | .update_characteristic_value(&UpdateCharacteristicValueParameters { | ||
| 382 | service_handle, | ||
| 383 | characteristic_handle, | ||
| 384 | offset: 0, | ||
| 385 | value, | ||
| 386 | }) | ||
| 387 | .await | ||
| 388 | .unwrap(); | ||
| 389 | |||
| 390 | let response = ble_subsystem.read().await; | ||
| 391 | defmt::debug!("{}", response); | ||
| 392 | } | ||
| 393 | Ok(characteristic_handle) | ||
| 394 | } else { | ||
| 395 | Err(()) | ||
| 396 | } | ||
| 397 | } | ||
diff --git a/examples/stm32wb/src/bin/mac_ffd.rs b/examples/stm32wb/src/bin/mac_ffd.rs new file mode 100644 index 000000000..e4d81997e --- /dev/null +++ b/examples/stm32wb/src/bin/mac_ffd.rs | |||
| @@ -0,0 +1,183 @@ | |||
| 1 | #![no_std] | ||
| 2 | #![no_main] | ||
| 3 | #![feature(type_alias_impl_trait)] | ||
| 4 | |||
| 5 | use defmt::*; | ||
| 6 | use embassy_executor::Spawner; | ||
| 7 | use embassy_stm32::bind_interrupts; | ||
| 8 | use embassy_stm32::ipcc::{Config, ReceiveInterruptHandler, TransmitInterruptHandler}; | ||
| 9 | use embassy_stm32_wpan::mac::commands::{AssociateResponse, ResetRequest, SetRequest, StartRequest}; | ||
| 10 | use embassy_stm32_wpan::mac::event::MacEvent; | ||
| 11 | use embassy_stm32_wpan::mac::typedefs::{MacChannel, MacStatus, PanId, PibId, SecurityLevel}; | ||
| 12 | use embassy_stm32_wpan::sub::mm; | ||
| 13 | use embassy_stm32_wpan::TlMbox; | ||
| 14 | use {defmt_rtt as _, panic_probe as _}; | ||
| 15 | |||
| 16 | bind_interrupts!(struct Irqs{ | ||
| 17 | IPCC_C1_RX => ReceiveInterruptHandler; | ||
| 18 | IPCC_C1_TX => TransmitInterruptHandler; | ||
| 19 | }); | ||
| 20 | |||
| 21 | #[embassy_executor::task] | ||
| 22 | async fn run_mm_queue(memory_manager: mm::MemoryManager) { | ||
| 23 | memory_manager.run_queue().await; | ||
| 24 | } | ||
| 25 | |||
| 26 | #[embassy_executor::main] | ||
| 27 | async fn main(spawner: Spawner) { | ||
| 28 | /* | ||
| 29 | How to make this work: | ||
| 30 | |||
| 31 | - Obtain a NUCLEO-STM32WB55 from your preferred supplier. | ||
| 32 | - Download and Install STM32CubeProgrammer. | ||
| 33 | - Download stm32wb5x_FUS_fw.bin, stm32wb5x_BLE_Stack_full_fw.bin, and Release_Notes.html from | ||
| 34 | gh:STMicroelectronics/STM32CubeWB@2234d97/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x | ||
| 35 | - Open STM32CubeProgrammer | ||
| 36 | - On the right-hand pane, click "firmware upgrade" to upgrade the st-link firmware. | ||
| 37 | - Once complete, click connect to connect to the device. | ||
| 38 | - On the left hand pane, click the RSS signal icon to open "Firmware Upgrade Services". | ||
| 39 | - In the Release_Notes.html, find the memory address that corresponds to your device for the stm32wb5x_FUS_fw.bin file | ||
| 40 | - Select that file, the memory address, "verify download", and then "Firmware Upgrade". | ||
| 41 | - Once complete, in the Release_Notes.html, find the memory address that corresponds to your device for the | ||
| 42 | stm32wb5x_BLE_Stack_full_fw.bin file. It should not be the same memory address. | ||
| 43 | - Select that file, the memory address, "verify download", and then "Firmware Upgrade". | ||
| 44 | - Select "Start Wireless Stack". | ||
| 45 | - Disconnect from the device. | ||
| 46 | - In the examples folder for stm32wb, modify the memory.x file to match your target device. | ||
| 47 | - Run this example. | ||
| 48 | |||
| 49 | Note: extended stack versions are not supported at this time. Do not attempt to install a stack with "extended" in the name. | ||
| 50 | */ | ||
| 51 | |||
| 52 | let p = embassy_stm32::init(Default::default()); | ||
| 53 | info!("Hello World!"); | ||
| 54 | |||
| 55 | let config = Config::default(); | ||
| 56 | let mbox = TlMbox::init(p.IPCC, Irqs, config); | ||
| 57 | |||
| 58 | spawner.spawn(run_mm_queue(mbox.mm_subsystem)).unwrap(); | ||
| 59 | |||
| 60 | let sys_event = mbox.sys_subsystem.read().await; | ||
| 61 | info!("sys event: {}", sys_event.payload()); | ||
| 62 | |||
| 63 | core::mem::drop(sys_event); | ||
| 64 | |||
| 65 | let result = mbox.sys_subsystem.shci_c2_mac_802_15_4_init().await; | ||
| 66 | info!("initialized mac: {}", result); | ||
| 67 | |||
| 68 | info!("resetting"); | ||
| 69 | mbox.mac_subsystem | ||
| 70 | .send_command(&ResetRequest { set_default_pib: true }) | ||
| 71 | .await | ||
| 72 | .unwrap(); | ||
| 73 | let evt = mbox.mac_subsystem.read().await; | ||
| 74 | defmt::info!("{:#x}", evt); | ||
| 75 | |||
| 76 | info!("setting extended address"); | ||
| 77 | let extended_address: u64 = 0xACDE480000000001; | ||
| 78 | mbox.mac_subsystem | ||
| 79 | .send_command(&SetRequest { | ||
| 80 | pib_attribute_ptr: &extended_address as *const _ as *const u8, | ||
| 81 | pib_attribute: PibId::ExtendedAddress, | ||
| 82 | }) | ||
| 83 | .await | ||
| 84 | .unwrap(); | ||
| 85 | let evt = mbox.mac_subsystem.read().await; | ||
| 86 | defmt::info!("{:#x}", evt); | ||
| 87 | |||
| 88 | info!("setting short address"); | ||
| 89 | let short_address: u16 = 0x1122; | ||
| 90 | mbox.mac_subsystem | ||
| 91 | .send_command(&SetRequest { | ||
| 92 | pib_attribute_ptr: &short_address as *const _ as *const u8, | ||
| 93 | pib_attribute: PibId::ShortAddress, | ||
| 94 | }) | ||
| 95 | .await | ||
| 96 | .unwrap(); | ||
| 97 | let evt = mbox.mac_subsystem.read().await; | ||
| 98 | defmt::info!("{:#x}", evt); | ||
| 99 | |||
| 100 | info!("setting association permit"); | ||
| 101 | let association_permit: bool = true; | ||
| 102 | mbox.mac_subsystem | ||
| 103 | .send_command(&SetRequest { | ||
| 104 | pib_attribute_ptr: &association_permit as *const _ as *const u8, | ||
| 105 | pib_attribute: PibId::AssociationPermit, | ||
| 106 | }) | ||
| 107 | .await | ||
| 108 | .unwrap(); | ||
| 109 | let evt = mbox.mac_subsystem.read().await; | ||
| 110 | defmt::info!("{:#x}", evt); | ||
| 111 | |||
| 112 | info!("setting TX power"); | ||
| 113 | let transmit_power: i8 = 2; | ||
| 114 | mbox.mac_subsystem | ||
| 115 | .send_command(&SetRequest { | ||
| 116 | pib_attribute_ptr: &transmit_power as *const _ as *const u8, | ||
| 117 | pib_attribute: PibId::TransmitPower, | ||
| 118 | }) | ||
| 119 | .await | ||
| 120 | .unwrap(); | ||
| 121 | let evt = mbox.mac_subsystem.read().await; | ||
| 122 | defmt::info!("{:#x}", evt); | ||
| 123 | |||
| 124 | info!("starting FFD device"); | ||
| 125 | mbox.mac_subsystem | ||
| 126 | .send_command(&StartRequest { | ||
| 127 | pan_id: PanId([0x1A, 0xAA]), | ||
| 128 | channel_number: MacChannel::Channel16, | ||
| 129 | beacon_order: 0x0F, | ||
| 130 | superframe_order: 0x0F, | ||
| 131 | pan_coordinator: true, | ||
| 132 | battery_life_extension: false, | ||
| 133 | ..Default::default() | ||
| 134 | }) | ||
| 135 | .await | ||
| 136 | .unwrap(); | ||
| 137 | let evt = mbox.mac_subsystem.read().await; | ||
| 138 | defmt::info!("{:#x}", evt); | ||
| 139 | |||
| 140 | info!("setting RX on when idle"); | ||
| 141 | let rx_on_while_idle: bool = true; | ||
| 142 | mbox.mac_subsystem | ||
| 143 | .send_command(&SetRequest { | ||
| 144 | pib_attribute_ptr: &rx_on_while_idle as *const _ as *const u8, | ||
| 145 | pib_attribute: PibId::RxOnWhenIdle, | ||
| 146 | }) | ||
| 147 | .await | ||
| 148 | .unwrap(); | ||
| 149 | let evt = mbox.mac_subsystem.read().await; | ||
| 150 | defmt::info!("{:#x}", evt); | ||
| 151 | |||
| 152 | loop { | ||
| 153 | let evt = mbox.mac_subsystem.read().await; | ||
| 154 | defmt::info!("{:#x}", evt); | ||
| 155 | |||
| 156 | if let Ok(evt) = evt { | ||
| 157 | match evt { | ||
| 158 | MacEvent::MlmeAssociateInd(association) => mbox | ||
| 159 | .mac_subsystem | ||
| 160 | .send_command(&AssociateResponse { | ||
| 161 | device_address: association.device_address, | ||
| 162 | assoc_short_address: [0x33, 0x44], | ||
| 163 | status: MacStatus::Success, | ||
| 164 | security_level: SecurityLevel::Unsecure, | ||
| 165 | ..Default::default() | ||
| 166 | }) | ||
| 167 | .await | ||
| 168 | .unwrap(), | ||
| 169 | MacEvent::McpsDataInd(data_ind) => { | ||
| 170 | let data_addr = data_ind.msdu_ptr; | ||
| 171 | let mut data = [0u8; 256]; | ||
| 172 | unsafe { data_addr.copy_to(&mut data as *mut _, data_ind.msdu_length as usize) } | ||
| 173 | info!("{}", data[..data_ind.msdu_length as usize]); | ||
| 174 | |||
| 175 | if &data[..data_ind.msdu_length as usize] == b"Hello from embassy!" { | ||
| 176 | info!("success"); | ||
| 177 | } | ||
| 178 | } | ||
| 179 | _ => {} | ||
| 180 | } | ||
| 181 | } | ||
| 182 | } | ||
| 183 | } | ||
diff --git a/examples/stm32wb/src/bin/mac_rfd.rs b/examples/stm32wb/src/bin/mac_rfd.rs new file mode 100644 index 000000000..b2dac72cc --- /dev/null +++ b/examples/stm32wb/src/bin/mac_rfd.rs | |||
| @@ -0,0 +1,170 @@ | |||
| 1 | #![no_std] | ||
| 2 | #![no_main] | ||
| 3 | #![feature(type_alias_impl_trait)] | ||
| 4 | |||
| 5 | use defmt::*; | ||
| 6 | use embassy_executor::Spawner; | ||
| 7 | use embassy_stm32::bind_interrupts; | ||
| 8 | use embassy_stm32::ipcc::{Config, ReceiveInterruptHandler, TransmitInterruptHandler}; | ||
| 9 | use embassy_stm32_wpan::mac::commands::{AssociateRequest, DataRequest, GetRequest, ResetRequest, SetRequest}; | ||
| 10 | use embassy_stm32_wpan::mac::event::MacEvent; | ||
| 11 | use embassy_stm32_wpan::mac::typedefs::{ | ||
| 12 | AddressMode, Capabilities, KeyIdMode, MacAddress, MacChannel, PanId, PibId, SecurityLevel, | ||
| 13 | }; | ||
| 14 | use embassy_stm32_wpan::sub::mm; | ||
| 15 | use embassy_stm32_wpan::TlMbox; | ||
| 16 | use {defmt_rtt as _, panic_probe as _}; | ||
| 17 | |||
| 18 | bind_interrupts!(struct Irqs{ | ||
| 19 | IPCC_C1_RX => ReceiveInterruptHandler; | ||
| 20 | IPCC_C1_TX => TransmitInterruptHandler; | ||
| 21 | }); | ||
| 22 | |||
| 23 | #[embassy_executor::task] | ||
| 24 | async fn run_mm_queue(memory_manager: mm::MemoryManager) { | ||
| 25 | memory_manager.run_queue().await; | ||
| 26 | } | ||
| 27 | |||
| 28 | #[embassy_executor::main] | ||
| 29 | async fn main(spawner: Spawner) { | ||
| 30 | /* | ||
| 31 | How to make this work: | ||
| 32 | |||
| 33 | - Obtain a NUCLEO-STM32WB55 from your preferred supplier. | ||
| 34 | - Download and Install STM32CubeProgrammer. | ||
| 35 | - Download stm32wb5x_FUS_fw.bin, stm32wb5x_BLE_Stack_full_fw.bin, and Release_Notes.html from | ||
| 36 | gh:STMicroelectronics/STM32CubeWB@2234d97/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x | ||
| 37 | - Open STM32CubeProgrammer | ||
| 38 | - On the right-hand pane, click "firmware upgrade" to upgrade the st-link firmware. | ||
| 39 | - Once complete, click connect to connect to the device. | ||
| 40 | - On the left hand pane, click the RSS signal icon to open "Firmware Upgrade Services". | ||
| 41 | - In the Release_Notes.html, find the memory address that corresponds to your device for the stm32wb5x_FUS_fw.bin file | ||
| 42 | - Select that file, the memory address, "verify download", and then "Firmware Upgrade". | ||
| 43 | - Once complete, in the Release_Notes.html, find the memory address that corresponds to your device for the | ||
| 44 | stm32wb5x_BLE_Stack_full_fw.bin file. It should not be the same memory address. | ||
| 45 | - Select that file, the memory address, "verify download", and then "Firmware Upgrade". | ||
| 46 | - Select "Start Wireless Stack". | ||
| 47 | - Disconnect from the device. | ||
| 48 | - In the examples folder for stm32wb, modify the memory.x file to match your target device. | ||
| 49 | - Run this example. | ||
| 50 | |||
| 51 | Note: extended stack versions are not supported at this time. Do not attempt to install a stack with "extended" in the name. | ||
| 52 | */ | ||
| 53 | |||
| 54 | let p = embassy_stm32::init(Default::default()); | ||
| 55 | info!("Hello World!"); | ||
| 56 | |||
| 57 | let config = Config::default(); | ||
| 58 | let mbox = TlMbox::init(p.IPCC, Irqs, config); | ||
| 59 | |||
| 60 | spawner.spawn(run_mm_queue(mbox.mm_subsystem)).unwrap(); | ||
| 61 | |||
| 62 | let sys_event = mbox.sys_subsystem.read().await; | ||
| 63 | info!("sys event: {}", sys_event.payload()); | ||
| 64 | |||
| 65 | core::mem::drop(sys_event); | ||
| 66 | |||
| 67 | let result = mbox.sys_subsystem.shci_c2_mac_802_15_4_init().await; | ||
| 68 | info!("initialized mac: {}", result); | ||
| 69 | |||
| 70 | info!("resetting"); | ||
| 71 | mbox.mac_subsystem | ||
| 72 | .send_command(&ResetRequest { set_default_pib: true }) | ||
| 73 | .await | ||
| 74 | .unwrap(); | ||
| 75 | let evt = mbox.mac_subsystem.read().await; | ||
| 76 | info!("{:#x}", evt); | ||
| 77 | |||
| 78 | info!("setting extended address"); | ||
| 79 | let extended_address: u64 = 0xACDE480000000002; | ||
| 80 | mbox.mac_subsystem | ||
| 81 | .send_command(&SetRequest { | ||
| 82 | pib_attribute_ptr: &extended_address as *const _ as *const u8, | ||
| 83 | pib_attribute: PibId::ExtendedAddress, | ||
| 84 | }) | ||
| 85 | .await | ||
| 86 | .unwrap(); | ||
| 87 | let evt = mbox.mac_subsystem.read().await; | ||
| 88 | info!("{:#x}", evt); | ||
| 89 | |||
| 90 | info!("getting extended address"); | ||
| 91 | mbox.mac_subsystem | ||
| 92 | .send_command(&GetRequest { | ||
| 93 | pib_attribute: PibId::ExtendedAddress, | ||
| 94 | }) | ||
| 95 | .await | ||
| 96 | .unwrap(); | ||
| 97 | let evt = mbox.mac_subsystem.read().await; | ||
| 98 | info!("{:#x}", evt); | ||
| 99 | |||
| 100 | if let Ok(MacEvent::MlmeGetCnf(evt)) = evt { | ||
| 101 | if evt.pib_attribute_value_len == 8 { | ||
| 102 | let value = unsafe { core::ptr::read_unaligned(evt.pib_attribute_value_ptr as *const u64) }; | ||
| 103 | |||
| 104 | info!("value {:#x}", value) | ||
| 105 | } | ||
| 106 | } | ||
| 107 | |||
| 108 | info!("assocation request"); | ||
| 109 | let a = AssociateRequest { | ||
| 110 | channel_number: MacChannel::Channel16, | ||
| 111 | channel_page: 0, | ||
| 112 | coord_addr_mode: AddressMode::Short, | ||
| 113 | coord_address: MacAddress { short: [34, 17] }, | ||
| 114 | capability_information: Capabilities::ALLOCATE_ADDRESS, | ||
| 115 | coord_pan_id: PanId([0x1A, 0xAA]), | ||
| 116 | security_level: SecurityLevel::Unsecure, | ||
| 117 | key_id_mode: KeyIdMode::Implicite, | ||
| 118 | key_source: [0; 8], | ||
| 119 | key_index: 152, | ||
| 120 | }; | ||
| 121 | info!("{}", a); | ||
| 122 | mbox.mac_subsystem.send_command(&a).await.unwrap(); | ||
| 123 | let evt = mbox.mac_subsystem.read().await; | ||
| 124 | info!("{:#x}", evt); | ||
| 125 | |||
| 126 | let short_addr = if let Ok(MacEvent::MlmeAssociateCnf(conf)) = evt { | ||
| 127 | conf.assoc_short_address | ||
| 128 | } else { | ||
| 129 | defmt::panic!() | ||
| 130 | }; | ||
| 131 | |||
| 132 | info!("setting short address"); | ||
| 133 | mbox.mac_subsystem | ||
| 134 | .send_command(&SetRequest { | ||
| 135 | pib_attribute_ptr: &short_addr as *const _ as *const u8, | ||
| 136 | pib_attribute: PibId::ShortAddress, | ||
| 137 | }) | ||
| 138 | .await | ||
| 139 | .unwrap(); | ||
| 140 | let evt = mbox.mac_subsystem.read().await; | ||
| 141 | info!("{:#x}", evt); | ||
| 142 | |||
| 143 | info!("sending data"); | ||
| 144 | let mut data_buffer = [0u8; 256]; | ||
| 145 | let data = b"Hello from embassy!"; | ||
| 146 | data_buffer[..data.len()].copy_from_slice(data); | ||
| 147 | mbox.mac_subsystem | ||
| 148 | .send_command(&DataRequest { | ||
| 149 | src_addr_mode: AddressMode::Short, | ||
| 150 | dst_addr_mode: AddressMode::Short, | ||
| 151 | dst_pan_id: PanId([0x1A, 0xAA]), | ||
| 152 | dst_address: MacAddress::BROADCAST, | ||
| 153 | msdu_handle: 0x02, | ||
| 154 | ack_tx: 0x00, | ||
| 155 | gts_tx: false, | ||
| 156 | msdu_ptr: &data_buffer as *const _ as *const u8, | ||
| 157 | msdu_length: data.len() as u8, | ||
| 158 | security_level: SecurityLevel::Unsecure, | ||
| 159 | ..Default::default() | ||
| 160 | }) | ||
| 161 | .await | ||
| 162 | .unwrap(); | ||
| 163 | let evt = mbox.mac_subsystem.read().await; | ||
| 164 | info!("{:#x}", evt); | ||
| 165 | |||
| 166 | loop { | ||
| 167 | let evt = mbox.mac_subsystem.read().await; | ||
| 168 | info!("{:#x}", evt); | ||
| 169 | } | ||
| 170 | } | ||
diff --git a/examples/stm32wb/src/bin/tl_mbox_ble.rs b/examples/stm32wb/src/bin/tl_mbox_ble.rs index a511e89aa..90349422e 100644 --- a/examples/stm32wb/src/bin/tl_mbox_ble.rs +++ b/examples/stm32wb/src/bin/tl_mbox_ble.rs | |||
| @@ -49,7 +49,7 @@ async fn main(_spawner: Spawner) { | |||
| 49 | let sys_event = mbox.sys_subsystem.read().await; | 49 | let sys_event = mbox.sys_subsystem.read().await; |
| 50 | info!("sys event: {}", sys_event.payload()); | 50 | info!("sys event: {}", sys_event.payload()); |
| 51 | 51 | ||
| 52 | mbox.sys_subsystem.shci_c2_ble_init(Default::default()).await; | 52 | let _ = mbox.sys_subsystem.shci_c2_ble_init(Default::default()).await; |
| 53 | 53 | ||
| 54 | info!("starting ble..."); | 54 | info!("starting ble..."); |
| 55 | mbox.ble_subsystem.tl_write(0x0c, &[]).await; | 55 | mbox.ble_subsystem.tl_write(0x0c, &[]).await; |
diff --git a/examples/stm32wb/src/bin/tl_mbox_mac.rs b/examples/stm32wb/src/bin/tl_mbox_mac.rs index f67be4682..5931c392b 100644 --- a/examples/stm32wb/src/bin/tl_mbox_mac.rs +++ b/examples/stm32wb/src/bin/tl_mbox_mac.rs | |||
| @@ -6,6 +6,7 @@ use defmt::*; | |||
| 6 | use embassy_executor::Spawner; | 6 | use embassy_executor::Spawner; |
| 7 | use embassy_stm32::bind_interrupts; | 7 | use embassy_stm32::bind_interrupts; |
| 8 | use embassy_stm32::ipcc::{Config, ReceiveInterruptHandler, TransmitInterruptHandler}; | 8 | use embassy_stm32::ipcc::{Config, ReceiveInterruptHandler, TransmitInterruptHandler}; |
| 9 | use embassy_stm32_wpan::sub::mm; | ||
| 9 | use embassy_stm32_wpan::TlMbox; | 10 | use embassy_stm32_wpan::TlMbox; |
| 10 | use {defmt_rtt as _, panic_probe as _}; | 11 | use {defmt_rtt as _, panic_probe as _}; |
| 11 | 12 | ||
| @@ -14,8 +15,13 @@ bind_interrupts!(struct Irqs{ | |||
| 14 | IPCC_C1_TX => TransmitInterruptHandler; | 15 | IPCC_C1_TX => TransmitInterruptHandler; |
| 15 | }); | 16 | }); |
| 16 | 17 | ||
| 18 | #[embassy_executor::task] | ||
| 19 | async fn run_mm_queue(memory_manager: mm::MemoryManager) { | ||
| 20 | memory_manager.run_queue().await; | ||
| 21 | } | ||
| 22 | |||
| 17 | #[embassy_executor::main] | 23 | #[embassy_executor::main] |
| 18 | async fn main(_spawner: Spawner) { | 24 | async fn main(spawner: Spawner) { |
| 19 | /* | 25 | /* |
| 20 | How to make this work: | 26 | How to make this work: |
| 21 | 27 | ||
| @@ -46,9 +52,13 @@ async fn main(_spawner: Spawner) { | |||
| 46 | let config = Config::default(); | 52 | let config = Config::default(); |
| 47 | let mbox = TlMbox::init(p.IPCC, Irqs, config); | 53 | let mbox = TlMbox::init(p.IPCC, Irqs, config); |
| 48 | 54 | ||
| 55 | spawner.spawn(run_mm_queue(mbox.mm_subsystem)).unwrap(); | ||
| 56 | |||
| 49 | let sys_event = mbox.sys_subsystem.read().await; | 57 | let sys_event = mbox.sys_subsystem.read().await; |
| 50 | info!("sys event: {}", sys_event.payload()); | 58 | info!("sys event: {}", sys_event.payload()); |
| 51 | 59 | ||
| 60 | core::mem::drop(sys_event); | ||
| 61 | |||
| 52 | let result = mbox.sys_subsystem.shci_c2_mac_802_15_4_init().await; | 62 | let result = mbox.sys_subsystem.shci_c2_mac_802_15_4_init().await; |
| 53 | info!("initialized mac: {}", result); | 63 | info!("initialized mac: {}", result); |
| 54 | 64 | ||
diff --git a/examples/stm32wl/.cargo/config.toml b/examples/stm32wl/.cargo/config.toml index 4f8094ff2..ee416fcbc 100644 --- a/examples/stm32wl/.cargo/config.toml +++ b/examples/stm32wl/.cargo/config.toml | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | runner = "probe-rs run --chip STM32WLE5JCIx" | 3 | runner = "probe-rs run --chip STM32WLE5JCIx" |
| 4 | 4 | ||
| 5 | [build] | 5 | [build] |
| 6 | target = "thumbv7em-none-eabihf" | 6 | target = "thumbv7em-none-eabi" |
| 7 | 7 | ||
| 8 | [env] | 8 | [env] |
| 9 | DEFMT_LOG = "trace" | 9 | DEFMT_LOG = "trace" |
diff --git a/examples/stm32wl/Cargo.toml b/examples/stm32wl/Cargo.toml index 260f9afa1..e2c66f456 100644 --- a/examples/stm32wl/Cargo.toml +++ b/examples/stm32wl/Cargo.toml | |||
| @@ -7,9 +7,9 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 8 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | 9 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } |
| 10 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["nightly", "unstable-traits", "defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | 10 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["nightly", "unstable-traits", "defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "unstable-traits", "defmt", "stm32wl55jc-cm4", "time-driver-any", "memory-x", "unstable-pac", "exti"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "unstable-traits", "defmt", "stm32wl55jc-cm4", "time-driver-any", "memory-x", "unstable-pac", "exti", "chrono"] } |
| 12 | embassy-embedded-hal = {version = "0.1.0", path = "../../embassy-embedded-hal" } | 12 | embassy-embedded-hal = { version = "0.1.0", path = "../../embassy-embedded-hal" } |
| 13 | embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["stm32wl", "time", "defmt"] } | 13 | embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["stm32wl", "time", "defmt"] } |
| 14 | lora-phy = { version = "1" } | 14 | lora-phy = { version = "1" } |
| 15 | lorawan-device = { version = "0.10.0", default-features = false, features = ["async", "external-lora-phy"] } | 15 | lorawan-device = { version = "0.10.0", default-features = false, features = ["async", "external-lora-phy"] } |
| @@ -25,3 +25,7 @@ embedded-storage = "0.3.0" | |||
| 25 | panic-probe = { version = "0.3", features = ["print-defmt"] } | 25 | panic-probe = { version = "0.3", features = ["print-defmt"] } |
| 26 | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | 26 | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } |
| 27 | heapless = { version = "0.7.5", default-features = false } | 27 | heapless = { version = "0.7.5", default-features = false } |
| 28 | chrono = { version = "^0.4", default-features = false } | ||
| 29 | |||
| 30 | [patch.crates-io] | ||
| 31 | lora-phy = { git = "https://github.com/embassy-rs/lora-phy", rev = "ad289428fd44b02788e2fa2116445cc8f640a265" } | ||
diff --git a/examples/stm32wl/src/bin/rtc.rs b/examples/stm32wl/src/bin/rtc.rs new file mode 100644 index 000000000..e11825499 --- /dev/null +++ b/examples/stm32wl/src/bin/rtc.rs | |||
| @@ -0,0 +1,43 @@ | |||
| 1 | #![no_std] | ||
| 2 | #![no_main] | ||
| 3 | #![feature(type_alias_impl_trait)] | ||
| 4 | |||
| 5 | use chrono::{NaiveDate, NaiveDateTime}; | ||
| 6 | use defmt::*; | ||
| 7 | use embassy_executor::Spawner; | ||
| 8 | use embassy_stm32::rcc::{self, ClockSrc}; | ||
| 9 | use embassy_stm32::rtc::{Rtc, RtcConfig}; | ||
| 10 | use embassy_stm32::Config; | ||
| 11 | use embassy_time::{Duration, Timer}; | ||
| 12 | use {defmt_rtt as _, panic_probe as _}; | ||
| 13 | |||
| 14 | #[embassy_executor::main] | ||
| 15 | async fn main(_spawner: Spawner) { | ||
| 16 | let p = { | ||
| 17 | let mut config = Config::default(); | ||
| 18 | config.rcc.mux = ClockSrc::HSE32; | ||
| 19 | config.rcc.rtc_mux = rcc::RtcClockSource::LSE32; | ||
| 20 | config.rcc.enable_rtc_apb = true; | ||
| 21 | embassy_stm32::init(config) | ||
| 22 | }; | ||
| 23 | info!("Hello World!"); | ||
| 24 | |||
| 25 | let now = NaiveDate::from_ymd_opt(2020, 5, 15) | ||
| 26 | .unwrap() | ||
| 27 | .and_hms_opt(10, 30, 15) | ||
| 28 | .unwrap(); | ||
| 29 | |||
| 30 | let mut rtc = Rtc::new( | ||
| 31 | p.RTC, | ||
| 32 | RtcConfig::default().clock_config(embassy_stm32::rtc::RtcClockSource::LSE), | ||
| 33 | ); | ||
| 34 | info!("Got RTC! {:?}", now.timestamp()); | ||
| 35 | |||
| 36 | rtc.set_datetime(now.into()).expect("datetime not set"); | ||
| 37 | |||
| 38 | // In reality the delay would be much longer | ||
| 39 | Timer::after(Duration::from_millis(20000)).await; | ||
| 40 | |||
| 41 | let then: NaiveDateTime = rtc.now().unwrap().into(); | ||
| 42 | info!("Got RTC! {:?}", then.timestamp()); | ||
| 43 | } | ||
diff --git a/examples/wasm/Cargo.toml b/examples/wasm/Cargo.toml index 437e443a7..3679e3857 100644 --- a/examples/wasm/Cargo.toml +++ b/examples/wasm/Cargo.toml | |||
| @@ -10,7 +10,7 @@ crate-type = ["cdylib"] | |||
| 10 | [dependencies] | 10 | [dependencies] |
| 11 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["log"] } | 11 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["log"] } |
| 12 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["arch-wasm", "executor-thread", "log", "nightly", "integrated-timers"] } | 12 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["arch-wasm", "executor-thread", "log", "nightly", "integrated-timers"] } |
| 13 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["log", "wasm", "nightly"] } | 13 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["log", "wasm", "nightly"] } |
| 14 | 14 | ||
| 15 | wasm-logger = "0.2.0" | 15 | wasm-logger = "0.2.0" |
| 16 | wasm-bindgen = "0.2" | 16 | wasm-bindgen = "0.2" |
