Implement value conversions over type parameter

1 files changed, 6 insertions, 50 deletions

diff --git a/src/devices/features/tier2.rs b/src/devices/features/tier2.rs
index 2aa649f..5d7ec92 100644
--- a/src/devices/features/tier2.rs
+++ b/src/devices/features/tier2.rs
@@ -3,22 +3,23 @@
 //! These are the features included only in ADS1x14, ADS1x15
 
 use { Ads1x1x, Error, interface, ic, ComparatorMode, ComparatorPolarity,
-      ComparatorLatching, Register, BitFlags };
+      ComparatorLatching, Register, BitFlags, conversion };
 
-impl<DI, IC, MODE, E> Ads1x1x<DI, IC, MODE>
+impl<DI, IC, CONV, MODE, E> Ads1x1x<DI, IC, CONV, MODE>
 where
     DI: interface::WriteData<Error = E>,
-    IC: ic::Resolution + ic::Tier2Features
+    IC: ic::Tier2Features,
+    CONV: conversion::ConvertThreshold<E>
 {
     /// Set comparator lower threshold
     pub fn set_low_threshold(&mut self, value: i16) -> Result<(), Error<E>> {
-        let register_value = convert_threshold::<IC, E>(value)?;
+        let register_value = CONV::convert_threshold(value)?;
         self.iface.write_register(Register::LOW_TH, register_value)
     }
 
     /// Set comparator upper threshold
     pub fn set_high_threshold(&mut self, value: i16) -> Result<(), Error<E>> {
-        let register_value = convert_threshold::<IC, E>(value)?;
+        let register_value = CONV::convert_threshold(value)?;
         self.iface.write_register(Register::HIGH_TH, register_value)
     }
 
@@ -58,48 +59,3 @@ where
         Ok(())
     }
 }
-
-
-fn convert_threshold<IC, E>(value: i16) -> Result<u16, Error<E>>
-where
-    IC: ic::Resolution
-{
-    if IC::BITS == ic::ResolutionBits::_12 {
-        if value < -2048 || value > 2047 {
-            return Err(Error::InvalidInputData);
-        }
-        Ok((value << 4) as u16)
-    }
-    else {
-        Ok(value as u16)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn assert_invalid_input_data<E>(result: Result<u16, Error<E>>) {
-        match result {
-            Err(Error::InvalidInputData) => (),
-            _ => panic!("InvalidInputData error was not returned.")
-        }
-    }
-
-    #[test]
-    fn convert_12_bits() {
-        assert_invalid_input_data(convert_threshold::<ic::Ads1013, ()>(2048));
-        assert_invalid_input_data(convert_threshold::<ic::Ads1013, ()>(-2049));
-
-        assert_eq!(     0, convert_threshold::<ic::Ads1013, ()>(0).unwrap());
-        assert_eq!(0x7FF0, convert_threshold::<ic::Ads1013, ()>(2047).unwrap());
-        assert_eq!(0x8000, convert_threshold::<ic::Ads1013, ()>(-2048).unwrap());
-        assert_eq!(0xFFF0, convert_threshold::<ic::Ads1013, ()>(-1).unwrap());
-    }
-
-    #[test]
-    fn convert_16_bits() {
-        assert_eq!(0x7FFF, convert_threshold::<ic::Ads1113, ()>(32767).unwrap());
-        assert_eq!(0x8000, convert_threshold::<ic::Ads1113,()>(-32768).unwrap());
-    }
-}