added gain property

Author: gigapod

src/Flux/flxDevAS7265x.cpp

@@ -31,14 +31,15 @@ flxRegisterDevice(flxDevAS7265X);
 //----------------------------------------------------------------------------------------------------------
 /// @brief Constructor
 ///
-flxDevAS7265X::flxDevAS7265X() : _indicator{true}
+flxDevAS7265X::flxDevAS7265X() : _indicator{true}, _gain{AS7265X_GAIN_16X}
 {
 
     setName(getDeviceName(), "AS7265X Triad Spectroscopy Sensor");
 
     // Properties
     flxRegister(readWithLED, "Enable LED", "Measure with LED enabled");
     flxRegister(enableIndicator, "Enable Indicator", "Indicator LED enabled");
+    flxRegister(sensorGain, "Gain", "Gain settings for sensor");
     flxRegister(outputCal, "Calibrated Output", "Return calibrated values");
 
     // Register output params
@@ -57,16 +58,15 @@ flxDevAS7265X::flxDevAS7265X() : _indicator{true}
     flxRegister(outI, "Channel I");
     flxRegister(outJ, "Channel J");
     flxRegister(outK, "Channel K");
-    flxRegister(outL, "Channel L"); 
+    flxRegister(outL, "Channel L");
 
     // Register output params
     flxRegister(outR, "Channel R");
     flxRegister(outS, "Channel S");
     flxRegister(outT, "Channel T");
     flxRegister(outU, "Channel U");
     flxRegister(outV, "Channel V");
-    flxRegister(outW, "Channel W");                     
-
+    flxRegister(outW, "Channel W");
 }
 
 //----------------------------------------------------------------------------------------------------------
@@ -93,10 +93,14 @@ bool flxDevAS7265X::isConnected(flxBusI2C &i2cDriver, uint8_t address)
 ///
 bool flxDevAS7265X::onInitialize(TwoWire &wirePort)
 {
-    return AS7265X::begin(wirePort);
-        return false;
-}
+    bool status = AS7265X::begin(wirePort);
 
+    if (status)
+    {
+        AS7265X::setGain(_gain);
+    }
+    return status;
+}
 
 //---------------------------------------------------------------------------
 // Indicator property
@@ -106,20 +110,34 @@ bool flxDevAS7265X::get_indicator(void)
     return _indicator;
 }
 
-
 void flxDevAS7265X::set_indicator(bool isOn)
 {
     if (_indicator == isOn)
         return;
 
     if (isOn)
         AS7265X::enableIndicator();
-    else 
-        AS7265X::disableIndicator();    
+    else
+        AS7265X::disableIndicator();
 
     _indicator = isOn;
 }
 
+//---------------------------------------------------------------------------
+// Gain property
+//---------------------------------------------------------------------------
+
+uint8_t flxDevAS7265X::get_gain(void)
+{
+    return _gain;
+}
+
+void flxDevAS7265X::set_gain(uint8_t value)
+{
+    _gain = value;
+    if (isInitialized())
+        AS7265X::setGain(value);
+}
 //---------------------------------------------------------------------------
 ///
 /// @brief Called right before data parameters are read - take measurments called

src/Flux/flxDevAS7265x.h

@@ -51,19 +51,20 @@ class flxDevAS7265X : public flxDeviceI2CType<flxDevAS7265X>, public AS7265X
     bool execute(void);
 
   private:
-
     // property methods
 
     bool get_indicator(void);
     void set_indicator(bool);
 
     bool _indicator;
 
+    uint8_t get_gain(void);
+    void set_gain(uint8_t);
 
-
+    uint8_t _gain;
 
     // Parameter methods
-    bool  read_output_type(void);
+    bool read_output_type(void);
     float read_A(void);
     float read_B(void);
     float read_C(void);
@@ -86,17 +87,20 @@ class flxDevAS7265X : public flxDeviceI2CType<flxDevAS7265X>, public AS7265X
     float read_W(void);
 
   public:
-
     // Properties
 
     // Read with LED active?
 
     flxPropertyBool<flxDevAS7265X> readWithLED = {false};
 
-    flxPropertyRWBool<flxDevAS7265X, &flxDevAS7265X::get_indicator, &flxDevAS7265X::set_indicator> enableIndicator = {true};
+    flxPropertyRWBool<flxDevAS7265X, &flxDevAS7265X::get_indicator, &flxDevAS7265X::set_indicator> enableIndicator = {
+        true};
 
     flxPropertyBool<flxDevAS7265X> outputCal = {true};
 
+    flxPropertyRWUint8<flxDevAS7265X, &flxDevAS7265X::get_gain, &flxDevAS7265X::set_gain> sensorGain = {
+        AS7265X_GAIN_16X,
+        {{"1X", AS7265X_GAIN_1X}, {"3.7X", AS7265X_GAIN_37X}, {"16X", AS7265X_GAIN_16X}, {"64X", AS7265X_GAIN_64X}}};
 
     // Outputs
     // define parameters for calibrarted outputs
@@ -107,7 +111,7 @@ class flxDevAS7265X : public flxDeviceI2CType<flxDevAS7265X>, public AS7265X
     flxParameterOutFloat<flxDevAS7265X, &flxDevAS7265X::read_C> outC;
     flxParameterOutFloat<flxDevAS7265X, &flxDevAS7265X::read_D> outD;
     flxParameterOutFloat<flxDevAS7265X, &flxDevAS7265X::read_E> outE;
-    flxParameterOutFloat<flxDevAS7265X, &flxDevAS7265X::read_F> outF;      
+    flxParameterOutFloat<flxDevAS7265X, &flxDevAS7265X::read_F> outF;
 
     flxParameterOutFloat<flxDevAS7265X, &flxDevAS7265X::read_G> outG;
     flxParameterOutFloat<flxDevAS7265X, &flxDevAS7265X::read_H> outH;
@@ -121,6 +125,5 @@ class flxDevAS7265X : public flxDeviceI2CType<flxDevAS7265X>, public AS7265X
     flxParameterOutFloat<flxDevAS7265X, &flxDevAS7265X::read_T> outT;
     flxParameterOutFloat<flxDevAS7265X, &flxDevAS7265X::read_U> outU;
     flxParameterOutFloat<flxDevAS7265X, &flxDevAS7265X::read_V> outV;
-    flxParameterOutFloat<flxDevAS7265X, &flxDevAS7265X::read_W> outW;      
-
+    flxParameterOutFloat<flxDevAS7265X, &flxDevAS7265X::read_W> outW;
 };