working on voltage sense, not yet finished

Author: Richard Unger

src/voltage/GenericVoltageSense.cpp

@@ -4,7 +4,7 @@
 
 
 
-GenericVoltageSense::GenericVoltageSense(int pin, float fullScaleVoltage, float gain, float offset, float Tf) : VoltageSense(gain, offset, Tf), fullScaleVoltage(fullScaleVoltage), pin(pin) {
+GenericVoltageSense::GenericVoltageSense(int pin, float gain, float offset, float Tf, float fullScaleVoltage) : VoltageSense(gain, offset, Tf), fullScaleVoltage(fullScaleVoltage), pin(pin) {
 };
 
 #ifndef INPUT_ANALOG
@@ -38,7 +38,7 @@ bool GenericVoltageSense::init(int resolution){
 
 float GenericVoltageSense::readRawVoltage(){
     uint32_t val = analogRead(pin);
-    val = (val / maxValue) * fullScaleVoltage;
+    val = (val / (float)maxValue) * fullScaleVoltage;
     return val;
 };
 

src/voltage/GenericVoltageSense.h

@@ -6,7 +6,7 @@
 
 class GenericVoltageSense : public VoltageSense {
   public:
-    GenericVoltageSense(int pin, float fullScaleVoltage = 3.3f, float gain = 1.0f, float offset = 0.0f, float Tf = 0.1f);
+    GenericVoltageSense(int pin, float gain = 1.0f, float offset = 0.0f, float Tf = 0.1f, float fullScaleVoltage = 3.3f);
     bool init(int resolution = -1);
     float fullScaleVoltage;
   protected:

src/voltage/VoltageSense.cpp

@@ -18,6 +18,6 @@ float VoltageSense::getVoltage(){
 
 void VoltageSense::update(){
     float v = readRawVoltage();
-    v = (v + offset) * gain;
+    v = (v - offset) * gain;
     voltage = filter(v);
 };