analog in tested, working on all channels

Author: siddacious

adafruit_tla202x/__init__.py

@@ -93,12 +93,12 @@ class Mux(CV):
 
 Range.add_values(
     (
-        ("RANGE_6_144V", 0x0, "±6.144 V", 3),
-        ("RANGE_4_096V", 0x1, "±4.096 V", 2),
-        ("RANGE_2_048V", 0x2, "±2.048 V", 1),
-        ("RANGE_1_024V", 0x3, "±1.024 V", 0.5),
-        ("RANGE_0_512V", 0x4, "±0.512 V", 0.25),
-        ("RANGE_0_256V", 0x5, "±0.256 V", 0.125),
+        ("RANGE_6_144V", 0x0, 6.144, 3),
+        ("RANGE_4_096V", 0x1, 4.096, 2),
+        ("RANGE_2_048V", 0x2, 2.048, 1),
+        ("RANGE_1_024V", 0x3, 1.024, 0.5),
+        ("RANGE_0_512V", 0x4, 0.512, 0.25),
+        ("RANGE_0_256V", 0x5, 0.256, 0.125),
     )
 )
 DataRate.add_values(
@@ -131,7 +131,7 @@ class Mux(CV):
 # GND – 0.3 V < V(AINX) < VDD + 0.3 V
 
 
-class TLA2024:
+class TLA2024:  # pylint:disable=too-many-instance-attributes
     """I2C Interface for analog voltage measurements using the TI TLA2024 12-bit 4-channel ADC
 
     params:
@@ -154,8 +154,9 @@ def __init__(self, i2c_bus, address=_TLA_DEFAULT_ADDRESS):
         self._last_one_shot = None
         self.mode = Mode.CONTINUOUS
         self.mux = Mux.MUX_AIN0_GND
+        # default to widest range and highest sample rate
         self.data_rate = DataRate.RATE_3300SPS
-        self.range = Range.RANGE_2_048V
+        self.range = Range.RANGE_6_144V
 
     @property
     def voltage(self):
@@ -187,7 +188,7 @@ def mode(self):
     @mode.setter
     def mode(self, mode):
         if not Mode.is_valid(mode):
-            raise AttributeError("``mode`` must be a valid ``Mode``")
+            raise AttributeError("``mode`` must be a valid Mode")
         if mode == Mode.CONTINUOUS:  # pylint:disable=no-member
             self._mode = mode
             return
@@ -199,6 +200,18 @@ def mode(self, mode):
 
         self._last_one_shot = self._read_volts()
 
+    @property
+    def range(self):
+        """The measurement range of the ADC, changed by adjusting the Programmable Gain Amplifier
+        `range` must be an ``adafruit_tla202x.Range``"""
+        return self._pga
+
+    @range.setter
+    def range(self, measurement_range):
+        if not Range.is_valid(measurement_range):
+            raise AttributeError("range must be a valid Range")
+        self._pga = measurement_range
+
     @property
     def data_rate(self):
         """selects the rate at which measurement samples are taken. Must be an
@@ -208,7 +221,7 @@ def data_rate(self):
     @data_rate.setter
     def data_rate(self, rate):
         if not DataRate.is_valid(rate):  # pylint:disable=no-member
-            raise AttributeError("``data_rate`` must be a valid ``DataRate``")
+            raise AttributeError("``data_rate`` must be a valid DataRate")
         self._data_rate = rate
 
     @property
@@ -220,15 +233,17 @@ def mux(self):
 
     @mux.setter
     def mux(self, mux_connection):
+        print("muxin'")
         if not Mux.is_valid(mux_connection):  # pylint:disable=no-member
-            raise AttributeError("``mux`` must be a valid ``Mux``")
+            raise AttributeError("``mux`` must be a valid Mux")
         self._mux = mux_connection
 
     def read(self, channel):
-        """Switch to the given channel and take a single voltage reading in One Shot mode"""
-        self.input_channel = channel
+        """Switch to the given channel and take a single ADC reading in One Shot mode"""
+        if not self.input_channel == channel:
+            self.input_channel = channel
         self.mode = Mode.ONE_SHOT  # pylint:disable=no-member
-        return self.voltage
+        return self._read_adc()
 
     def _read_volts(self):
         """From datasheet:
@@ -240,16 +255,18 @@ def _read_volts(self):
 
         """
 
-        value_lsb = self._read_lsb()
-        v_fsr = 8192 >> self.range
-        if self.range == 0:
-            v_fsr = 6144
-        v_fsr = float(v_fsr)
-        converted = (value_lsb / 2047.0) * v_fsr
+        value_lsb = self._read_adc()
+        # print("value_lsb:", hex(value_lsb))
+        # v_fsr = 8192 >> self.range
+        # if self.range == 0:
+        #     v_fsr = 6144
+        # v_fsr = float(v_fsr)
+        # converted = (value_lsb / 2047.0) * v_fsr
 
-        return converted / 1000.0
+        # return converted / 1000.0
+        return value_lsb * Range.lsb[self.range] / 1000.0
 
-    def _read_lsb(self):
+    def _read_adc(self):
         value_lsb = self._raw_adc_read
         value_lsb >>= 4
 

adafruit_tla202x/analog_in.py

@@ -26,6 +26,7 @@
 
 * Author(s): Bryan Siepert
 """
+from . import Range
 
 
 class AnalogIn:
@@ -49,8 +50,8 @@ def voltage(self):
             raise RuntimeError(
                 "Underlying ADC does not exist, likely due to callint `deinit`"
             )
-        raw_reading = self._tla.read(self._channel_number)
-        return ((raw_reading << 4) / 65535) * self._tla.reference_voltage
+        self._tla.input_channel = self._channel_number
+        return self._tla.voltage
 
     @property
     def value(self):
@@ -72,7 +73,7 @@ def reference_voltage(self):
             raise RuntimeError(
                 "Underlying ADC does not exist, likely due to callint `deinit`"
             )
-        return self._tla.reference_voltage
+        return Range.string[self._tla.range]
 
     def deinit(self):
         """Release the reference to the TLA202x. Create a new AnalogIn to use it again."""

examples/tla202x_analog_in.py

@@ -20,15 +20,30 @@
 
 i2c = board.I2C()
 tla = TLA.TLA2024(i2c)
-
-tla_in_0 = AnalogIn(tla, TLA.A0)
+val_max = (2 ** 15) - 1
+pin_0 = AnalogIn(tla, TLA.A0)
+pin_1 = AnalogIn(tla, TLA.A1)
+pin_2 = AnalogIn(tla, TLA.A2)
+pin_3 = AnalogIn(tla, TLA.A3)
+analog_ins = [
+    pin_0,
+    pin_1,
+    pin_2,
+    pin_3,
+]
 while True:
-    raw_value = tla_in_0.value
-    scaled_value = (raw_value / 65535) * tla_in_0.reference_voltage
+    for a_in in analog_ins:
+        raw_value = a_in.value
+        voltage_reference = a_in.reference_voltage
+        scaled_value = (raw_value / val_max) * voltage_reference
+
+        voltage = a_in.voltage
+        print("Pin 0 ADC value: %d lsb" % (raw_value))
+        print("Pin 0 Reference Voltage: %0.2fV" % (voltage_reference))
+        print("Pin 0 Measured Voltage: %0.2fV" % (scaled_value))
 
-    voltage = tla_in_0.voltage
+        print("")
 
-    print("Pin 0 Scaled Voltage: %0.2fV" % (scaled_value))
-    print("Pin 0 Direct Voltage: %0.2fV" % (voltage))
+    print("-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_")
     print("")
     time.sleep(1)

examples/tla202x_mux_test.py

@@ -13,15 +13,6 @@
     channel = i
     tla.input_channel = channel
     print("Channel", channel, ":", tla.voltage)
-# Mux.MUX_AIN0_AIN1 X
-# Mux.MUX_AIN0_AIN3  X
-# Mux.MUX_AIN1_AIN3  X
-# Mux.MUX_AIN2_AIN3 X
-# Mux.MUX_AIN0_GND   X
-# Mux.MUX_AIN1_GND   X
-# Mux.MUX_AIN2_GND   X
-# Mux.MUX_AIN3_GND   X
-
 
 muxen = [
     [Mux.MUX_AIN0_GND, 0.5],