LVC JSON now proper floating point.
Tidied screen dribbles in priming menu
This commit is contained in:
parent
06e69acc77
commit
d6bba90c84
|
@ -72,6 +72,8 @@ CPrimingScreen::show()
|
||||||
{
|
{
|
||||||
CScreenHeader::show(false);
|
CScreenHeader::show(false);
|
||||||
|
|
||||||
|
_display.fillRect(0, 15, 100, 3, BLACK);
|
||||||
|
|
||||||
CRect extents;
|
CRect extents;
|
||||||
|
|
||||||
int yPos = 53;
|
int yPos = 53;
|
||||||
|
@ -104,7 +106,7 @@ CPrimingScreen::show()
|
||||||
int topline = 19;
|
int topline = 19;
|
||||||
int midline = 29;
|
int midline = 29;
|
||||||
int botline = 35;
|
int botline = 35;
|
||||||
// int xPos = border;
|
|
||||||
CRect loc;
|
CRect loc;
|
||||||
loc.height = ThermostatDegCIconInfo.height;
|
loc.height = ThermostatDegCIconInfo.height;
|
||||||
loc.width = ThermostatDegCIconInfo.width;
|
loc.width = ThermostatDegCIconInfo.width;
|
||||||
|
@ -143,9 +145,7 @@ CPrimingScreen::show()
|
||||||
}
|
}
|
||||||
|
|
||||||
// fuel pump priming menu
|
// fuel pump priming menu
|
||||||
loc.xPos = 67;
|
loc.xPos = 66;
|
||||||
// yPos = 16;
|
|
||||||
// _printMenuText(border, yPos, "Pump");
|
|
||||||
loc.width = BowserIconInfo.width;
|
loc.width = BowserIconInfo.width;
|
||||||
loc.height = BowserIconInfo.height;
|
loc.height = BowserIconInfo.height;
|
||||||
_drawBitmap(loc.xPos, midline, BowserIconInfo);
|
_drawBitmap(loc.xPos, midline, BowserIconInfo);
|
||||||
|
|
|
@ -290,14 +290,14 @@ void interpretJsonCommand(char* pLine)
|
||||||
else if(strcmp("LowVoltCutout", it->key) == 0) {
|
else if(strcmp("LowVoltCutout", it->key) == 0) {
|
||||||
float fCal = it->value.as<float>();
|
float fCal = it->value.as<float>();
|
||||||
if(fCal != 0) {
|
if(fCal != 0) {
|
||||||
bool bOK = false;
|
bool bOK = false;
|
||||||
if(NVstore.getHeaterTuning().sysVoltage == 120)
|
if(NVstore.getHeaterTuning().sysVoltage == 120)
|
||||||
bOK = INBOUNDS(fCal, 10.0, 12.5);
|
bOK = INBOUNDS(fCal, 10.0, 12.5);
|
||||||
else
|
else
|
||||||
bOK = INBOUNDS(fCal, 20.0, 25.0);
|
bOK = INBOUNDS(fCal, 20.0, 25.0);
|
||||||
if(bOK) {
|
if(bOK) {
|
||||||
sHeaterTuning ht = NVstore.getHeaterTuning();
|
sHeaterTuning ht = NVstore.getHeaterTuning();
|
||||||
ht.lowVolts = fCal;
|
ht.lowVolts = uint8_t(fCal * 10);
|
||||||
NVstore.setHeaterTuning(ht);
|
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("PumpCount", RTC_Store.getFuelGauge(), root); // running count of pump strokes
|
||||||
bSend |= moderator.addJson("PumpCal", NVstore.getHeaterTuning().pumpCal, root); // mL/stroke
|
bSend |= moderator.addJson("PumpCal", NVstore.getHeaterTuning().pumpCal, root); // mL/stroke
|
||||||
bSend |= moderator.addJson("TempOffset", NVstore.getHeaterTuning().tempOfs, root); // degC offset
|
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) {
|
if(bSend) {
|
||||||
root.printTo(opStr, len);
|
root.printTo(opStr, len);
|
||||||
|
|
Loading…
Reference in a new issue