From b3ca672f70c71194da40a7670549a8264c13d971 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Fri, 12 Jan 2024 20:24:51 +0100 Subject: Update to `embedded-hal` 1.0. --- examples/all_channels.rs | 9 ++++----- examples/linux.rs | 3 +-- examples/typed.rs | 5 ++--- 3 files changed, 7 insertions(+), 10 deletions(-) (limited to 'examples') diff --git a/examples/all_channels.rs b/examples/all_channels.rs index 888737c..ddf8326 100644 --- a/examples/all_channels.rs +++ b/examples/all_channels.rs @@ -1,4 +1,3 @@ -use embedded_hal::adc::OneShot; use linux_embedded_hal::I2cdev; use nb::block; @@ -9,10 +8,10 @@ fn main() { let address = SlaveAddr::default(); let mut adc = Ads1x1x::new_ads1015(dev, address); let values = [ - block!(adc.read(&mut channel::SingleA0)).unwrap(), - block!(adc.read(&mut channel::SingleA1)).unwrap(), - block!(adc.read(&mut channel::SingleA2)).unwrap(), - block!(adc.read(&mut channel::SingleA3)).unwrap(), + block!(adc.read(channel::SingleA0)).unwrap(), + block!(adc.read(channel::SingleA1)).unwrap(), + block!(adc.read(channel::SingleA2)).unwrap(), + block!(adc.read(channel::SingleA3)).unwrap(), ]; for (channel, value) in values.iter().enumerate() { println!("Channel {}: {}", channel, value); diff --git a/examples/linux.rs b/examples/linux.rs index 7364816..55eab64 100644 --- a/examples/linux.rs +++ b/examples/linux.rs @@ -1,4 +1,3 @@ -use embedded_hal::adc::OneShot; use linux_embedded_hal::I2cdev; use nb::block; @@ -8,7 +7,7 @@ fn main() { let dev = I2cdev::new("/dev/i2c-1").unwrap(); let address = SlaveAddr::default(); let mut adc = Ads1x1x::new_ads1013(dev, address); - let value = block!(adc.read(&mut channel::DifferentialA0A1)).unwrap(); + let value = block!(adc.read(channel::DifferentialA0A1)).unwrap(); println!("Measurement: {}", value); // get I2C device back let _dev = adc.destroy_ads1013(); diff --git a/examples/typed.rs b/examples/typed.rs index 61268cf..6d6961c 100644 --- a/examples/typed.rs +++ b/examples/typed.rs @@ -1,12 +1,11 @@ // This example demonstrates the use of a type alias for the `Ads1x1x` struct // to ease usage in signatures. -use embedded_hal::adc::OneShot; use linux_embedded_hal::I2cdev; use nb::block; use ads1x1x::{ - channel::SingleA0, + channel, ic::{Ads1115, Resolution16Bit}, interface::I2cInterface, Ads1x1x, SlaveAddr, @@ -18,7 +17,7 @@ type Adc = Ads1x1x, Ads1115, Resolution16Bit, ads1x1x::mode /// Read a single value from channel A. /// Returns 0 on Error. pub fn read(adc: &mut Adc) -> i16 { - block!(adc.read(&mut SingleA0)).unwrap_or(0) + block!(adc.read(channel::SingleA0)).unwrap_or(0) } fn main() { -- cgit v1.2.3-54-g00ecf