More accurate ESP32 analog read

Author: hjd1964

src/lib/pushButton/PushButton.cpp

@@ -46,7 +46,11 @@ Button::Button(int pin, int initState, int32_t trigger) {
 void Button::poll() {
   int lastState = state;
   if (isAnalog) {
-    int analogValue = analogRead(pin);
+    #ifdef ESP32
+      int analogValue = round((analogReadMilliVolts(pin)/3300.0F)*(float)ANALOG_READ_RANGE);
+    #else
+      int analogValue = analogRead(pin);
+    #endif
 
     if (DOWN == HIGH) {
       if (analogValue >= threshold + hysteresis) state = HIGH; else state = LOW;

src/lib/sense/Sense.cpp

@@ -50,7 +50,12 @@ SenseInput::SenseInput(int pin, int initState, int32_t trigger) {
 int SenseInput::isOn() {
   int value = lastValue;
   if (isAnalog) {
-    int sample = analogRead(pin);
+    #ifdef ESP32
+      int sample = round((analogReadMilliVolts(pin)/3300.0F)*(float)ANALOG_READ_RANGE);
+    #else
+      int sample = analogRead(pin);
+    #endif
+
     if (sample >= threshold + hysteresis) value = HIGH;
     if (sample <= threshold - hysteresis) value = LOW;
   } else {
@@ -67,7 +72,12 @@ int SenseInput::isOn() {
 int SenseInput::changed() {
   int value = lastChangedValue;
   if (isAnalog) {
-    int sample = analogRead(pin);
+    #ifdef ESP32
+      int sample = round((analogReadMilliVolts(pin)/3300.0F)*(float)ANALOG_READ_RANGE);
+    #else
+      int sample = analogRead(pin);
+    #endif
+
     if (sample >= threshold + hysteresis) value = HIGH;
     if (sample < threshold - hysteresis) value = LOW;
   } else {
@@ -95,7 +105,17 @@ void SenseInput::poll() {
 }
 
 void SenseInput::reset() {
-  if (isAnalog) { if ((int)analogRead(pin) > threshold) lastValue = HIGH; else lastValue = LOW; } else lastValue = digitalReadEx(pin);
+  if (isAnalog) {
+    #ifdef ESP32
+      int sample = round((analogReadMilliVolts(pin)/3300.0F)*(float)ANALOG_READ_RANGE);
+    #else
+      int sample = analogRead(pin);
+    #endif
+    if (sample > threshold) lastValue = HIGH; else lastValue = LOW;
+  } else {
+    lastValue = digitalReadEx(pin);
+  }
+
   stableSample = lastValue;
 }
 

src/libApp/temperature/Thermistor.cpp

@@ -44,8 +44,12 @@ void Thermistor::poll() {
     if (device[index] == THERMISTOR2) thermistorType = 1;
 
     if (thermistorType >= 0 && devicePin[index] != OFF) {
-      // get the total resistance
-      int counts = analogRead(devicePin[index]);
+
+      #ifdef ESP32
+        int counts = round((analogReadMilliVolts(devicePin[index])/3300.0F)*(float)ANALOG_READ_RANGE);
+      #else
+        int counts = analogRead(devicePin[index]);
+      #endif
 
       // calculate the device resistance
       float resistance;