heating page 2

This commit is contained in:
Karl Hudgell 2020-09-22 11:49:55 +01:00
parent 13ad35fde5
commit eda16c123b
3 changed files with 13 additions and 3 deletions

9
app.js
View File

@ -19,10 +19,15 @@ async function main() {
console.log('Error', err); console.log('Error', err);
} }
if (value === 1) { if (value === 1) {
console.log('Water Switch')
if (globalVars.waterOn === 'true') { if (globalVars.waterOn === 'true') {
common.request(0) await common.request(0)
await common.pause(2000)
menu.water()
} else { } else {
common.request(1) await common.request(1)
await common.pause(2000)
menu.water()
} }
} }
}) })

View File

@ -82,6 +82,10 @@ module.exports = {
module.exports.NextEvent(heatingNextEvent) module.exports.NextEvent(heatingNextEvent)
module.exports.heatingStatus(heatingStatus) module.exports.heatingStatus(heatingStatus)
}, },
heatingPageTwo: async (measuredRoomTemp, lastTimerSetPoint) => {
module.exports.currentRoomTemp(measuredRoomTemp)
module.exports.lastSetTemp(lastTimerSetPoint)
},
waterPageOne: async (waterStatus, waterNextEvent) => { waterPageOne: async (waterStatus, waterNextEvent) => {
module.exports.NextEvent(waterNextEvent) module.exports.NextEvent(waterNextEvent)
module.exports.waterStatus(waterStatus) module.exports.waterStatus(waterStatus)

View File

@ -51,7 +51,8 @@ module.exports = {
led.set('red') led.set('red')
} else { } else {
globalVars.heatingOn = heatingOn 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') led.set('blue')
} }
// } // }