more testing

sfy-buoy/Cargo.toml

@@ -63,6 +63,7 @@ ism330dhcx = { git = "https://github.com/gauteh/ism330dhcx", branch = "gyro-acce
 cmsis_dsp = { git = "https://github.com/samcrow/cmsis_dsp.rs" }
 embedded-sdmmc = { git = "https://github.com/rust-embedded-community/embedded-sdmmc-rs", rev="3b5c026d" }
 one-wire-bus = { path = "../../../../dev/embedded/one-wire-bus" }
+ds18b20 = { path = "../../../../dev/embedded/ds18b20" }
 # embedded-sdmmc = { git = "https://github.com/gauteh/embedded-sdmmc-rs", branch = "sdmmc-spi-borrow" }
 # embedded-sdmmc = { path = "../../../../dev/embedded/embedded-sdmmc-rs" }
 

sfy-buoy/src/temp.rs

@@ -1,4 +1,6 @@
+use core::convert::Infallible;
 use core::fmt::Debug;
+use core::marker::PhantomData;
 use embedded_hal::blocking::delay::{DelayMs, DelayUs};
 use embedded_hal::digital::v2::{InputPin, OutputPin};
 
@@ -16,8 +18,10 @@ enum TempsState {
     Failed(i64),   // failure, with timestamp (millis) since failure
 }
 
-pub struct Temps<P: OutputPin<Error = E> + InputPin<Error = E>, E: Debug> {
-    wire: OneWire<P>,
+type E = Infallible;
+
+pub struct Temps {
+    wire: OneWire,
     probes: Vec<Probe, MAX_PROBES>,
     resolution: ds18b20::Resolution,
     state: TempsState,
@@ -28,11 +32,11 @@ pub struct Probe {
     pub sensor: ds18b20::Ds18b20,
 }
 
-impl<P: OutputPin<Error = E> + InputPin<Error = E>, E: Debug> Temps<P, E> {
+impl Temps {
     /// Scan for devices, init and set up logging.
     ///
     /// Can be re-run to reset.
-    pub fn new(w: P, delay: &mut impl DelayUs<u16>) -> Result<Temps<P, E>, OneWireError<E>> {
+    pub fn new(w: one_wire_bus::TI, delay: &mut impl DelayUs<u16>) -> Result<Temps, OneWireError<E>> {
         defmt::info!("setting up temperature sensors..");
         let mut wire = OneWire::new(w)?;
         let resolution = ds18b20::Resolution::Bits12;
@@ -151,9 +155,9 @@ impl<P: OutputPin<Error = E> + InputPin<Error = E>, E: Debug> Temps<P, E> {
 }
 
 impl Probe {
-    pub fn new<P: OutputPin<Error = E> + InputPin<Error = E>, E: Debug>(
+    pub fn new(
         address: Address,
-        wire: &mut OneWire<P>,
+        wire: &mut OneWire,
         resolution: ds18b20::Resolution,
         delay: &mut impl DelayUs<u16>,
     ) -> Result<Probe, OneWireError<E>> {

sfy-buoy/target-test/tests/temp_sensor.rs

@@ -124,10 +124,10 @@ mod tests {
         let mut led = pins.d19.into_push_pull_output();
 
         // pin D8 (on artemis nano)
-        // let mut tp = pins.d8.into_input_output();
-        let mut tp = pins.d10.into_input_output();
+        let mut tp = pins.d8.into_input();
+        // let mut tp = pins.d10.into_input_output();
         // tp.internal_pull_up(true);
-        tp.open_drain();
+        // tp.open_drain();
         // tp.set_high().ok();
         // assert_eq!(tp.is_high().unwrap(), true);