From d6bba90c84db3ec9c545bd42a6be7e7f97ab6735 Mon Sep 17 00:00:00 2001
From: Ray Jones <ray@mrjones.id.au>
Date: Mon, 22 Jul 2019 06:30:08 +1000
Subject: [PATCH] LVC JSON now proper floating point. Tidied screen dribbles in
 priming menu

---
 src/Afterburner/src/OLED/PrimingScreen.cpp |  8 ++++----
 src/Afterburner/src/Utility/BTC_JSON.cpp   | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Afterburner/src/OLED/PrimingScreen.cpp b/src/Afterburner/src/OLED/PrimingScreen.cpp
index 0a0674f..763bec4 100644
--- a/src/Afterburner/src/OLED/PrimingScreen.cpp
+++ b/src/Afterburner/src/OLED/PrimingScreen.cpp
@@ -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);
diff --git a/src/Afterburner/src/Utility/BTC_JSON.cpp b/src/Afterburner/src/Utility/BTC_JSON.cpp
index 94d7625..5a6ed56 100644
--- a/src/Afterburner/src/Utility/BTC_JSON.cpp
+++ b/src/Afterburner/src/Utility/BTC_JSON.cpp
@@ -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);