github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-03-06 19:41:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ESP32 crash with RemoteDebug and unformatted SPIFFS. Added battery voltage for Lolin D32 and moved ESP_VCC_CALIB_FACTOR to cover all boards

Browse Source
This commit is contained in:
Gunnar Skjold
2020-04-09 08:44:25 +02:00
parent 7886ce668e
commit 0f5af6b274
3 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/HwTools.cpp
View File

@@ -1,16 +1,20 @@
#include "HwTools.h"
double HwTools::getVcc() {
double volts = 0.0;
#if defined(ARDUINO_ESP8266_WEMOS_D1MINI)
return (((double) ESP.getVcc()) / 900); // This board has a voltage divider on VCC. Yes, 900 is correct
volts = (((double) ESP.getVcc()) / 900.0); // This board has a voltage divider on VCC.
#elif defined(ARDUINO_LOLIN_D32)
volts = (analogRead(GPIO_NUM_35) / 4095.0) * 3.3 * 2.25; // We are actually reading battery voltage here
#elif defined(ESP8266)
#if defined(ESP_VCC_CALIB_FACTOR)
return ((double) ESP.getVcc()) / 1024 * ESP_VCC_CALIB_FACTOR;
#else
return ((double) ESP.getVcc()) / 1024;
#endif
volts = ((double) ESP.getVcc()) / 1024.0;
#endif
#if defined(ESP_VCC_CALIB_FACTOR)
return volts * ESP_VCC_CALIB_FACTOR;
#else
return volts;
#endif
return -1;
}
double HwTools::getTemperature() {