From 311103b79eb800a756c7ae5b771921322ff92459 Mon Sep 17 00:00:00 2001 From: Diego Barrios Romero Date: Sat, 17 Nov 2018 07:43:01 +0100 Subject: Add support for setting the comparator queue --- src/devices/features/tier2.rs | 18 +++++++++++++++++- src/lib.rs | 13 +++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/devices/features/tier2.rs b/src/devices/features/tier2.rs index 17502e6..25b618a 100644 --- a/src/devices/features/tier2.rs +++ b/src/devices/features/tier2.rs @@ -3,7 +3,7 @@ //! These are the features included only in ADS1x14, ADS1x15 use { Ads1x1x, Error, interface, ic, ComparatorMode, ComparatorPolarity, - ComparatorLatching, Register, BitFlags, conversion }; + ComparatorLatching, ComparatorQueue, Register, BitFlags, conversion }; impl Ads1x1x where @@ -58,6 +58,22 @@ where self.config = config; Ok(()) } + + /// Activate comparator and set the alert queue + /// + /// The comparator can be disabled with [`disable_comparator()`](struct.Ads1x1x.html#method.disable_comparator) + pub fn set_comparator_queue(&mut self, queue: ComparatorQueue) -> Result<(), Error> { + let config; + match queue { + ComparatorQueue::One => config = self.config.with_low( BitFlags::COMP_QUE1).with_low( BitFlags::COMP_QUE0), + ComparatorQueue::Two => config = self.config.with_low( BitFlags::COMP_QUE1).with_high(BitFlags::COMP_QUE0), + ComparatorQueue::Four => config = self.config.with_high(BitFlags::COMP_QUE1).with_low( BitFlags::COMP_QUE0) + } + self.iface.write_register(Register::CONFIG, config.bits)?; + self.config = config; + Ok(()) + } + /// Disable comparator (default) /// /// This will set the ALERT/RDY pin to high-impedance. diff --git a/src/lib.rs b/src/lib.rs index b7b3ce0..9680ea3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -12,6 +12,7 @@ //! - Set the comparator mode. See: [`set_comparator_mode()`]. //! - Set the comparator polarity. See: [`set_comparator_polarity()`]. //! - Set the comparator latching. See: [`set_comparator_latching()`]. +//! - Set the comparator queue. See: [`set_comparator_queue()`]. //! - Disable the comparator. See: [`disable_comparator()`]. //! //! [`into_continuous()`]: struct.Ads1x1x.html#method.into_continuous @@ -21,6 +22,7 @@ //! [`set_comparator_mode()`]: struct.Ads1x1x.html#method.set_comparator_mode //! [`set_comparator_polarity()`]: struct.Ads1x1x.html#method.set_comparator_polarity //! [`set_comparator_latching()`]: struct.Ads1x1x.html#method.set_comparator_latching +//! [`set_comparator_queue()`]: struct.Ads1x1x.html#method.set_comparator_queue //! [`disable_comparator()`]: struct.Ads1x1x.html#method.disable_comparator //! //! ## The devices @@ -220,6 +222,17 @@ pub enum ComparatorLatching { Latching } +/// Comparator alert queue (only for ADS1x14, ADS1x15) +#[derive(Debug, Clone, PartialEq)] +pub enum ComparatorQueue { + /// Activate comparator and assert after one conversion exceeding thresholds + One, + /// Activate comparator and assert after two consecutive conversions exceeding thresholds + Two, + /// Activate comparator and assert after four consecutive conversions exceeding thresholds + Four, +} + /// Possible slave addresses #[derive(Debug, Clone)] pub enum SlaveAddr { -- cgit v1.2.3-70-g09d2