Change: embedded_hal dependency to 0.2.6 (stable)

Author: Lucian Carata

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sensor-temp-humidity-sht40"
-version = "0.2.0"
+version = "0.2.6"
 authors = ["Lucian Carata <[email protected]>"]
 license = "BSD-3-Clause OR Apache-2.0"
 description = "Driver for SHT40 temperature and humidity sensor"
@@ -12,11 +12,12 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-sensirion-i2c = { git="https://github.com/lc525/sensirion-i2c-rs", branch="hal-1.0.0-alpha.6" }
-embedded-hal = "1.0.0-alpha.6"
+sensirion-i2c = "0.1.1"
+embedded-hal = "0.2.6"
 
 [dev-dependencies]
-embedded-hal-mock = { git="https://github.com/niclashoyer/embedded-hal-mock", branch="hal-1.0.0" }
+linux-embedded-hal = "0.3.2"
+embedded-hal-mock = "0.8.0"
 float-cmp = "0.9.0"
 
 [profile.release]

README.md

@@ -7,11 +7,8 @@ driver for the Sensirion SHT40 temperature and relative-humidity sensor.
 
 ### Software 
 
-The driver is developed against the unstable 1.0.0 version of
-embedded-hal (currently supporting embedded-hal-1.0.0-alpha.6). As such, it
-should also be considered unstable. 
-
-A release is planned for the older, stable version of embedded-hal.
+The driver is developed against the stable 0.2.6 version of
+embedded-hal. Please use the main branch for hal-1.0.0 support
 
 ### Hardware Features
 

src/lib.rs

@@ -13,9 +13,8 @@
 ///
 /// By depending on embedded-hal, this driver is platform-agnostic and can be 
 /// used with any platform for which an implementation of the embedded-hal
-/// traits exists. Please note that this branch tracks the unstable development
-/// version of embedded-hal-1.0.0
-///
+/// traits exists. 
+/// 
 /// The full details about the SHT40 sensor can be read in its datasheet:
 /// https://www.sensirion.com/fileadmin/user_upload/customers/sensirion/Dokumente/2_Humidity_Sensors/Datasheets/Sensirion_Humidity_Sensors_SHT4x_Datasheet.pdf
 ///
@@ -28,7 +27,7 @@
 /// driver; For example, assuming you have connected a SH40 sensor to a linux
 /// machine and it is detected as an i2c device:
 ///
-/// ```ignore
+/// ```no_run
 /// use linux_embedded_hal as hal;
 ///
 /// use hal::{I2cdev, Delay};
@@ -50,8 +49,8 @@
 
 use embedded_hal as hal;
 
-use hal::delay::blocking::DelayUs;
-use hal::i2c::blocking::{Read, Write, WriteRead};
+use hal::blocking::delay::DelayMs;
+use hal::blocking::i2c::{Read, Write, WriteRead};
 
 use sensirion_i2c::{crc8, i2c};
 
@@ -158,8 +157,8 @@ pub enum TempUnit {
 /// SHT40Driver is the main structure with which a user of this driver
 /// interracts. It is generic over two parameters implementing embedded_hal 
 /// traits for the specific platform you're using: I2c which must implement 
-/// embedded_hal::i2c::blocking::{Read, Write, WriteRead} and Delay which must
-/// implement embedded_hal::delay::blocking::DelayUS.
+/// embedded_hal::blocking::i2c::{Read, Write, WriteRead} and Delay which must
+/// implement embedded_hal::blocking::delay::DelayMs.
 /// 
 /// Those implementations are needed for issuing I2C write commands to the 
 /// sensor, waiting until the sensor has performed the actual measurement and
@@ -308,7 +307,7 @@ impl Command {
 impl<I2C, D, E> SHT40Driver<I2C, D>
 where
     I2C: Read<Error = E> + Write<Error = E> + WriteRead<Error = E>,
-    D: DelayUs
+    D: DelayMs<u16>
 {
     /// Initialize a new instance of the driver. Any synchronization required
     /// for dealing with multiple instances needs to be managed externally to
@@ -377,11 +376,9 @@ where
     fn i2c_command_and_response(&mut self, cmd: Command, rx_bytes: Option<&mut [u8]>)
         -> Result<(), Error<E>>{
         let dev_cmd = cmd.as_device_command();
-        i2c::write_command_u8(&mut self.i2c, self.address, dev_cmd.cmd_code)
+        self.i2c.write(self.address, &dev_cmd.cmd_code.to_be_bytes())
             .map_err(|err| { Error::I2c(err) })?;
-        if let Err(_) = self.delay.delay_ms(dev_cmd.max_duration_ms as u32) {
-            return Err(Error::<E>::DelayError)
-        }
+        self.delay.delay_ms(dev_cmd.max_duration_ms);
         if let Some(rx_bytes) = rx_bytes {
             i2c::read_words_with_crc(&mut self.i2c, self.address, rx_bytes)?;
         };
@@ -544,7 +541,7 @@ where
     pub fn soft_reset_device(&mut self) -> Result<(), Error<E>> {
         let cmd = Command::SoftReset;
         let dev_cmd = cmd.as_device_command();
-        i2c::write_command_u8(&mut self.i2c, self.address, dev_cmd.cmd_code)
+        self.i2c.write(self.address, &dev_cmd.cmd_code.to_be_bytes())
             .map_err(|err| { Error::I2c(err) })?;
         Ok(())
     }