Update to latest embedded-hal, include std example

Cargo.toml

@@ -11,30 +11,26 @@ keywords = ["scale", "hx711", "loadcell", "no-std", "driver"]
 categories = ["no-std", "embedded", "hardware-support", "science::robotics"]
 
 [dependencies]
+esp32-hal = { version = "0.18.0", optional = true, features = ["eh1"] }
 critical-section = "1.1.2"
-embedded-hal = { version = "0.2.7", features = ["unproven"] }
-esp32-hal = { version = "0.17.0", optional = true }
+embedded-hal = { version = "1.0.0" }
 
 [features]
 default = []
 esp32_interrupt = ["esp32-hal"]
 
-
 [[example]]
 name = "interrupt"
 required-features = ["esp32_interrupt"]
 
-[[example]]
-name = "polling"
-required-features = ["esp32_interrupt"]
 
 [dev-dependencies]
-esp-backtrace = { version = "0.8.0", features = [
+esp-backtrace = { version = "0.11.0", features = [
     "esp32",
     "panic-handler",
     "exception-handler",
-    "print-uart",
+    "println",
 ] }
-esp-println = { version = "0.6.0", features = ["esp32", "log"] }
+esp-println = { version = "0.9.0", features = ["esp32", "log"] }
 log = { version = "0.4.18" }
 critical-section = "1.1.2"

examples/interrupt.rs

@@ -40,7 +40,7 @@ static HX711_MUTEX: Mutex<RefCell<Option<HX711<SckPin, DTPin, Delay>>>> =
 #[entry]
 fn main() -> ! {
     let peripherals = Peripherals::take();
-    let system = peripherals.DPORT.split();
+    let system = peripherals.SYSTEM.split();
     let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
     let mut delay = Delay::new(&clocks);
 

examples/polling.rs

@@ -11,7 +11,7 @@ use loadcell::{hx711, LoadCell};
 #[entry]
 fn main() -> ! {
     let periph = Peripherals::take();
-    let system = periph.DPORT.split();
+    let system = periph.SYSTEM.split();
 
     let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 

examples/polling_idf.rs

@@ -0,0 +1,25 @@
+// currently does not build in in this no-std environment. copy the code elsewhere
+use esp_idf_svc::hal::{delay, gpio::PinDriver, peripherals::Peripherals};
+use loadcell::{hx711::HX711, LoadCell};
+
+fn main() {
+    esp_idf_svc::sys::link_patches();
+    esp_idf_svc::log::EspLogger::initialize_default();
+
+    let peripherals = Peripherals::take().unwrap();
+    let dt = PinDriver::input(peripherals.pins.gpio1).unwrap();
+    let sck = PinDriver::output(peripherals.pins.gpio10).unwrap();
+    let mut load_sensor = HX711::new(sck, dt, delay::FreeRtos);
+
+    load_sensor.tare(16);
+    load_sensor.set_scale(1.0);
+
+    loop {
+        if load_sensor.is_ready() {
+            let reading = load_sensor.read_scaled();
+            log::info!("Last Reading = {:?}", reading);
+        }
+
+        delay::FreeRtos::delay_ms(1000u32);
+    }
+}

src/hx711.rs

@@ -10,9 +10,8 @@ pub mod interrupt;
 #[cfg(feature = "esp32_interrupt")]
 pub use interrupt::*;
 
-use embedded_hal::blocking::delay::DelayUs;
-
-use embedded_hal::digital::v2::{InputPin, OutputPin};
+use embedded_hal::delay::DelayNs;
+use embedded_hal::digital::{InputPin, OutputPin};
 
 #[cfg(feature = "default")]
 use crate::LoadCell;
@@ -46,7 +45,7 @@ pub struct HX711<SckPin, DTPin, Delay>
 where
     SckPin: OutputPin,
     DTPin: InputPin,
-    Delay: DelayUs<u32>,
+    Delay: DelayNs,
 {
     sck_pin: SckPin,
     dt_pin: DTPin,
@@ -72,7 +71,7 @@ impl<SckPin, DTPin, Delay, ESCK, EDT> HX711<SckPin, DTPin, Delay>
 where
     SckPin: OutputPin<Error = ESCK>,
     DTPin: InputPin<Error = EDT>,
-    Delay: DelayUs<u32>,
+    Delay: DelayNs,
     EDT: fmt::Debug,
     ESCK: fmt::Debug,
 {
@@ -91,7 +90,7 @@ where
     }
 
     /// Returns true if the load cell amplifier has a value ready to be read.
-    pub fn is_ready(&self) -> bool {
+    pub fn is_ready(&mut self) -> bool {
         self.dt_pin.is_low().unwrap()
     }
 
@@ -178,7 +177,7 @@ impl<SckPin, DTPin, Delay, ESCK, EDT> LoadCell for HX711<SckPin, DTPin, Delay>
 where
     SckPin: OutputPin<Error = ESCK>,
     DTPin: InputPin<Error = EDT>,
-    Delay: DelayUs<u32>,
+    Delay: DelayNs,
     ESCK: fmt::Debug,
     EDT: fmt::Debug,
 {

src/hx711/interrupt.rs

@@ -30,9 +30,9 @@ pub trait Interrupt: LoadCell {
 #[cfg(feature = "esp32_interrupt")]
 impl<SckPin, DTPin, Delay> Interrupt for HX711<SckPin, DTPin, Delay>
 where
-    SckPin: OutputPin + embedded_hal::digital::v2::OutputPin<Error = Infallible>,
-    DTPin: InputPin + embedded_hal::digital::v2::InputPin<Error = Infallible>,
-    Delay: embedded_hal::blocking::delay::DelayUs<u32>,
+    SckPin: OutputPin + embedded_hal::digital::OutputPin<Error = Infallible>,
+    DTPin: InputPin + embedded_hal::digital::InputPin<Error = Infallible>,
+    Delay: embedded_hal::delay::DelayNs,
 {
     fn tare_sync(&mut self, num_samples: usize) {
         let mut was_listening = false;