public/javascripts/laufschrift.js

- Auszeit-Zeile nur anzeigen, wenn per WebApp geschaltet wurde

public/javascripts/version.js
   - angepasst

routes/switch.js
   - TOPIC in Environment
   - retur.offtime löschen, wenn OFF empfangen wird

routes/switch.js

@@ -15,12 +15,14 @@ let MQTTHOST = process.env.MQTTHOST;
 let MQTTPORT = process.env.MQTTPORT;
 let MQTTUSR = process.env.MQTTUSR;
 let MQTTPWD = process.env.MQTTPWD;
+let TOPIC=process.env.TOPIC;
 
 
 if (MQTTHOST === undefined) { MQTTHOST = 'localhost';}
 if (MQTTPORT === undefined) { MQTTPORT = 1883;}
 if (MQTTUSR === undefined) { MQTTUSR = "";}
 if (MQTTPWD === undefined) { MQTTPWD = "";}
+if (TOPIC === undefined) { TOPIC = "sonoff";}
 
 /*
 if (MQTTHOST === undefined) { MQTTHOST = 'laufschrift.rexfue.de';}
@@ -42,12 +44,15 @@ console.log("Start: ", moment().format("YYYY-MM-DD HH:mm"));
 client.on('connect', function() {
     connected = true;
     retur.connect = 'connected';
-    client.subscribe('stat/laufschrift/POWER');
+    client.subscribe('stat/'+TOPIC+'/POWER');
 })
 
 client.on('message',function(topix,message) {
     relais = message.toString();
     console.log("Status = ",relais);
+    if (relais == 'OFF') {
+        delete retur.offtime;
+    }
     retur.relais = relais;
 });
 
@@ -77,14 +82,13 @@ doPublish("");
 
 function doPublish(payload) {
 //    retur.relais='pending';
-    client.publish('cmnd/laufschrift/Power',payload);
+    client.publish('cmnd/'+TOPIC+'/Power',payload);
     if (payload == 'On') {
-        offtime = moment().add(brenndauer,'s').format("HH.mm");
-        tio =setTimeout(doPublish,brenndauer*1000,"Off");
+        offtime = moment().add(brenndauer, 's').format("HH.mm");
+        tio = setTimeout(doPublish, brenndauer * 1000, "Off");
         retur.offtime = offtime;
     } else if (payload == 'Off') {
         clearTimeout(tio);
-        delete retur.offtime;
     }
 }
 // end MQTT