working time, screen, organize a bit

app.js

@@ -1,16 +1,21 @@
 const { Gpio } = require('onoff');
-const poll = require('./poll')
+const hotwater = require('./modules/hotwater')
 const common = require('./libs/common')
 const globalVars = require('./libs/globalVars')
+const led = require('./libs/led')
 const lcd = require('./libs/lcd')
 
-lcd.heading()
-// lcd.time()
-poll.setInterval
 
-const switchIn = new Gpio('17', 'in', 'both');
+async function main() {
+  lcd.clearScreen()
+  await lcd.intro()
+  lcd.time()
+  hotwater.setInterval
 
-switchIn.watch( async (err, value) => {
+  const heatingSwitch = new Gpio('17', 'in', 'both');
+  const appSwitch = new Gpio('23', 'in', 'both');
+
+  heatingSwitch.watch(async (err, value) => {
     if (err) {
       console.log('Error', err);
     }
@@ -22,3 +27,24 @@ switchIn.watch( async (err, value) => {
       }
     }
   })
+
+  appSwitch.watch(async (err, value) => {
+    if (err) {
+      console.log('Error', err);
+    }
+    if (value === 1) {
+      console.log('pressed')
+    }
+  })
+
+}
+
+process.stdin.resume();
+
+process.on('SIGINT', function () {
+  lcd.clearScreen()
+  led.set('off')
+  process.exit(1)
+});
+
+main()

libs/clock.js

@@ -0,0 +1,12 @@
+const moment = require('moment'); // require
+
+module.exports = {
+    time: () => {
+        try {
+            t = moment().format('HH:MM');
+            return t
+        } catch (error) {
+            console.log(error)
+        }
+    }
+}

libs/common.js

@@ -15,4 +15,7 @@ module.exports = {
             });
 
     },
+    pause: async (time) => {
+        await new Promise(resolve => setTimeout(resolve, time));
+    },
 }

libs/globalVars.js

@@ -1,5 +1,6 @@
 class globalVariables {
     waterOn = "";
+    initialWater = "";
  }
 
 module.exports = new globalVariables();

libs/lcd.js

@@ -1,22 +1,52 @@
 const LCD = require('raspberrypi-liquid-crystal');
+const common = require('./common')
+const globalVars = require('./globalVars')
+const clock = require('./clock');
+const { time } = require('./clock');
 
 const lcd = new LCD(1, 0x27, 20, 4);
 
 lcd.beginSync();
 
 module.exports = {
-    heading: async () => {
+    clearScreen: async () => {
         lcd.clearSync();
-        lcd.printLineSync(0, 'MiGenie Hot Water')
+    },
-        lcd.printLineSync(1, '             By Karl')
+    clearLine: async (line) => {
+        line = line - 1
+        lcd.setCursorSync(0, line);
+        lcd.printSync('                    ')
+    },
+    intro: async () => {
+        lcd.clearSync();
+        lcd.printLineSync(1, 'MiGenie Status')
+        lcd.printLineSync(2, '             By Karl')
+        await common.pause(3000)
+        module.exports.heading('Hot Water')
+    },
+    heading: async (title) => {
+        lcd.clearSync();
+        lcd.printLineSync(2, title)
     },
     time: async () => {
-        lcd.setCursorSync(10,2);
+        // set interval
-        lcd.printSync('time')
+        var tid = setInterval(mycode, 60000);
-    },
+        async function mycode() {
-    updateScreen: async (input) => {
+            
-        lcd.setCursorSync(3, 0);
+        lcd.setCursorSync(15, 0);
-        lcd.printLineSync(3, input)
+        let f 
-    },
+        f = await clock.time()
+        lcd.printSync(f)
             
         }
+        function abortTimer() { // to be called when you want to stop the timer
+            clearInterval(tid);
+        }
+    },
+    heatingStatus: async (input) => {
+        lcd.setCursorSync(0, 3);
+        lcd.printSync('                    ')
+        lcd.setCursorSync(0, 3);
+        lcd.printSync('    ' + input)
+    },
+}

libs/led.js

@@ -0,0 +1,35 @@
+const { Gpio } = require('onoff');
+
+const redLED = new Gpio('4', 'out');
+const blueLED = new Gpio('27', 'out')
+const greenLED = new Gpio('22', 'out')
+
+
+module.exports = {
+    set: async (colour) => {
+        switch (colour) {
+            case 'red':
+                redLED.writeSync(1)
+                blueLED.writeSync(0)
+                greenLED.writeSync(0)
+                break;
+            case 'blue':
+                blueLED.writeSync(1)
+                redLED.writeSync(0)
+                greenLED.writeSync(0)
+                break;
+            case 'green':
+                blueLED.writeSync(0)
+                redLED.writeSync(0)
+                greenLED.writeSync(1)
+                break;
+            case 'off':
+                blueLED.writeSync(0)
+                redLED.writeSync(0)
+                greenLED.writeSync(0)
+                break;
+            default:
+                break;
+        }
+    },
+}

modules/hotwater.js

@@ -0,0 +1,72 @@
+const http = require('http')
+const { Gpio } = require('onoff');
+const globalVars = require('../libs/globalVars')
+const led = require('../libs/led')
+
+const redLED = new Gpio('4', 'out');
+const blueLED = new Gpio('27', 'out')
+const greenLED = new Gpio('22', 'out')
+
+const lcd = require('../libs/lcd')
+
+setInterval(function () {
+
+    var rest_options = {
+        host: '192.168.4.5',
+        port: 2020,
+        path: '/water/status',
+        method: 'GET'
+    };
+
+    var request = http.request(rest_options, function (response) {
+        var content = "";
+
+        // Handle data chunks
+        response.on('data', function (chunk) {
+            content += chunk;
+        });
+
+        // Once we're done streaming the response, parse it as json.
+        response.on('end', function () {
+            var data = JSON.parse(content);
+            let waterOn = data.waterOn
+            if (globalVars.waterOn === "" || globalVars.waterOn === "error") {
+                if (waterOn === 'true') {
+                    lcd.heatingStatus('Heating')
+                    led.set('red')
+                    globalVars.waterOn = waterOn
+                } else {
+                    lcd.heatingStatus('Not Heating')
+                    led.set('blue')
+                    globalVars.waterOn = waterOn
+                }
+            } else {
+                if (waterOn != globalVars.waterOn) {
+                    if (waterOn === 'true') {
+                        lcd.heatingStatus('Heating')
+                        led.set('red')
+                        globalVars.waterOn = waterOn
+                    } else {
+                        lcd.heatingStatus('Not Heating')
+                        led.set('blue')
+                        globalVars.waterOn = waterOn
+                    }
+                }
+            }
+        });
+    });
+
+    // Report errors
+    request.on('error', function (error) {
+        lcd.heatingStatus('Error')
+        led.set('green')
+        lcd.heatingStatus('Error No Data')
+        globalVars.waterOn = 'error'
+    });
+
+    request.end();
+}, 5000);
+
+module.exports = {
+    setInterval
+}

package-lock.json

@@ -397,6 +397,11 @@
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
       "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
     },
+    "moment": {
+      "version": "2.28.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.28.0.tgz",
+      "integrity": "sha512-Z5KOjYmnHyd/ukynmFd/WwyXHd7L4J9vTI/nn5Ap9AVUgaAE15VvQ9MOGmJJygEUklupqIrFnor/tjTwRU+tQw=="
+    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",

package.json

@@ -12,6 +12,7 @@
     "fs": "0.0.1-security",
     "got": "^11.6.2",
     "http": "0.0.1-security",
+    "moment": "^2.28.0",
     "onoff": "^6.0.0",
     "pigpio": "^3.2.3",
     "raspberrypi-liquid-crystal": "^1.15.0",

poll.js

@@ -1,63 +0,0 @@
-const http = require('http')
-const { Gpio } = require('onoff');
-const globalVars = require('./libs/globalVars')
-
-const redLED = new Gpio('4', 'out');
-const blueLED = new Gpio('27', 'out')
-const greenLED = new Gpio('22', 'out')
-
-const lcd = require('./libs/lcd')
-
-setInterval(function () {
-
-    var rest_options = {
-        host: '192.168.4.5',
-        port: 2020,
-        path: '/water/status',
-        method: 'GET'
-    };
-
-    var request = http.request(rest_options, function (response) {
-        var content = "";
-
-        // Handle data chunks
-        response.on('data', function (chunk) {
-            content += chunk;
-        });
-
-        // Once we're done streaming the response, parse it as json.
-        response.on('end', function () {
-            var data = JSON.parse(content);
-            let waterOn = data.waterOn
-            globalVars.waterOn = waterOn
-            if (waterOn === 'true') {
-                lcd.updateScreen('Heating')
-                redLED.writeSync(1)
-                blueLED.writeSync(0)
-                greenLED.writeSync(0)
-
-            } else {
-                lcd.updateScreen('Not Heating')
-                blueLED.writeSync(1)
-                redLED.writeSync(0)
-                greenLED.writeSync(0)
-
-            }
-        });
-    });
-
-    // Report errors
-    request.on('error', function (error) {
-        lcd.updateScreen('Error')
-        redLED.writeSync(0)
-        blueLED.writeSync(0)
-        greenLED.writeSync(1)
-        console.log("Error while calling endpoint.", error);
-    });
-
-    request.end();
-}, 5000);
-
-module.exports = {
-    setInterval
-}

test.js

@@ -0,0 +1,5 @@
+const moment = require('moment'); // require
+
+
+            t = moment().format('HH:MM:ss');
+            console.log(t)