Brewery/gravitymon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing temp adj in F correcly

Browse Source
This commit is contained in:
Magnus Persson
2022-04-07 16:52:12 +02:00
parent 51daa23327
commit f5aae4f2ea
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/config.hpp
View File

@ -322,12 +322,12 @@ class Config {
_tempSensorAdjC = f; _tempSensorAdjC = f;
_saveNeeded = true; _saveNeeded = true;
} }
void setTempSensorAdjC(String s) { void setTempSensorAdjC(String s, float adjustC = 0) {
_tempSensorAdjC = s.toFloat(); _tempSensorAdjC = s.toFloat() + adjustC;
_saveNeeded = true; _saveNeeded = true;
} }
void setTempSensorAdjF(String s) { void setTempSensorAdjF(String s, float adjustF = 0) {
_tempSensorAdjC = convertFtoC(s.toFloat()); _tempSensorAdjC = convertFtoC(s.toFloat() + adjustF);
_saveNeeded = true; _saveNeeded = true;
} }

6
src/webserver.cpp
View File

@ -61,8 +61,9 @@ void WebServerHandler::webHandleConfig() {
// Format the adjustment so we get rid of rounding errors // Format the adjustment so we get rid of rounding errors
if (myConfig.isTempF()) if (myConfig.isTempF())
// We want the delta value (32F = 0C).
doc[PARAM_TEMP_ADJ] = doc[PARAM_TEMP_ADJ] =
reduceFloatPrecision(convertCtoF(myConfig.getTempSensorAdjC()), 1); reduceFloatPrecision(convertCtoF(myConfig.getTempSensorAdjC())-32, 1);
else else
doc[PARAM_TEMP_ADJ] = reduceFloatPrecision(myConfig.getTempSensorAdjC(), 1); doc[PARAM_TEMP_ADJ] = reduceFloatPrecision(myConfig.getTempSensorAdjC(), 1);
@ -605,7 +606,8 @@ void WebServerHandler::webHandleConfigHardware() {
if (myConfig.isTempC()) { if (myConfig.isTempC()) {
myConfig.setTempSensorAdjC(_server->arg(PARAM_TEMP_ADJ)); myConfig.setTempSensorAdjC(_server->arg(PARAM_TEMP_ADJ));
} else { } else {
myConfig.setTempSensorAdjF(_server->arg(PARAM_TEMP_ADJ)); // Data is delta so we add 32 in order to conver to C.
myConfig.setTempSensorAdjF(_server->arg(PARAM_TEMP_ADJ), 32);
} }
} }
if (_server->hasArg(PARAM_BLE)) if (_server->hasArg(PARAM_BLE))