Crash_Override/ESP32_ChinaDieselHeater_Control
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

BUG FIX: always showing offset against DS18B20 in temp sensor role screen

Browse source
This commit is contained in:
Ray Jones 2020-01-09 12:50:54 +11:00
parent 88cf18bfcf
commit 083fb63764
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Afterburner.cpp
View file

@ -126,8 +126,8 @@
const int FirmwareRevision = 31; const int FirmwareRevision = 31;
const int FirmwareSubRevision = 7; const int FirmwareSubRevision = 7;
const int FirmwareMinorRevision = 4; const int FirmwareMinorRevision = 5;
const char* FirmwareDate = "4 Jan 2020"; const char* FirmwareDate = "9 Jan 2020";
#ifdef ESP32 #ifdef ESP32

16
src/OLED/TempSensorScreen.cpp
View file

@ -108,10 +108,20 @@ CTempSensorScreen::show()
_printMenuText(border, baseLine, msg, _rowSel == 2 && _colSel == 0); _printMenuText(border, baseLine, msg, _rowSel == 2 && _colSel == 0);
_printMenuText(27, baseLine, "DS18B20"); _printMenuText(27, baseLine, "DS18B20");
if(_nDS18B20 == 1) { if(_nDS18B20 > 1) {
sprintf(msg, "%+.01f", _OffsetDS18B20); sprintf(msg, "x%d", _nDS18B20);
_printMenuText(90, baseLine, msg, _rowSel == 2 && _colSel == 1); _printMenuText(72, baseLine, msg);
} }
if(_colSel == 0) {
// get temperature of primary DS18B20
float temperature;
getTempSensor().getDS18B20().getTemperature(0, temperature, false);
sprintf(msg, "%.01f`C", temperature + _OffsetDS18B20);
}
else {
sprintf(msg, "%+.01f", _OffsetDS18B20);
}
_printMenuText(90, baseLine, msg, _rowSel == 2 && _colSel == 1);
} }
} }