From eda16c123bb0945688a7a0b0e31dedb88e825c1c Mon Sep 17 00:00:00 2001
From: Karl Hudgell <karl@k-world.me.uk>
Date: Tue, 22 Sep 2020 11:49:55 +0100
Subject: [PATCH] heating page 2

---
 app.js             | 9 +++++++--
 libs/lcd.js        | 4 ++++
 modules/heating.js | 3 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index f429ed8..aa171ef 100644
--- a/app.js
+++ b/app.js
@@ -19,10 +19,15 @@ async function main() {
       console.log('Error', err);
     }
     if (value === 1) {
+      console.log('Water Switch')
       if (globalVars.waterOn === 'true') {
-        common.request(0)
+        await common.request(0)
+        await common.pause(2000)
+        menu.water()
       } else {
-        common.request(1)
+        await common.request(1)
+        await common.pause(2000)
+        menu.water()
       }
     }
   })
diff --git a/libs/lcd.js b/libs/lcd.js
index 81008b7..a3ad1c3 100644
--- a/libs/lcd.js
+++ b/libs/lcd.js
@@ -82,6 +82,10 @@ module.exports = {
         module.exports.NextEvent(heatingNextEvent)
         module.exports.heatingStatus(heatingStatus)
     },
+    heatingPageTwo: async (measuredRoomTemp, lastTimerSetPoint) => {
+        module.exports.currentRoomTemp(measuredRoomTemp)
+        module.exports.lastSetTemp(lastTimerSetPoint)
+    },
     waterPageOne: async (waterStatus, waterNextEvent) => {
         module.exports.NextEvent(waterNextEvent)
         module.exports.waterStatus(waterStatus)
diff --git a/modules/heating.js b/modules/heating.js
index da14c86..fb77cde 100644
--- a/modules/heating.js
+++ b/modules/heating.js
@@ -51,7 +51,8 @@ module.exports = {
                         led.set('red')
                     } else {
                         globalVars.heatingOn = heatingOn
-                        lcd.heatingPageOne('Off', data.measuredRoomTemp, data.lastTimerSetPoint, globalVars.waterNextEvent)
+                        // lcd.heatingPageOne('Off', data.measuredRoomTemp, data.lastTimerSetPoint, globalVars.waterNextEvent)
+                        lcd.heatingPageTwo(data.measuredRoomTemp, data.lastTimerSetPoint)
                         led.set('blue')
                     }
                     // }