FEAT fix merge bugs

Author: askuric

src/current_sense/LowsideCurrentSense.cpp

@@ -43,12 +43,13 @@ void LowsideCurrentSense::calibrateOffsets(){
         _delay(1);
     }
     // calculate the mean offsets
-    offset_ia = offset_ia / 1000.0f;
-    offset_ib = offset_ib / 1000.0f;
-    if(_isset(pinC)) offset_ic = offset_ic / 1000.0f;
+    offset_ia = offset_ia / calibration_rounds;
+    offset_ib = offset_ib / calibration_rounds;
+    if(_isset(pinC)) offset_ic = offset_ic / calibration_rounds;
 }
 
 // read all three phase currents (if possible 2 or 3)
+PhaseCurrent_s LowsideCurrentSense::getPhaseCurrents(){
     PhaseCurrent_s current;
     _startADC3PinConversionLowSide();
     current.a = lpf_a(_readADCVoltageLowSide(pinA) - offset_ia)*gain_a;// amps

src/current_sense/hardware_specific/atmega_mcu.cpp

@@ -2,8 +2,8 @@
 
 #if defined(__AVR_ATmega328P__) || defined(__AVR_ATmega168__) || defined(__AVR_ATmega328PB__) 
 
-#define _ADC_VOLTAGE 5.0
-#define _ADC_RESOLUTION 1024.0
+#define _ADC_VOLTAGE 5.0f
+#define _ADC_RESOLUTION 1024.0f
 
 // adc counts to voltage conversion ratio
 // some optimizing for faster execution

src/current_sense/hardware_specific/due_mcu.cpp

@@ -2,8 +2,8 @@
 
 #if defined(__arm__) && defined(__SAM3X8E__) 
 
-#define _ADC_VOLTAGE 3.3
-#define _ADC_RESOLUTION 1024.0
+#define _ADC_VOLTAGE 3.3f
+#define _ADC_RESOLUTION 1024.0f
 
 // adc counts to voltage conversion ratio
 // some optimizing for faster execution

src/current_sense/hardware_specific/esp32_mcu.cpp

@@ -35,13 +35,6 @@ float _readADCVoltageLowSide(const int pin){
   return raw_adc * _ADC_CONV;
 }
 
-<<<<<<< HEAD
-void _startADC3PinConversionLowSide(){
-
-}
-
-=======
->>>>>>> dev
 // function reading an ADC value and returning the read voltage
 void _configureADCLowSide(const int pinA,const int pinB,const int pinC){
   _pinA = pinA;

src/current_sense/hardware_specific/generic_mcu.cpp

@@ -3,7 +3,7 @@
 // function reading an ADC value and returning the read voltage
 __attribute__((weak))  float _readADCVoltageInline(const int pinA){
   uint32_t raw_adc = analogRead(pinA);
-  return raw_adc * 5.0/1024;
+  return raw_adc * 5.0f/1024.0f;
 }
 
 // function reading an ADC value and returning the read voltage

src/current_sense/hardware_specific/samd21_mcu.cpp

@@ -19,23 +19,24 @@ void _configureADCLowSide(const int pinA,const int pinB,const int pinC)
 {
   _pinA = pinA;
   _pinB = pinB; 
+  _pinC = pinC;
+  freeRunning = true;
+  instance.init(pinA, pinB, pinC);
+
+}
 void _startADC3PinConversionLowSide()
 {
   instance.startADCScan();
 }
 /**
  *  function reading an ADC value and returning the read voltage
-<<<<<<< HEAD
- *
-=======
  * 
+ * @param pinA - the arduino pin to be read (it has to be ADC pin)
+ */
 float _readADCVoltageLowSide(const int pinA)
+{
   instance.readResults(a, b, c);
-<<<<<<< HEAD
-
-=======
 
->>>>>>> dev
   if(pinA == _pinA)
     return instance.toVolts(a);
   if(pinA == _pinB)

src/current_sense/hardware_specific/samd_mcu.cpp

@@ -2,8 +2,8 @@
 
 #if defined(_SAMD21_)||defined(_SAMD51_)||defined(_SAME51_)
 
-#define _ADC_VOLTAGE 3.3
-#define _ADC_RESOLUTION 1024.0
+#define _ADC_VOLTAGE 3.3f
+#define _ADC_RESOLUTION 1024.0f
 
 // adc counts to voltage conversion ratio
 // some optimizing for faster execution

src/current_sense/hardware_specific/stm32_mcu.cpp

@@ -3,8 +3,8 @@
 
 #if defined(_STM32_DEF_)
 
-#define _ADC_VOLTAGE 3.3
-#define _ADC_RESOLUTION 1024.0
+#define _ADC_VOLTAGE 3.3f
+#define _ADC_RESOLUTION 1024.0f
 
 // adc counts to voltage conversion ratio
 // some optimizing for faster execution

src/current_sense/hardware_specific/teensy_mcu.cpp

@@ -2,8 +2,8 @@
 
 #if defined(__arm__) && defined(CORE_TEENSY)
 
-#define _ADC_VOLTAGE 3.3
-#define _ADC_RESOLUTION 1024.0
+#define _ADC_VOLTAGE 3.3f
+#define _ADC_RESOLUTION 1024.0f
 
 // adc counts to voltage conversion ratio
 // some optimizing for faster execution