summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDiego Barrios Romero <eldruin@gmail.com>2018-11-21 08:11:15 +0100
committerDiego Barrios Romero <eldruin@gmail.com>2018-11-21 08:11:15 +0100
commiteb0c438e9dbad47a9cf2c24610233b0224f7e269 (patch)
tree6f897520ce5bc9d5963d760f99173b6ce50fc2ae /src
parent0ae97c430f4082e94730a1b220f75db1add65270 (diff)
downloadads1x1x-async-eb0c438e9dbad47a9cf2c24610233b0224f7e269.tar.gz
ads1x1x-async-eb0c438e9dbad47a9cf2c24610233b0224f7e269.tar.xz
ads1x1x-async-eb0c438e9dbad47a9cf2c24610233b0224f7e269.zip
Make function to read if a measurement is in progress public
Diffstat (limited to 'src')
-rw-r--r--src/devices/common.rs10
-rw-r--r--src/devices/mode/oneshot.rs7
-rw-r--r--src/lib.rs2
3 files changed, 11 insertions, 8 deletions
diff --git a/src/devices/common.rs b/src/devices/common.rs
index 1121265..92b4f9e 100644
--- a/src/devices/common.rs
+++ b/src/devices/common.rs
@@ -5,7 +5,7 @@ use super::OperatingMode;
impl<DI, IC, CONV, MODE, E> Ads1x1x<DI, IC, CONV, MODE>
where
- DI: interface::WriteData<Error = E>
+ DI: interface::WriteData<Error = E> + interface::ReadData<Error = E>,
{
pub(super) fn set_operating_mode(&mut self, mode: OperatingMode) -> Result<(), Error<E>> {
let config;
@@ -18,6 +18,14 @@ where
Ok(())
}
+ /// Read whether a measurement is currently in progress.
+ pub fn is_measurement_in_progress(&mut self) -> Result<bool, Error<E>> {
+ let config = Config {
+ bits: self.iface.read_register(Register::CONFIG)?
+ };
+ Ok(!config.is_high(BitFlags::OS))
+ }
+
/// Reset the internal state of this driver to the default values.
///
/// *Note:* This does not alter the state or configuration of the device.
diff --git a/src/devices/mode/oneshot.rs b/src/devices/mode/oneshot.rs
index 41a9f26..a03d8d2 100644
--- a/src/devices/mode/oneshot.rs
+++ b/src/devices/mode/oneshot.rs
@@ -23,13 +23,6 @@ where
})
}
- fn is_measurement_in_progress(&mut self) -> Result<bool, Error<E>> {
- let config = Config {
- bits: self.iface.read_register(Register::CONFIG)?
- };
- Ok(!config.is_high(BitFlags::OS))
- }
-
fn trigger_measurement(&mut self, config: &Config) -> Result<(), Error<E>> {
let config = config.with_high(BitFlags::OS);
self.iface.write_register(Register::CONFIG, config.bits)
diff --git a/src/lib.rs b/src/lib.rs
index 976fd23..20f5857 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,6 +12,7 @@
//! - Set the data rate. See: [`set_data_rate()`].
//! - Set the full-scale range (gain amplifier). See [`set_full_scale_range()`].
//! - Set the low and high thresholds. See: [`set_high_threshold_raw()`].
+//! - Read whether a measurement is in progress. See: [`is_measurement_in_progress()`].
//! - Set the comparator mode. See: [`set_comparator_mode()`].
//! - Set the comparator polarity. See: [`set_comparator_polarity()`].
//! - Set the comparator latching. See: [`set_comparator_latching()`].
@@ -25,6 +26,7 @@
//! [read_cont]: struct.Ads1x1x.html#impl-OneShot%3CAds1x1x%3CDI%2C%20IC%2C%20CONV%2C%20OneShot%3E%2C%20i16%2C%20CH%3E
//! [`set_data_rate()`]: struct.Ads1x1x.html#method.set_data_rate
//! [`set_full_scale_range()`]: struct.Ads1x1x.html#method.set_full_scale_range
+//! [`is_measurement_in_progress()`]: struct.Ads1x1x.html#method.is_measurement_in_progress
//! [`set_high_threshold_raw()`]: struct.Ads1x1x.html#method.set_high_threshold_raw
//! [`set_comparator_mode()`]: struct.Ads1x1x.html#method.set_comparator_mode
//! [`set_comparator_polarity()`]: struct.Ads1x1x.html#method.set_comparator_polarity