github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-03-10 12:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed vcc reading on esp8266

Browse Source
This commit is contained in:
Gunnar Skjold
2025-01-22 19:09:08 +01:00
parent 3d9cad8953
commit a55f7dc66a
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/HwTools/src/HwTools.cpp
View File

@@ -201,15 +201,15 @@ void HwTools::setup(SystemConfig* sys, GpioConfig* config) {
pinMode(config->vccPin, INPUT);
#endif
vccPin = config->vccPin;
vccOffset = config->vccOffset / 100.0;
vccMultiplier = config->vccMultiplier / 1000.0;
vccGnd_r = config->vccResistorGnd;
vccVcc_r = config->vccResistorVcc;
} else {
voltAdc.unit = 0xFF;
voltAdc.channel = 0xFF;
vccPin = config->vccPin = 0xFF;
}
vccOffset = config->vccOffset / 100.0;
vccMultiplier = config->vccMultiplier / 1000.0;
vccGnd_r = config->vccResistorGnd;
vccVcc_r = config->vccResistorVcc;
if(config->tempAnalogSensorPin > 0 && config->tempAnalogSensorPin < 40) {
pinMode(config->tempAnalogSensorPin, INPUT);
@@ -417,17 +417,23 @@ float HwTools::getVcc() {
volts = (x * 3.3) / 10.0 / analogRange;
#endif
} else {
}
if(volts == 0.0) {
#if defined(ESP8266)
volts = ESP.getVcc() / 1024.0;
#else
return 0.0;
#endif
}
if(volts == 0.0) return 0.0;
if(vccGnd_r > 0 && vccVcc_r > 0) {
if(vccGnd_r > 0 && vccVcc_r > 0)
volts *= ((float) (vccGnd_r + vccVcc_r) / vccGnd_r);
}
return vccOffset + (volts > 0.0 ? volts * vccMultiplier : 0.0);
if(vccOffset != 0.0)
volts += vccOffset;
if(vccMultiplier != 0.0)
volts *= vccMultiplier;
return volts;
}
uint8_t HwTools::getTempSensorCount() {