move range params to methods

Author: thijstriemstra

MultiPlexer_ADS1115/MultiPlexer_ADS1115.cpp

@@ -5,15 +5,9 @@
 #include "MultiPlexer_ADS1115.h"
 
 MultiPlexer_ADS1115::MultiPlexer_ADS1115(
-  int16_t max_voltage,
-  int16_t range_min,
-  int16_t range_max,
   int i2c_addr,
   ADS1115_RANGE voltage_range
 ) {
-  _maxVoltage = max_voltage;
-  _rangeMin = range_min;
-  _rangeMax = range_max;
   _i2cAddress = i2c_addr;
   _voltageRange = voltage_range;
 
@@ -41,37 +35,37 @@ void MultiPlexer_ADS1115::begin() {
 void MultiPlexer_ADS1115::loop() {
 }
 
-int16_t MultiPlexer_ADS1115::readChannel(ADS1115_MUX channel) {
+int16_t MultiPlexer_ADS1115::readChannel(ADS1115_MUX channel, int16_t max_voltage, int16_t range_min, int16_t range_max) {
   _adc->setCompareChannels(channel);
   _adc->startSingleMeasurement();
 
   while (_adc->isBusy()) {}
 
-  return _adc->getResultWithRange(_rangeMin, _rangeMax, _maxVoltage);
+  return _adc->getResultWithRange(range_min, range_max, max_voltage);
 }
 
-int16_t MultiPlexer_ADS1115::readChannel0() {
-  return readChannel(ADS1115_COMP_0_GND);
+int16_t MultiPlexer_ADS1115::readChannel0(int16_t max_voltage, int16_t range_min, int16_t range_max) {
+  return readChannel(ADS1115_COMP_0_GND, max_voltage, range_min, range_max);
 }
 
-int16_t MultiPlexer_ADS1115::readChannel1() {
-  return readChannel(ADS1115_COMP_1_GND);
+int16_t MultiPlexer_ADS1115::readChannel1(int16_t max_voltage, int16_t range_min, int16_t range_max) {
+  return readChannel(ADS1115_COMP_1_GND, max_voltage, range_min, range_max);
 }
 
-int16_t MultiPlexer_ADS1115::readChannel2() {
-  return readChannel(ADS1115_COMP_2_GND);
+int16_t MultiPlexer_ADS1115::readChannel2(int16_t max_voltage, int16_t range_min, int16_t range_max) {
+  return readChannel(ADS1115_COMP_2_GND, max_voltage, range_min, range_max);
 }
 
-int16_t MultiPlexer_ADS1115::readChannel3() {
-  return readChannel(ADS1115_COMP_3_GND);
+int16_t MultiPlexer_ADS1115::readChannel3(int16_t max_voltage, int16_t range_min, int16_t range_max) {
+  return readChannel(ADS1115_COMP_3_GND, max_voltage, range_min, range_max);
 }
 
-ADS1115Result MultiPlexer_ADS1115::readAll() {
+ADS1115Result MultiPlexer_ADS1115::readAll(int16_t max_voltage, int16_t range_min, int16_t range_max) {
   ADS1115Result result;
-  result.channel0 = readChannel0();
-  result.channel1 = readChannel1();
-  result.channel2 = readChannel2();
-  result.channel3 = readChannel3();
+  result.channel0 = readChannel0(max_voltage, range_min, range_max);
+  result.channel1 = readChannel1(max_voltage, range_min, range_max);
+  result.channel2 = readChannel2(max_voltage, range_min, range_max);
+  result.channel3 = readChannel3(max_voltage, range_min, range_max);
 
   return result;
 }

MultiPlexer_ADS1115/MultiPlexer_ADS1115.h

@@ -19,26 +19,20 @@ class MultiPlexer_ADS1115
 {
   public:
     MultiPlexer_ADS1115(
-      int16_t max_voltage,
-      int16_t range_min = 0,
-      int16_t range_max = 127,
       int i2c_addr = 0x48,
       ADS1115_RANGE voltage_range = ADS1115_RANGE_6144
     );
     void loop();
     void begin();
-    ADS1115Result readAll();
-    int16_t readChannel(ADS1115_MUX channel);
-    int16_t readChannel0();
-    int16_t readChannel1();
-    int16_t readChannel2();
-    int16_t readChannel3();
+    ADS1115Result readAll(int16_t max_voltage, int16_t range_min, int16_t range_max);
+    int16_t readChannel(ADS1115_MUX channel, int16_t max_voltage, int16_t range_min, int16_t range_max);
+    int16_t readChannel0(int16_t max_voltage, int16_t range_min, int16_t range_max);
+    int16_t readChannel1(int16_t max_voltage, int16_t range_min, int16_t range_max);
+    int16_t readChannel2(int16_t max_voltage, int16_t range_min, int16_t range_max);
+    int16_t readChannel3(int16_t max_voltage, int16_t range_min, int16_t range_max);
 
   private:
     int _i2cAddress;
-    int16_t _maxVoltage;
-    int16_t _rangeMin;
-    int16_t _rangeMax;
     ADS1115_WE* _adc;
     ADS1115_RANGE _voltageRange;
 };

Potentiometer_ADS1115/Potentiometer_ADS1115.cpp

@@ -6,10 +6,16 @@
 
 Potentiometer_ADS1115::Potentiometer_ADS1115(
     int channel,
+    int16_t max_voltage,
+    int16_t range_min,
+    int16_t range_max,
     MultiPlexer_ADS1115* adc,
     Method callback
 ) {
   _channel = channel;
+  _maxVoltage = max_voltage;
+  _rangeMin = range_min;
+  _rangeMax = range_max;
   _adc = adc;
   _callback = callback;
 }
@@ -23,13 +29,13 @@ void Potentiometer_ADS1115::loop() {
 
 void Potentiometer_ADS1115::read() {
   if (_channel == 0) {
-    _val = _adc->readChannel0();
+    _val = _adc->readChannel0(_maxVoltage, _rangeMin, _rangeMax);
   } else if (_channel == 1) {
-    _val = _adc->readChannel1();
+    _val = _adc->readChannel1(_maxVoltage, _rangeMin, _rangeMax);
   } else if (_channel == 2) {
-    _val = _adc->readChannel2();
+    _val = _adc->readChannel2(_maxVoltage, _rangeMin, _rangeMax);
   } else if (_channel == 3) {
-    _val = _adc->readChannel3();
+    _val = _adc->readChannel3(_maxVoltage, _rangeMin, _rangeMax);
   }
   if (_val != _prev) {
     _prev = _val;

Potentiometer_ADS1115/Potentiometer_ADS1115.h

@@ -13,6 +13,9 @@ class Potentiometer_ADS1115
   public:
     Potentiometer_ADS1115(
       int channel,
+      int16_t max_voltage,
+      int16_t range_min,
+      int16_t range_max,
       MultiPlexer_ADS1115* adc,
       Method callback
     );
@@ -24,6 +27,10 @@ class Potentiometer_ADS1115
     int _channel;
     int16_t _val;
     int16_t _prev;
+    int16_t _rangeMin;
+    int16_t _rangeMax;
+    int16_t _maxVoltage;
+  
     Method _callback;
     MultiPlexer_ADS1115* _adc;
 };