diff options
| -rw-r--r-- | src/devices/features/tier1.rs | 25 | ||||
| -rw-r--r-- | src/lib.rs | 4 | ||||
| -rw-r--r-- | tests/ads1x1x_i2c.rs | 4 |
3 files changed, 27 insertions, 6 deletions
diff --git a/src/devices/features/tier1.rs b/src/devices/features/tier1.rs index 30e900e..bd19419 100644 --- a/src/devices/features/tier1.rs +++ b/src/devices/features/tier1.rs @@ -1,8 +1,29 @@ //! Common functions -use { Ads1x1x, DataRate, Error, Register, BitFlags, interface }; +use { Ads1x1x, DataRate12Bit, Error, Register, BitFlags, interface, ic }; + +impl<DI, IC, MODE, E> Ads1x1x<DI, IC, ic::Resolution12Bit, MODE> +where + DI: interface::WriteData<Error = E>, +{ + /// Set data rate + pub fn set_data_rate(&mut self, rate: DataRate12Bit) -> Result<(), Error<E>> { + let config; + match rate { + DataRate12Bit::Sps128 => config = self.config.with_low( BitFlags::DR2).with_low( BitFlags::DR1).with_low( BitFlags::DR0), + DataRate12Bit::Sps250 => config = self.config.with_low( BitFlags::DR2).with_low( BitFlags::DR1).with_high(BitFlags::DR0), + DataRate12Bit::Sps490 => config = self.config.with_low( BitFlags::DR2).with_high(BitFlags::DR1).with_low( BitFlags::DR0), + DataRate12Bit::Sps920 => config = self.config.with_low( BitFlags::DR2).with_high(BitFlags::DR1).with_high(BitFlags::DR0), + DataRate12Bit::Sps1600 => config = self.config.with_high(BitFlags::DR2).with_low( BitFlags::DR1).with_low( BitFlags::DR0), + DataRate12Bit::Sps2400 => config = self.config.with_high(BitFlags::DR2).with_low( BitFlags::DR1).with_high(BitFlags::DR0), + DataRate12Bit::Sps3300 => config = self.config.with_high(BitFlags::DR2).with_high(BitFlags::DR1).with_low( BitFlags::DR0), + } + self.iface.write_register(Register::CONFIG, config.bits)?; + self.config = config; + Ok(()) + } +} -impl<DI, IC, CONV, MODE, E> Ads1x1x<DI, IC, CONV, MODE> where DI: interface::WriteData<Error = E> { @@ -131,9 +131,9 @@ pub mod mode { pub struct Continuous(()); } -/// Data rate +/// Data rate for ADS1013, ADS1014, ADS1015, ADS1018 #[derive(Debug, Clone, PartialEq)] -pub enum DataRate { +pub enum DataRate12Bit { /// 128 SPS Sps128, /// 250 SPS diff --git a/tests/ads1x1x_i2c.rs b/tests/ads1x1x_i2c.rs index e3dbf21..9470c01 100644 --- a/tests/ads1x1x_i2c.rs +++ b/tests/ads1x1x_i2c.rs @@ -2,7 +2,7 @@ extern crate embedded_hal; extern crate embedded_hal_mock as hal; use hal::i2c::Transaction as I2cTrans; extern crate ads1x1x; -use ads1x1x::DataRate; +use ads1x1x::DataRate12Bit; #[macro_use] mod common; @@ -16,7 +16,7 @@ macro_rules! test_set_data_rate { fn $name() { let transactions = [ I2cTrans::write(DEV_ADDR, vec![Register::CONFIG, $config.msb(), $config.lsb()]) ]; let mut dev = new_ads1013(&transactions); - dev.set_data_rate(DataRate::$variant).unwrap(); + dev.set_data_rate(DataRate12Bit::$variant).unwrap(); destroy_ads1013(dev); } } |