Merge pull request #42 from FirstBuild/FixPreheatScreen

Bug Fix - Preheat screen dome/stone temps
FirstBuild · Jan 18, 2022 · 10543f8 · 10543f8
2 parents 3c2c7be + 687e3f4
commit 10543f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/PizzaOvenUI/Screen_Preheating2Temp.qml b/PizzaOvenUI/Screen_Preheating2Temp.qml
@@ -35,9 +35,6 @@ Item {
 
     property string localOvenState: "Preheat1"
 
-    property int localDomeTemp: 0
-    property int localStoneTemp: 0
-
     Timer {
         id: displayUpdateTimer
         interval: 1000
@@ -161,8 +158,8 @@ Item {
 
         ovenStateCount = 3;
 
-        localDomeTemp = rootWindow.displayedDomeTemp;
-        localStoneTemp = rootWindow.displayedStoneTemp;
+        rootWindow.displayedDomeTemp = upperFront.setTemp;
+        rootWindow.displayedStoneTemp = lowerFront.setTemp;
     }
 
     function cleanUpOnExit() {
@@ -226,9 +223,9 @@ Item {
     CircleContentTwoTemp {
         id: circleContent
         needsAnimation: true
-        line1String: utility.tempToString(localDomeTemp)
+        line1String: utility.tempToString(upperFront.setTemp)
         line2String: domeToggle.state ? utility.tempToString(upperTemp) : "OFF"
-        line3String: utility.tempToString(localStoneTemp)
+        line3String: utility.tempToString(lowerFront.setTemp)
         line4String: utility.tempToString(lowerTemp)
         onTopStringClicked: {
             startExitToScreen("Screen_EnterDomeTemp.qml");

diff --git a/PizzaOvenUI/main.qml b/PizzaOvenUI/main.qml
@@ -165,7 +165,7 @@ Window {
 
     // some information
     property string controlVersion: "255.255.255.255"
-    property string uiVersion: originalConfiguration ? "0.3.8" : "20.0.8"
+    property string uiVersion: originalConfiguration ? "0.3.9" : "20.0.9"
     property string backendVersion: "255.255.255.255"
     property string interfaceVersion: "255.255.255.255"
     property string wifiMacId: ""