fixed ch 10, started ch 9

rust-embedded · Jul 8, 2024 · 645cee7 · 645cee7
1 parent c79cc39
commit 645cee7
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 47 deletions.
diff --git a/mdbook/src/09-led-compass/Cargo.toml b/mdbook/src/09-led-compass/Cargo.toml
@@ -6,10 +6,13 @@ edition = "2021"
 
 [dependencies]
 microbit-v2 = "0.15.0"
-cortex-m = "0.7.7"
 cortex-m-rt = "0.7.3"
 rtt-target = "0.5.0"
 panic-rtt-target = "0.1.3"
 lsm303agr = "1.1.0"
 libm = "0.2.8"
 embedded-hal = "1.0.0"
+
+[dependencies.cortex-m]
+version = "0.7.7"
+features = ["critical-section-single-core"]
diff --git a/mdbook/src/09-led-compass/src/calibration.rs b/mdbook/src/09-led-compass/src/calibration.rs
@@ -1,8 +1,8 @@
 //! Translated from <https://github.com/lancaster-university/codal-microbit-v2/blob/006abf5566774fbcf674c0c7df27e8a9d20013de/source/MicroBitCompassCalibrator.cpp>
 
 use core::fmt::Debug;
-use embedded_hal::blocking::delay::DelayUs;
-use embedded_hal::blocking::i2c::{Write, WriteRead};
+use embedded_hal::i2c::I2c;
+use embedded_hal::delay::DelayNs;
 use libm::{fabsf, sqrtf};
 use lsm303agr::interface::I2cInterface;
 use lsm303agr::mode::MagContinuous;
@@ -43,8 +43,8 @@ pub fn calc_calibration<I, T, E>(
     timer: &mut T,
 ) -> Calibration
 where
-    T: DelayUs<u32>,
-    I: Write<Error = E> + WriteRead<Error = E>,
+    T: DelayNs,
+    I: I2c,
     E: Debug,
 {
     let data = get_data(sensor, display, timer);
@@ -57,8 +57,8 @@ fn get_data<I, T, E>(
     timer: &mut T,
 ) -> [Measurement; 25]
 where
-    T: DelayUs<u32>,
-    I: Write<Error = E> + WriteRead<Error = E>,
+    T: DelayNs,
+    I: I2c,
     E: Debug,
 {
     let mut leds = [

diff --git a/mdbook/src/10-punch-o-meter/Cargo.toml b/mdbook/src/10-punch-o-meter/Cargo.toml
@@ -6,9 +6,11 @@ edition = "2021"
 
 [dependencies]
 microbit-v2 = "0.15.0"
-cortex-m = "0.7.7"
 cortex-m-rt = "0.7.3"
 rtt-target = "0.5.0"
 panic-rtt-target = "0.1.3"
 lsm303agr = "1.1.0"
-nb = "1.1.0"
+
+[dependencies.cortex-m]
+version = "0.7.7"
+features = ["inline-asm", "critical-section-single-core"]
diff --git a/mdbook/src/10-punch-o-meter/build.rs b/mdbook/src/10-punch-o-meter/build.rs
diff --git a/mdbook/src/10-punch-o-meter/memory.x b/mdbook/src/10-punch-o-meter/memory.x
diff --git a/mdbook/src/10-punch-o-meter/src/main.rs b/mdbook/src/10-punch-o-meter/src/main.rs
@@ -2,14 +2,17 @@
 #![no_main]
 #![no_std]
 
+use cortex_m::asm::wfi;
 use cortex_m_rt::entry;
-use rtt_target::rtt_init_print;
 use panic_rtt_target as _;
+use rtt_target::rtt_init_print;
 
 #[entry]
 fn main() -> ! {
     rtt_init_print!();
     let _board = microbit::Board::take().unwrap();
 
-    loop {}
+    loop {
+        wfi();
+    }
 }