From aca98e4951a3e4740cd95a0092ae536da6a903bd Mon Sep 17 00:00:00 2001 From: Colin Wong Date: Fri, 5 Apr 2024 09:19:17 -0400 Subject: [PATCH] Update embedded hal to 1.0.0 (#23) * Update embedded hal * Call done on the mock --------- Co-authored-by: Robosub UTD --- Cargo.toml | 6 +++--- src/lib.rs | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 33cd24d..22234c0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,13 +12,13 @@ categories = ["embedded"] keywords = ["magnetometer", "sensor", "embedded", "ak09915", "AsahiKASEI"] [dependencies] -embedded-hal = "0.2.5" +embedded-hal = "1.0.0" [dev-dependencies] clap = { version = "4.2.2", features = ["derive"] } criterion = { version = "0.5.1", features = ["html_reports"] } -embedded-hal-mock = "0.9.0" -linux-embedded-hal = "0.3.2" +embedded-hal-mock = { version = "0.10.0", features = ["eh1"] } +linux-embedded-hal = "0.4" [[bench]] name = "bench" diff --git a/src/lib.rs b/src/lib.rs index 5fdb9c1..27c45c0 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ -use embedded_hal::blocking::i2c::{Write, WriteRead}; +use embedded_hal::i2c::I2c; const AK09915_ADDRESS: u8 = 0x0C; ///Magnetic sensor sensitivity (BSE) for Ta = 25 ˚C [µT/LSB], Typical 0.15 +- 0.0075 @@ -87,7 +87,7 @@ pub struct Ak09915 { impl Ak09915 where - I2C: Write + WriteRead, + I2C: I2c, { pub fn new(i2c: I2C) -> Self { Self { @@ -283,7 +283,7 @@ where #[cfg(test)] mod tests { use super::*; - use embedded_hal_mock::i2c::{Mock as I2cMock, Transaction as I2cTrans}; + use embedded_hal_mock::eh1::i2c::{Mock as I2cMock, Transaction as I2cTrans}; #[test] fn read_sensor() { let expected_trans = [ @@ -307,5 +307,7 @@ mod tests { assert_eq!(x, 0x2304); assert_eq!(y, 0x2405); assert_eq!(z, 0x2506); + + sensor.i2c.done(); } }