rust/comprehensive-rust
1
0
Fork 0
mirror of https://github.com/google/comprehensive-rust.git synced 2025-03-23 23:19:20 +02:00
Code Issues Releases Activity

Update to embedded-hal 1.0 (#1723)

Browse Source 
Now that the new version of `microbit-v2` and friends are finally
released, we can use `embedded-hal` 1.0 for the bare metal morning.
This commit is contained in:
Andrew Walbran 2024-04-19 12:52:50 +01:00 committed by GitHub
parent c9e08fae60
commit 45aa43f406
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 85 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/bare-metal/microcontrollers/embedded-hal.md
View File

@ -1,25 +1,36 @@
# `embedded-hal` # `embedded-hal`
The [`embedded-hal`](https://crates.io/crates/embedded-hal) crate provides a The [`embedded-hal`] crate provides a number of traits covering common
number of traits covering common microcontroller peripherals. microcontroller peripherals:
- GPIO - GPIO
- ADC - PWM
- I2C, SPI, UART, CAN - Delay timers
- RNG - I2C and SPI buses and devices
- Timers
- Watchdogs
Other crates then implement Similar traits for byte streams (e.g. UARTs), CAN buses and RNGs and broken out
[drivers](https://github.com/rust-embedded/awesome-embedded-rust#driver-crates) into [`embedded-io`], [`embedded-can`] and [`rand_core`] respectively.
in terms of these traits, e.g. an accelerometer driver might need an I2C or SPI
bus implementation. Other crates then implement [drivers] in terms of these traits, e.g. an
accelerometer driver might need an I2C or SPI device instance.
<details> <details>
- The traits cover using the peripherals but not initialising or configuring
them, as initialisation and configuration is usually highly platform-specific.
- There are implementations for many microcontrollers, as well as other - There are implementations for many microcontrollers, as well as other
platforms such as Linux on Raspberry Pi. platforms such as Linux on Raspberry Pi.
- There is work in progress on an `async` version of `embedded-hal`, but it - [`embedded-hal-async`] provides async versions of the traits.
isn't stable yet. - [`embedded-hal-nb`] provides another approach to non-blocking I/O, based on
the [`nb`] crate.
</details> </details>
[drivers]: https://github.com/rust-embedded/awesome-embedded-rust#driver-crates
[`embedded-can`]: https://crates.io/crates/embedded-can
[`embedded-hal`]: https://crates.io/crates/embedded-hal
[`embedded-hal-async`]: https://crates.io/crates/embedded-hal-async
[`embedded-hal-nb`]: https://crates.io/crates/embedded-hal-nb
[`embedded-io`]: https://crates.io/crates/embedded-io
[`nb`]: https://crates.io/crates/nb
[`rand_core`]: https://crates.io/crates/rand_core

126
src/bare-metal/microcontrollers/examples/Cargo.lock generated
View File

@ -17,12 +17,6 @@ dependencies = [
"rustc_version", "rustc_version",
] ]
[[package]]
name = "bare-metal"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8fe8f5a8a398345e52358e18ff07cc17a568fbca5c6f73873d3a62056309603"
[[package]] [[package]]
name = "bitfield" name = "bitfield"
version = "0.13.2" version = "0.13.2"
@ -53,7 +47,7 @@ version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ec610d8f49840a5b376c69663b6369e71f4b34484b9b2eb29fb918d92516cb9" checksum = "8ec610d8f49840a5b376c69663b6369e71f4b34484b9b2eb29fb918d92516cb9"
dependencies = [ dependencies = [
"bare-metal 0.2.5", "bare-metal",
"bitfield", "bitfield",
"embedded-hal 0.2.7", "embedded-hal 0.2.7",
"volatile-register", "volatile-register",
@ -79,16 +73,6 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "critical-section"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1706d332edc22aef4d9f23a6bb1c92360a403013c291af51247a737472dcae6"
dependencies = [
"bare-metal 1.0.0",
"critical-section 1.1.2",
]
[[package]] [[package]]
name = "critical-section" name = "critical-section"
version = "1.1.2" version = "1.1.2"
@ -101,15 +85,6 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
name = "embedded-dma"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46c8c02e4347a0267ca60813c952017f4c5948c232474c6010a381a337f1bda4"
dependencies = [
"stable_deref_trait",
]
[[package]] [[package]]
name = "embedded-dma" name = "embedded-dma"
version = "0.2.0" version = "0.2.0"
@ -141,12 +116,6 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
[[package]]
name = "embedded-storage"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "723dce4e9f25b6e6c5f35628e144794e5b459216ed7da97b7c4b66cdb3fa82ca"
[[package]] [[package]]
name = "embedded-storage" name = "embedded-storage"
version = "0.3.1" version = "0.3.1"
@ -177,20 +146,20 @@ dependencies = [
[[package]] [[package]]
name = "microbit-common" name = "microbit-common"
version = "0.13.0" version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45651d001be4281a6f4536c30f3d8522f231bc56fd58d5baf2c630f565d31256" checksum = "37409f40befaa165d8a94255955475337422f5fe2fecaeeeedde170562ee114b"
dependencies = [ dependencies = [
"embedded-hal 0.2.7", "embedded-hal 1.0.0",
"nrf52833-hal 0.14.1", "nrf52833-hal",
"tiny-led-matrix", "tiny-led-matrix",
] ]
[[package]] [[package]]
name = "microbit-v2" name = "microbit-v2"
version = "0.13.0" version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9895242259950730bc112623e4a2e37345dc51ddb5fc8878c110489260d84e7" checksum = "ba72e1c5b286e8374734e345a1c3b3d3768d77c9004bf905d2ca86e7c47088a9"
dependencies = [ dependencies = [
"microbit-common", "microbit-common",
] ]
@ -202,8 +171,8 @@ dependencies = [
"cortex-m-rt", "cortex-m-rt",
"embedded-hal 1.0.0", "embedded-hal 1.0.0",
"microbit-v2", "microbit-v2",
"nrf52833-hal 0.17.0", "nrf52833-hal",
"nrf52833-pac 0.12.2", "nrf52833-pac",
"panic-halt", "panic-halt",
] ]
@ -224,59 +193,26 @@ checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d"
[[package]] [[package]]
name = "nrf-hal-common" name = "nrf-hal-common"
version = "0.14.1" version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd37b3fd039327b4005cc0d4ef20bce0a41bf521071774d5adb854e4b1230639" checksum = "56fbecd598c7f16e32bd4783447ca023aa7897d4a4c8e70f6b7c5739c81b4ceb"
dependencies = [ dependencies = [
"cast", "cast",
"cfg-if", "cfg-if",
"cortex-m", "cortex-m",
"embedded-dma 0.1.2", "embedded-dma",
"embedded-hal 0.2.7",
"embedded-storage 0.2.0",
"fixed",
"nb 1.1.0",
"nrf-usbd 0.1.1",
"nrf52833-pac 0.10.1",
"rand_core",
"void",
]
[[package]]
name = "nrf-hal-common"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f0280b48785ca132a353c2fc12e307d361eae4608aa8139768728bea6a05b25"
dependencies = [
"cast",
"cfg-if",
"cortex-m",
"embedded-dma 0.2.0",
"embedded-hal 0.2.7", "embedded-hal 0.2.7",
"embedded-hal 1.0.0", "embedded-hal 1.0.0",
"embedded-io", "embedded-io",
"embedded-storage 0.3.1", "embedded-storage",
"fixed", "fixed",
"nb 1.1.0", "nb 1.1.0",
"nrf-usbd 0.2.0", "nrf-usbd",
"nrf52833-pac 0.12.2", "nrf52833-pac",
"rand_core", "rand_core",
"void", "void",
] ]
[[package]]
name = "nrf-usbd"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "640e88d4c108743c667f03320d0c9ab24a20f183a7a1b18bde7891ee13fd92c5"
dependencies = [
"bare-metal 1.0.0",
"cortex-m",
"critical-section 0.2.8",
"usb-device",
"vcell",
]
[[package]] [[package]]
name = "nrf-usbd" name = "nrf-usbd"
version = "0.2.0" version = "0.2.0"
@ -284,41 +220,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66b2907c0b3ec4d264981c1fc5a2321d51c463d5a63d386e573f00e84d5495e6" checksum = "66b2907c0b3ec4d264981c1fc5a2321d51c463d5a63d386e573f00e84d5495e6"
dependencies = [ dependencies = [
"cortex-m", "cortex-m",
"critical-section 1.1.2", "critical-section",
"usb-device", "usb-device",
"vcell", "vcell",
] ]
[[package]] [[package]]
name = "nrf52833-hal" name = "nrf52833-hal"
version = "0.14.1" version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87f76d269c9a239ffe24edaa5ee0972b102c04e898b464e3e9a12ab0eacd5f76" checksum = "10409e4c7a9af33161da0ac7329ea50d94bec24c9184cdec6138fd2bd590bdd3"
dependencies = [ dependencies = [
"embedded-hal 0.2.7", "nrf-hal-common",
"nrf-hal-common 0.14.1", "nrf52833-pac",
"nrf52833-pac 0.10.1",
]
[[package]]
name = "nrf52833-hal"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edad8621582cbdb935c4db94e1ba66fd4975883a4b7477fdb2b4a5ae537e761a"
dependencies = [
"nrf-hal-common 0.17.0",
"nrf52833-pac 0.12.2",
]
[[package]]
name = "nrf52833-pac"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd69bdb25903e18e098c040ef31dc863814437af010dea8bd55aa31f686cb461"
dependencies = [
"cortex-m",
"cortex-m-rt",
"vcell",
] ]
[[package]] [[package]]

6
src/bare-metal/microcontrollers/examples/Cargo.toml
View File

@ -7,10 +7,10 @@ edition = "2021"
publish = false publish = false
[dependencies] [dependencies]
cortex-m-rt = "0.7.3" cortex-m-rt = "0.7.4"
embedded-hal = "1.0.0" embedded-hal = "1.0.0"
microbit-v2 = "0.13.0" microbit-v2 = "0.14.0"
nrf52833-hal = "0.17.0" nrf52833-hal = "0.17.1"
nrf52833-pac = { version = "0.12.2", features = ["rt"] } nrf52833-pac = { version = "0.12.2", features = ["rt"] }
panic-halt = "0.2.0" panic-halt = "0.2.0"

2
src/bare-metal/microcontrollers/examples/src/bin/board_support.rs
View File

@ -19,7 +19,7 @@
extern crate panic_halt as _; extern crate panic_halt as _;
use cortex_m_rt::entry; use cortex_m_rt::entry;
use microbit::hal::prelude::*; use embedded_hal::digital::OutputPin;
use microbit::Board; use microbit::Board;
#[entry] #[entry]

77
src/exercises/bare-metal/compass/Cargo.lock generated
View File

@ -17,12 +17,6 @@ dependencies = [
"rustc_version", "rustc_version",
] ]
[[package]]
name = "bare-metal"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8fe8f5a8a398345e52358e18ff07cc17a568fbca5c6f73873d3a62056309603"
[[package]] [[package]]
name = "bitfield" name = "bitfield"
version = "0.13.2" version = "0.13.2"
@ -70,7 +64,7 @@ version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ec610d8f49840a5b376c69663b6369e71f4b34484b9b2eb29fb918d92516cb9" checksum = "8ec610d8f49840a5b376c69663b6369e71f4b34484b9b2eb29fb918d92516cb9"
dependencies = [ dependencies = [
"bare-metal 0.2.5", "bare-metal",
"bitfield", "bitfield",
"embedded-hal 0.2.7", "embedded-hal 0.2.7",
"volatile-register", "volatile-register",
@ -96,16 +90,6 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "critical-section"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1706d332edc22aef4d9f23a6bb1c92360a403013c291af51247a737472dcae6"
dependencies = [
"bare-metal 1.0.0",
"critical-section 1.1.2",
]
[[package]] [[package]]
name = "critical-section" name = "critical-section"
version = "1.1.2" version = "1.1.2"
@ -120,9 +104,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]] [[package]]
name = "embedded-dma" name = "embedded-dma"
version = "0.1.2" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46c8c02e4347a0267ca60813c952017f4c5948c232474c6010a381a337f1bda4" checksum = "994f7e5b5cb23521c22304927195f236813053eb9c065dd2226a32ba64695446"
dependencies = [ dependencies = [
"stable_deref_trait", "stable_deref_trait",
] ]
@ -144,16 +128,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89" checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89"
[[package]] [[package]]
name = "embedded-storage" name = "embedded-io"
version = "0.2.0" version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "723dce4e9f25b6e6c5f35628e144794e5b459216ed7da97b7c4b66cdb3fa82ca" checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
[[package]]
name = "embedded-storage"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a21dea9854beb860f3062d10228ce9b976da520a73474aed3171ec276bc0c032"
[[package]] [[package]]
name = "fixed" name = "fixed"
version = "1.24.0" version = "1.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02c69ce7e7c0f17aa18fdd9d0de39727adb9c6281f2ad12f57cbe54ae6e76e7d" checksum = "2fc715d38bea7b5bf487fcd79bcf8c209f0b58014f3018a7a19c2b855f472048"
dependencies = [ dependencies = [
"az", "az",
"bytemuck", "bytemuck",
@ -173,31 +163,31 @@ dependencies = [
[[package]] [[package]]
name = "lsm303agr" name = "lsm303agr"
version = "0.3.0" version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82d672443f0535384ea86fff40c50156c5fae3fe0446242edeb9ff993b63e0dc" checksum = "d4a03acd01d27c9ca96ba8205760673a23ba1914d85cc00e92a6a05963d5fe9b"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"embedded-hal 0.2.7", "embedded-hal 1.0.0",
"nb 1.1.0", "nb 1.1.0",
] ]
[[package]] [[package]]
name = "microbit-common" name = "microbit-common"
version = "0.13.0" version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45651d001be4281a6f4536c30f3d8522f231bc56fd58d5baf2c630f565d31256" checksum = "37409f40befaa165d8a94255955475337422f5fe2fecaeeeedde170562ee114b"
dependencies = [ dependencies = [
"embedded-hal 0.2.7", "embedded-hal 1.0.0",
"nrf52833-hal", "nrf52833-hal",
"tiny-led-matrix", "tiny-led-matrix",
] ]
[[package]] [[package]]
name = "microbit-v2" name = "microbit-v2"
version = "0.13.0" version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9895242259950730bc112623e4a2e37345dc51ddb5fc8878c110489260d84e7" checksum = "ba72e1c5b286e8374734e345a1c3b3d3768d77c9004bf905d2ca86e7c47088a9"
dependencies = [ dependencies = [
"microbit-common", "microbit-common",
] ]
@ -219,15 +209,16 @@ checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d"
[[package]] [[package]]
name = "nrf-hal-common" name = "nrf-hal-common"
version = "0.14.1" version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd37b3fd039327b4005cc0d4ef20bce0a41bf521071774d5adb854e4b1230639" checksum = "56fbecd598c7f16e32bd4783447ca023aa7897d4a4c8e70f6b7c5739c81b4ceb"
dependencies = [ dependencies = [
"cast", "cast",
"cfg-if", "cfg-if",
"cortex-m", "cortex-m",
"embedded-dma", "embedded-dma",
"embedded-hal 0.2.7", "embedded-hal 1.0.0",
"embedded-io",
"embedded-storage", "embedded-storage",
"fixed", "fixed",
"nb 1.1.0", "nb 1.1.0",
@ -239,33 +230,31 @@ dependencies = [
[[package]] [[package]]
name = "nrf-usbd" name = "nrf-usbd"
version = "0.1.1" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "640e88d4c108743c667f03320d0c9ab24a20f183a7a1b18bde7891ee13fd92c5" checksum = "66b2907c0b3ec4d264981c1fc5a2321d51c463d5a63d386e573f00e84d5495e6"
dependencies = [ dependencies = [
"bare-metal 1.0.0",
"cortex-m", "cortex-m",
"critical-section 0.2.8", "critical-section",
"usb-device", "usb-device",
"vcell", "vcell",
] ]
[[package]] [[package]]
name = "nrf52833-hal" name = "nrf52833-hal"
version = "0.14.1" version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87f76d269c9a239ffe24edaa5ee0972b102c04e898b464e3e9a12ab0eacd5f76" checksum = "10409e4c7a9af33161da0ac7329ea50d94bec24c9184cdec6138fd2bd590bdd3"
dependencies = [ dependencies = [
"embedded-hal 0.2.7",
"nrf-hal-common", "nrf-hal-common",
"nrf52833-pac", "nrf52833-pac",
] ]
[[package]] [[package]]
name = "nrf52833-pac" name = "nrf52833-pac"
version = "0.10.1" version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd69bdb25903e18e098c040ef31dc863814437af010dea8bd55aa31f686cb461" checksum = "10e1358255b360cdc816dd7b6ef81be8c8499c0998277e5249bed222bd0f5241"
dependencies = [ dependencies = [
"cortex-m", "cortex-m",
"cortex-m-rt", "cortex-m-rt",

4
src/exercises/bare-metal/compass/Cargo.toml
View File

@ -9,6 +9,6 @@ publish = false
[dependencies] [dependencies]
cortex-m-rt = "0.7.3" cortex-m-rt = "0.7.3"
embedded-hal = "1.0.0" embedded-hal = "1.0.0"
lsm303agr = "0.3.0" lsm303agr = "1.0.0"
microbit-v2 = "0.13.0" microbit-v2 = "0.14.0"
panic-halt = "0.2.0" panic-halt = "0.2.0"

4
src/exercises/bare-metal/compass/src/main.rs
View File

@ -23,11 +23,11 @@ use core::fmt::Write;
use cortex_m_rt::entry; use cortex_m_rt::entry;
// ANCHOR_END: top // ANCHOR_END: top
use core::cmp::{max, min}; use core::cmp::{max, min};
use embedded_hal::digital::InputPin;
use lsm303agr::{ use lsm303agr::{
AccelMode, AccelOutputDataRate, Lsm303agr, MagMode, MagOutputDataRate, AccelMode, AccelOutputDataRate, Lsm303agr, MagMode, MagOutputDataRate,
}; };
use microbit::display::blocking::Display; use microbit::display::blocking::Display;
use microbit::hal::prelude::*;
use microbit::hal::twim::Twim; use microbit::hal::twim::Twim;
use microbit::hal::uarte::{Baudrate, Parity, Uarte}; use microbit::hal::uarte::{Baudrate, Parity, Uarte};
use microbit::hal::{Delay, Timer}; use microbit::hal::{Delay, Timer};
@ -40,7 +40,7 @@ const ACCELEROMETER_SCALE: i32 = 700;
// ANCHOR: main // ANCHOR: main
#[entry] #[entry]
fn main() -> ! { fn main() -> ! {
let board = Board::take().unwrap(); let mut board = Board::take().unwrap();
// Configure serial port. // Configure serial port.
let mut serial = Uarte::new( let mut serial = Uarte::new(