Use AnalogIn to read the tank level

Author: lostcontrol

config.ini

@@ -21,9 +21,9 @@ lcd = /dev/lcd
 
 [adc]
 channel = 1
-gain = 0.6666666666666666
-low = 83
-high = 1665
+gain = 4
+low = 0.6
+high = 1.0
 
 [1-wire]
 pool = 28-00000c86dc29

controller/device.py

@@ -221,10 +221,8 @@ def value(self):
 
 
 class TankSensorDevice(SensorDevice):
-    def __init__(self, name, adc, channel, gain, low, high):
+    def __init__(self, name, channel, low, high):
         super().__init__(name)
-        self.__adc = adc
-        self.__adc.gain = gain
         self.__channel = channel
         self.__low = low
         self.__high = high
@@ -234,15 +232,15 @@ def value(self):
         values = []
         for _ in range(10):
             try:
-                values.append(self.__adc.read(self.__channel))
+                values.append(self.__channel.voltage)
                 time.sleep(0.05)
             except OSError:
                 logger.exception(f"Unable to read ADC {self.name}")
                 time.sleep(0.5)
         # In case we got really no readings, we return 0 in order for the system to go into
         # emergency stop.
         value = sum(values) / len(values) if values else 0
-        logger.debug(f"Tank sensor average ADC={value:.2f}")
+        logger.debug(f"Tank sensor average ADC voltage={value:.2f}")
         return constrain(mapping(value, self.__low, self.__high, 0, 100), 0, 100)
 
 

poupool.py

@@ -90,12 +90,13 @@ def setup_rpi(registry):
 
     # ADC
     import adafruit_ads1x15.ads1015 as ADS
+    from adafruit_ads1x15.analog_in import AnalogIn
 
     # Create the ADC object using the I2C bus
     adc = ADS.ADS1015(i2c)
-    # With a gain of 2/3 and a sensor output of 0.25V-5V, the values should be around 83 and 1665
-    params = ((int, "channel"), (float, "gain"), (int, "low"), (int, "high"))
-    registry.add_sensor(TankSensorDevice("tank", adc, *[t(config["adc", n]) for t, n in params]))
+    adc.gain = float(config["adc", "gain"])
+    channel = AnalogIn(adc, int(config["adc", "channel"]))
+    registry.add_sensor(TankSensorDevice("tank", channel, float(config["adc", "low"]), float(config["adc", "high"])))
 
     # DAC
     import adafruit_mcp4725