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

LVC JSON now proper floating point.

Browse source 
Tidied screen dribbles in priming menu
This commit is contained in:
Ray Jones 2019-07-22 06:30:08 +10:00
parent 06e69acc77
commit d6bba90c84
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Afterburner/src/OLED/PrimingScreen.cpp
View file

@ -72,6 +72,8 @@ CPrimingScreen::show()
{
CScreenHeader::show(false);
_display.fillRect(0, 15, 100, 3, BLACK);
CRect extents;
int yPos = 53;
@ -104,7 +106,7 @@ CPrimingScreen::show()
int topline = 19;
int midline = 29;
int botline = 35;
// int xPos = border;
CRect loc;
loc.height = ThermostatDegCIconInfo.height;
loc.width = ThermostatDegCIconInfo.width;
@ -143,9 +145,7 @@ CPrimingScreen::show()
}
// fuel pump priming menu
loc.xPos = 67;
// yPos = 16;
// _printMenuText(border, yPos, "Pump");
loc.xPos = 66;
loc.width = BowserIconInfo.width;
loc.height = BowserIconInfo.height;
_drawBitmap(loc.xPos, midline, BowserIconInfo);

14
src/Afterburner/src/Utility/BTC_JSON.cpp
View file

@ -290,14 +290,14 @@ void interpretJsonCommand(char* pLine)
else if(strcmp("LowVoltCutout", it->key) == 0) {
float fCal = it->value.as<float>();
if(fCal != 0) {
bool bOK = false;
if(NVstore.getHeaterTuning().sysVoltage == 120)
bOK = INBOUNDS(fCal, 10.0, 12.5);
else
bOK = INBOUNDS(fCal, 20.0, 25.0);
bool bOK = false;
if(NVstore.getHeaterTuning().sysVoltage == 120)
bOK = INBOUNDS(fCal, 10.0, 12.5);
else
bOK = INBOUNDS(fCal, 20.0, 25.0);
if(bOK) {
sHeaterTuning ht = NVstore.getHeaterTuning();
ht.lowVolts = fCal;
ht.lowVolts = uint8_t(fCal * 10);
NVstore.setHeaterTuning(ht);
}
}
@ -380,7 +380,7 @@ bool makeJSONStringEx(CModerator& moderator, char* opStr, int len)
bSend |= moderator.addJson("PumpCount", RTC_Store.getFuelGauge(), root); // running count of pump strokes
bSend |= moderator.addJson("PumpCal", NVstore.getHeaterTuning().pumpCal, root); // mL/stroke
bSend |= moderator.addJson("TempOffset", NVstore.getHeaterTuning().tempOfs, root); // degC offset
bSend |= moderator.addJson("LowVoltCutout", NVstore.getHeaterTuning().lowVolts, root); // low volatge cutout
bSend |= moderator.addJson("LowVoltCutout", NVstore.getHeaterTuning().getLVC(), root); // low volatge cutout
if(bSend) {
root.printTo(opStr, len);