heating page 2

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()
       }
     }
   })

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)

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')
                     }
                     // }