Update to embedded-hal 1.0.

CHANGELOG.md

@@ -25,6 +25,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Add support for PPI
 - Servo example using TIMER, GPIOTE and PPI
 - (NFC) GitHub CI changes
+- Updated HAL crates to latest versions.
+- Updated to `embedded-hal` 1.0.
 
 ## [0.13.0] - 2022-05-24
 

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
  "microbit-common",
  "microbit",

examples/analog-v1/Cargo.toml

@@ -6,11 +6,11 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = { version = "0.7.3", features = ["critical-section-single-core"]}
-cortex-m-rt = "0.7"
+cortex-m = { version = "0.7.7", features = ["critical-section-single-core"]}
+cortex-m-rt = "0.7.3"
 panic-halt = "0.2.0"
-defmt-rtt = "0.3.2"
-defmt = "0.3.1"
+defmt-rtt = "0.4.0"
+defmt = "0.3.6"
 
 # NOTE: This currently only works with the microbit v1 due to naming issues!
 # ADC vs SAADC

examples/analog-v1/src/main.rs

@@ -5,11 +5,10 @@ use defmt_rtt as _;
 use panic_halt as _;
 
 use cortex_m_rt::entry;
-
 use microbit::{
  board::Board,
  display::blocking::Display,
- hal::{adc::AdcConfig, prelude::*, Adc, Timer},
+ hal::{adc::AdcConfig, Adc, Timer},
 };
 
 #[entry]
@@ -66,33 +65,19 @@ fn main() -> ! {
  [0, 0, 1, 0, 0],
  ];
 
- #[allow(non_snake_case)]
- let letter_E = [
- [0, 1, 1, 1, 0],
- [0, 1, 0, 0, 0],
- [0, 1, 1, 0, 0],
- [0, 1, 0, 0, 0],
- [0, 1, 1, 1, 0],
- ];
-
  loop {
- let analog = adc.read(&mut anapin);
- match analog {
- Ok(v) => {
- let n_iter = numbers.iter();
- let mut count: usize = 0;
- for n_val in n_iter {
- if count == usize::from(i16::unsigned_abs(v / 100)) {
- display.show(&mut timer, *n_val, 10);
- break;
- }
- count += 1;
- }
- if count == numbers.len() {
- display.show(&mut timer, sign_plus, 10);
- }
+ let analog_value = adc.read_channel(&mut anapin);
+ let n_iter = numbers.iter();
+ let mut count: usize = 0;
+ for n_val in n_iter {
+ if count == usize::from(i16::unsigned_abs(analog_value / 100)) {
+ display.show(&mut timer, *n_val, 10);
+ break;
  }
- Err(_e) => display.show(&mut timer, letter_E, 10),
+ count += 1;
+ }
+ if count == numbers.len() {
+ display.show(&mut timer, sign_plus, 10);
  }
  }
  }

examples/analog-v2/Cargo.toml

@@ -6,11 +6,11 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = { version = "0.7.3", features = ["critical-section-single-core"]}
-cortex-m-rt = "0.7"
+cortex-m = { version = "0.7.7", features = ["critical-section-single-core"]}
+cortex-m-rt = "0.7.3"
 panic-halt = "0.2.0"
-defmt-rtt = "0.3.2"
-defmt = "0.3.1"
+defmt-rtt = "0.4.0"
+defmt = "0.3.6"
 
 # NOTE: This currently only works with the microbit v2 due to naming issues!
 # ADC vs SAADC

examples/analog-v2/src/main.rs

@@ -5,11 +5,10 @@ use defmt_rtt as _;
 use panic_halt as _;
 
 use cortex_m_rt::entry;
-
 use microbit::{
  board::Board,
  display::blocking::Display,
- hal::{prelude::*, saadc::SaadcConfig, Saadc, Timer},
+ hal::{saadc::SaadcConfig, Saadc, Timer},
 };
 
 #[entry]
@@ -76,7 +75,7 @@ fn main() -> ! {
  ];
 
  loop {
- let analog = adc.read(&mut anapin);
+ let analog = adc.read_channel(&mut anapin);
  match analog {
  Ok(v) => {
  let n_iter = numbers.iter();

examples/analog/Cargo.toml

@@ -6,11 +6,11 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = { version = "0.7.3", features = ["critical-section-single-core"]}
-cortex-m-rt = "0.7"
+cortex-m = { version = "0.7.7", features = ["critical-section-single-core"] }
+cortex-m-rt = "0.7.3"
 panic-halt = "0.2.0"
-defmt-rtt = "0.3.2"
-defmt = "0.3.1"
+defmt-rtt = "0.4.0"
+defmt = "0.3.6"
 
 [dependencies.microbit]
 path = "../../microbit"

examples/analog/src/main.rs

@@ -5,12 +5,11 @@ use defmt_rtt as _;
 use panic_halt as _;
 
 use cortex_m_rt::entry;
-
 use microbit::{
  adc::{Adc, AdcConfig, Default},
  board::Board,
  display::blocking::Display,
- hal::{prelude::*, Timer},
+ hal::Timer,
 };
 
 #[entry]
@@ -67,6 +66,7 @@ fn main() -> ! {
  [0, 0, 1, 0, 0],
  ];
 
+ #[cfg(feature = "v2")]
  #[allow(non_snake_case)]
  let letter_E = [
  [0, 1, 1, 1, 0],
@@ -77,23 +77,24 @@ fn main() -> ! {
  ];
 
  loop {
- let analog = adc.read(&mut anapin);
- match analog {
- Ok(v) => {
- let n_iter = numbers.iter();
- let mut count: usize = 0;
- for n_val in n_iter {
- if count == usize::from(i16::unsigned_abs(v / 100)) {
- display.show(&mut timer, *n_val, 10);
- break;
- }
- count += 1;
- }
- if count == numbers.len() {
- display.show(&mut timer, sign_plus, 10);
- }
+ let analog = adc.read_channel(&mut anapin);
+ #[cfg(feature = "v2")]
+ let Ok(analog) = analog
+ else {
+ display.show(&mut timer, letter_E, 10);
+ continue;
+ };
+ let n_iter = numbers.iter();
+ let mut count: usize = 0;
+ for n_val in n_iter {
+ if count == usize::from(i16::unsigned_abs(analog / 100)) {
+ display.show(&mut timer, *n_val, 10);
+ break;
  }
- Err(_e) => display.show(&mut timer, letter_E, 10),
+ count += 1;
+ }
+ if count == numbers.len() {
+ display.show(&mut timer, sign_plus, 10);
  }
  }
  }

examples/display-blocking/Cargo.toml

@@ -4,11 +4,12 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-cortex-m = { version = "0.7", features = ["critical-section-single-core"]}
-cortex-m-rt = "0.7"
+cortex-m = { version = "0.7.7", features = ["critical-section-single-core"] }
+cortex-m-rt = "0.7.3"
 panic-halt = "0.2.0"
-defmt-rtt = "0.4"
-defmt = "0.3.1"
+defmt-rtt = "0.4.0"
+defmt = "0.3.6"
+embedded-hal = "1.0.0"
 
 [dependencies.microbit]
 path = "../../microbit"

examples/display-blocking/src/main.rs

@@ -5,12 +5,8 @@ use defmt_rtt as _;
 use panic_halt as _;
 
 use cortex_m_rt::entry;
-
-use microbit::{
- board::Board,
- display::blocking::Display,
- hal::{prelude::*, Timer},
-};
+use embedded_hal::delay::DelayNs;
+use microbit::{board::Board, display::blocking::Display, hal::Timer};
 
 #[entry]
 fn main() -> ! {

examples/display-nonblocking/Cargo.toml

@@ -4,11 +4,11 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-cortex-m = { version = "0.7", features = ["critical-section-single-core"]}
-cortex-m-rt = "0.7"
+cortex-m = { version = "0.7.7", features = ["critical-section-single-core"] }
+cortex-m-rt = "0.7.3"
 panic-halt = "0.2.0"
-defmt-rtt = "0.4"
-defmt = "0.3.1"
+defmt-rtt = "0.4.0"
+defmt = "0.3.6"
 
 [dependencies.microbit]
 path = "../../microbit"

examples/display-nonblocking/src/main.rs

@@ -6,7 +6,6 @@ use panic_halt as _;
 
 use core::cell::RefCell;
 use cortex_m::interrupt::Mutex;
-use cortex_m::peripheral::Peripherals;
 use cortex_m_rt::entry;
 
 use microbit::{

examples/display-rtic/Cargo.toml

@@ -4,11 +4,11 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-cortex-m = { version = "0.7", features = ["critical-section-single-core"]}
+cortex-m = { version = "0.7.7", features = ["critical-section-single-core"] }
 panic-halt = "0.2.0"
-defmt-rtt = "0.4"
-defmt = "0.3.1"
-cortex-m-rtic = { version = "1.1" }
+defmt-rtt = "0.4.0"
+defmt = "0.3.6"
+cortex-m-rtic = { version = "1.1.4" }
 
 [dependencies.microbit]
 path = "../../microbit"

examples/display-text-rtic/Cargo.toml

@@ -4,11 +4,11 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-cortex-m = { version = "0.7", features = ["critical-section-single-core"]}
+cortex-m = { version = "0.7.7", features = ["critical-section-single-core"] }
 panic-halt = "0.2.0"
-defmt-rtt = "0.4"
-defmt = "0.3.1"
-cortex-m-rtic = { version = "1.0.0" }
+defmt-rtt = "0.4.0"
+defmt = "0.3.6"
+cortex-m-rtic = { version = "1.1.4" }
 microbit-text = "1.0.0"
 
 [dependencies.microbit]

examples/gpio-direct-blinky/Cargo.toml

@@ -4,10 +4,10 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-cortex-m = { version = "0.7", features = ["critical-section-single-core"]}
-cortex-m-rt = "0.7"
+cortex-m = { version = "0.7.7", features = ["critical-section-single-core"] }
+cortex-m-rt = "0.7.3"
 panic-halt = "0.2.0"
-defmt = "0.3.1"
+defmt = "0.3.6"
 
 [dependencies.microbit]
 path = "../../microbit"

examples/gpio-hal-blinky/Cargo.toml

@@ -4,11 +4,11 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-embedded-hal = "0.2.4"
-cortex-m-rt = "0.7"
+embedded-hal = "1.0.0"
+cortex-m-rt = "0.7.3"
 panic-halt = "0.2.0"
-defmt-rtt = "0.4"
-defmt = "0.3.1"
+defmt-rtt = "0.4.0"
+defmt = "0.3.6"
 
 [dependencies.microbit]
 path = "../../microbit"

examples/gpio-hal-blinky/src/main.rs

@@ -4,7 +4,7 @@
 use panic_halt as _;
 
 use cortex_m_rt::entry;
-use embedded_hal::{blocking::delay::DelayMs, digital::v2::OutputPin};
+use embedded_hal::{delay::DelayNs, digital::OutputPin};
 use microbit::{board::Board, hal::timer::Timer};
 
 #[entry]
@@ -18,8 +18,8 @@ fn main() -> ! {
 
  loop {
  let _ = row1.set_low();
- timer.delay_ms(1_000_u16);
+ timer.delay_ms(1_000);
  let _ = row1.set_high();
- timer.delay_ms(1_000_u16);
+ timer.delay_ms(1_000);
  }
 }

examples/gpio-hal-ledbutton/Cargo.toml

@@ -4,11 +4,12 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-cortex-m = { version = "0.7", features = ["critical-section-single-core"]}
-cortex-m-rt = "0.7"
+cortex-m = { version = "0.7.7", features = ["critical-section-single-core"]}
+cortex-m-rt = "0.7.3"
 panic-halt = "0.2.0"
-defmt-rtt = "0.4"
-defmt = "0.3.1"
+defmt-rtt = "0.4.0"
+defmt = "0.3.6"
+embedded-hal = "1.0.0"
 
 [dependencies.microbit]
 path = "../../microbit"

examples/gpio-hal-ledbutton/src/main.rs

@@ -5,7 +5,8 @@ use defmt_rtt as _;
 use panic_halt as _;
 
 use cortex_m_rt::entry;
-use microbit::{board::Board, hal::prelude::*};
+use embedded_hal::digital::{InputPin, OutputPin};
+use microbit::board::Board;
 
 #[entry]
 fn main() -> ! {

examples/gpio-hal-printbuttons/Cargo.toml

@@ -4,11 +4,11 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-cortex-m = { version = "0.7", features = ["critical-section-single-core"]}
-cortex-m-rt = "0.7"
+cortex-m = { version = "0.7.7", features = ["critical-section-single-core"]}
+cortex-m-rt = "0.7.3"
 panic-halt = "0.2.0"
-defmt-rtt = "0.4"
-defmt = "0.3.1"
+defmt-rtt = "0.4.0"
+defmt = "0.3.6"
 
 [dependencies.microbit]
 path = "../../microbit"