use range

Author: thijstriemstra

MultiPlexer_ADS1115/MultiPlexer_ADS1115.cpp

@@ -6,12 +6,16 @@
 
 MultiPlexer_ADS1115::MultiPlexer_ADS1115(
   float max_voltage,
+  int range_min,
+  int range_max,
   int i2c_addr,
   ADS1115_RANGE voltage_range
 ) {
   _maxVoltage = max_voltage;
   _i2cAddress = i2c_addr;
   _voltageRange = voltage_range;
+  _rangeMin = range_min;
+  _rangeMax = range_max;
 
   _adc = new ADS1115_WE(_i2cAddress);
 }
@@ -43,7 +47,7 @@ float MultiPlexer_ADS1115::readChannel(ADS1115_MUX channel) {
 
   while (_adc->isBusy()) {}
 
-  return _adc->getResult_mV();
+  return _adc->getResultWithRange(_rangeMin, _rangeMax);
 }
 
 float MultiPlexer_ADS1115::readChannel0() {

MultiPlexer_ADS1115/MultiPlexer_ADS1115.h

@@ -20,6 +20,8 @@ class MultiPlexer_ADS1115
   public:
     MultiPlexer_ADS1115(
       float max_voltage,
+      int range_min = 0,
+      int range_max = 127,
       int i2c_addr = 0x48,
       ADS1115_RANGE voltage_range = ADS1115_RANGE_6144
     );
@@ -35,6 +37,8 @@ class MultiPlexer_ADS1115
   private:
     int _i2cAddress;
     int _maxVoltage;
+    int _rangeMin;
+    int _rangeMax;
     ADS1115_WE* _adc;
     ADS1115_RANGE _voltageRange;
 };

Potentiometer_ADS1115/Potentiometer_ADS1115.cpp

@@ -33,7 +33,6 @@ void Potentiometer_ADS1115::read() {
   }
   if (_val != _prev) {
     _prev = _val;
-    //Serial.println(_val);
-    //_callback.callback();
+    _callback.callbackIntArg(_val);
   }
 }