From e012a0a1d7f5f0c46b3d4cc1136160c1762cb63b Mon Sep 17 00:00:00 2001 From: Diego Barrios Romero Date: Sat, 17 Nov 2018 08:06:25 +0100 Subject: Add FSR to device struct --- src/construction/i2c.rs | 3 ++- src/devices/mode/continuous.rs | 1 + src/devices/mode/oneshot.rs | 1 + src/lib.rs | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/construction/i2c.rs b/src/construction/i2c.rs index 4fa4177..8c63a4b 100644 --- a/src/construction/i2c.rs +++ b/src/construction/i2c.rs @@ -3,7 +3,7 @@ extern crate embedded_hal as hal; use hal::blocking; use core::marker::PhantomData; -use { Ads1x1x, DEVICE_BASE_ADDRESS, SlaveAddr, ic, Config, mode }; +use { Ads1x1x, DEVICE_BASE_ADDRESS, SlaveAddr, ic, Config, mode, FullScaleRange }; use interface::I2cInterface; @@ -21,6 +21,7 @@ macro_rules! impl_new_destroy { address: address.addr(DEVICE_BASE_ADDRESS) }, config: Config::default(), + fsr: FullScaleRange::default(), a_conversion_was_started: false, _conv: PhantomData, _ic: PhantomData, diff --git a/src/devices/mode/continuous.rs b/src/devices/mode/continuous.rs index e90b1ae..cb62f8d 100644 --- a/src/devices/mode/continuous.rs +++ b/src/devices/mode/continuous.rs @@ -14,6 +14,7 @@ where Ok(Ads1x1x { iface: self.iface, config: self.config, + fsr: self.fsr, a_conversion_was_started: self.a_conversion_was_started, _conv: PhantomData, _ic: PhantomData, diff --git a/src/devices/mode/oneshot.rs b/src/devices/mode/oneshot.rs index de7e11e..9563286 100644 --- a/src/devices/mode/oneshot.rs +++ b/src/devices/mode/oneshot.rs @@ -17,6 +17,7 @@ where Ok(Ads1x1x { iface: self.iface, config: self.config, + fsr: self.fsr, a_conversion_was_started: self.a_conversion_was_started, _conv: PhantomData, _ic: PhantomData, diff --git a/src/lib.rs b/src/lib.rs index bb7112b..1a34b6f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -405,6 +405,7 @@ impl Default for FullScaleRange { pub struct Ads1x1x { iface: DI, config: Config, + fsr: FullScaleRange, a_conversion_was_started: bool, _conv: PhantomData, _ic: PhantomData, -- cgit v1.2.3-54-g00ecf