fix build (#34)

* fix #33 build
* redo setADC()
* update readme.md

Author: RobTillaart

ACS712.cpp

@@ -1,7 +1,7 @@
 //
 //    FILE: ACS712.cpp
 //  AUTHOR: Rob Tillaart, Pete Thompson
-// VERSION: 0.3.4
+// VERSION: 0.3.5
 //    DATE: 2020-08-02
 // PURPOSE: ACS712 library - current measurement
 //     URL: https://github.com/RobTillaart/ACS712
@@ -26,7 +26,7 @@ ACS712::ACS712(uint8_t analogPin, float volts, uint16_t maxADC, float mVperAmper
   _midPoint    = maxADC / 2;
 
   //  default ADC is internal.
-  setADC(_internalAnalog, volts, maxADC);
+  setADC(NULL, volts, maxADC);
 }
 
 
@@ -42,16 +42,16 @@ float ACS712::mA_peak2peak(float frequency, uint16_t cycles)
   {
     int minimum, maximum;
     //  Better than using midPoint
-    minimum = maximum = _readADC(_pin);
+    minimum = maximum = _analogRead(_pin);
 
     //  find minimum and maximum
     uint32_t start = micros();
     while (micros() - start < period)  //  UNO ~180 samples...
     {
-      int value = _readADC(_pin);
+      int value = _analogRead(_pin);
       if (_suppresNoise)               //  average 2 samples.
       {
-        value = (value + _readADC(_pin))/2;
+        value = (value + _analogRead(_pin))/2;
       }
       //  determine extremes
       if (value < minimum) minimum = value;
@@ -82,17 +82,17 @@ float ACS712::mA_AC(float frequency, uint16_t cycles)
     uint16_t zeros   = 0;
 
     int _min, _max;
-    _min = _max = _readADC(_pin);
+    _min = _max = _analogRead(_pin);
 
     //  find minimum and maximum and count the zero-level "percentage"
     uint32_t start = micros();
     while (micros() - start < period)  // UNO ~180 samples...
     {
       samples++;
-      int value = _readADC(_pin);
+      int value = _analogRead(_pin);
       if (_suppresNoise)  //  average 2 samples.
       {
-        value = (value + _readADC(_pin))/2;
+        value = (value + _analogRead(_pin))/2;
       }
       //  determine extremes
       if (value < _min) _min = value;
@@ -144,10 +144,10 @@ float ACS712::mA_AC_sampling(float frequency, uint16_t cycles)
     while (micros() - start < period)
     {
       samples++;
-      int value = _readADC(_pin);
+      int value = _analogRead(_pin);
       if (_suppresNoise)  //  average 2 samples.
       {
-        value = (value + _readADC(_pin))/2;
+        value = (value + _analogRead(_pin))/2;
       }
       float current = value - _midPoint;
       sumSquared += (current * current);
@@ -169,15 +169,15 @@ float ACS712::mA_AC_sampling(float frequency, uint16_t cycles)
 float ACS712::mA_DC(uint16_t cycles)
 {
   //  read at least twice to stabilize the ADC
-  _readADC(_pin);
+  _analogRead(_pin);
   if (cycles == 0) cycles = 1;
   float sum = 0;
   for (uint16_t i = 0; i < cycles; i++)
   {
-    int value = _readADC(_pin);
+    int value = _analogRead(_pin);
     if (_suppresNoise)  //  average 2 samples.
     {
-      value = (value + _readADC(_pin))/2;
+      value = (value + _analogRead(_pin))/2;
     }
     sum += (value - _midPoint);
   }
@@ -233,7 +233,7 @@ uint16_t ACS712::autoMidPoint(float frequency, uint16_t cycles)
     uint32_t start    = micros();
     while (micros() - start < twoPeriods)
     {
-      uint16_t reading = _readADC(_pin);
+      uint16_t reading = _analogRead(_pin);
       subTotal += reading;
       samples++;
       //  Delaying prevents overflow
@@ -329,14 +329,14 @@ float ACS712::detectFrequency(float minimalFrequency)
 {
   int maximum = 0;
   int minimum = 0;
-  maximum = minimum = _readADC(_pin);
+  maximum = minimum = _analogRead(_pin);
 
   //  determine maxima
   uint32_t timeOut = round(1000000.0 / minimalFrequency);
   uint32_t start = micros();
   while (micros() - start < timeOut)
   {
-    int value = _readADC(_pin);
+    int value = _analogRead(_pin);
     if (value > maximum) maximum = value;
     if (value < minimum) minimum = value;
   }
@@ -352,13 +352,13 @@ float ACS712::detectFrequency(float minimalFrequency)
   timeOut *= 10;
   start = micros();
   //  casting to int to keep compiler happy.
-  while ((int(_readADC(_pin)) >  Q1) && ((micros() - start) < timeOut));
-  while ((int(_readADC(_pin)) <= Q3) && ((micros() - start) < timeOut));
+  while ((int(_analogRead(_pin)) >  Q1) && ((micros() - start) < timeOut));
+  while ((int(_analogRead(_pin)) <= Q3) && ((micros() - start) < timeOut));
   start = micros();
   for (int i = 0; i < 10; i++)
   {
-    while ((int(_readADC(_pin)) >  Q1) && ((micros() - start) < timeOut));
-    while ((int(_readADC(_pin)) <= Q3) && ((micros() - start) < timeOut));
+    while ((int(_analogRead(_pin)) >  Q1) && ((micros() - start) < timeOut));
+    while ((int(_analogRead(_pin)) <= Q3) && ((micros() - start) < timeOut));
   }
   uint32_t stop = micros();
 
@@ -386,13 +386,13 @@ float ACS712::getMicrosAdjust()
 //  DEBUG
 uint16_t ACS712::getMinimum(uint16_t milliSeconds)
 {
-  uint16_t minimum = _readADC(_pin);
+  uint16_t minimum = _analogRead(_pin);
 
   //  find minimum
   uint32_t start = millis();
   while (millis() - start < milliSeconds)
   {
-    uint16_t value = _readADC(_pin);
+    uint16_t value = _analogRead(_pin);
     if (value < minimum) minimum = value;
   }
   return minimum;
@@ -401,13 +401,13 @@ uint16_t ACS712::getMinimum(uint16_t milliSeconds)
 
 uint16_t ACS712::getMaximum(uint16_t milliSeconds)
 {
-  uint16_t maximum = _readADC(_pin);
+  uint16_t maximum = _analogRead(_pin);
 
   //  find minimum
   uint32_t start = millis();
   while (millis() - start < milliSeconds)
   {
-    uint16_t value = _readADC(_pin);
+    uint16_t value = _analogRead(_pin);
     if (value > maximum) maximum = value;
   }
   return maximum;
@@ -425,5 +425,17 @@ void ACS712::setADC(uint16_t (* f)(uint8_t), float volts, uint16_t maxADC)
 }
 
 
+//////////////////////////////////////////////////////////////////////
+//
+//  PRIVATE
+//
+uint16_t ACS712::_analogRead(uint8_t pin)
+{
+  //  if extern ADC is defined use it.
+  if (_readADC != NULL) return _readADC(pin);
+  return analogRead(pin);
+}
+
+
 // -- END OF FILE --
 

ACS712.h

@@ -2,7 +2,7 @@
 //
 //    FILE: ACS712.h
 //  AUTHOR: Rob Tillaart, Pete Thompson
-// VERSION: 0.3.4
+// VERSION: 0.3.5
 //    DATE: 2020-08-02
 // PURPOSE: ACS712 library - current measurement
 //     URL: https://github.com/RobTillaart/ACS712
@@ -13,7 +13,7 @@
 
 #include "Arduino.h"
 
-#define ACS712_LIB_VERSION        (F("0.3.4"))
+#define ACS712_LIB_VERSION        (F("0.3.5"))
 
 
 //  ACS712_FF_SINUS == 1.0/sqrt(2) == 0.5 * sqrt(2)
@@ -123,16 +123,10 @@ class ACS712
     //  EXPERIMENTAL 0.3.4
     //  supports up to 16 bits ADC.
     uint16_t (* _readADC)(uint8_t);
+    uint16_t _analogRead(uint8_t pin);
+    
 };
 
 
-//  wrapper for internal analogRead()
-//  solves platform specific casting.
-static uint16_t _internalAnalog(uint8_t pin)
-{
-  return analogRead(pin);
-}
-
-
 // -- END OF FILE --
 

CHANGELOG.md

@@ -6,13 +6,19 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## [0.3.5] - 2023-01-18
+- fix #33 failing build => issue 345 created @ arduino-ci
+- redo **setADC()**
+- allows reset to internal **analogRead()** too now.
+- update README.md
+
+
 ## [0.3.4] - 2023-01-14
 - experimental
 - add **void setADC()** to use an external ADC for measurements.
 - add **static uint16_t internalAnalog(uint8_t p)** wrapping analogRead() - solves casting.
 - add example ACS712_20_DC_external_ADC.ino
 
-
 ## [0.3.3] - 2023-01-03
 - update GitHub actions
 - update license