admin/laufschrift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

public/javascripts/laufschrift.js

Browse Source 
- 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
This commit is contained in:
Reinhard X. Fürst
2019-04-10 17:38:23 +02:00
parent 424cfccd01
commit 846bcf01ec
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/javascripts/laufschrift.js
View File

@@ -71,8 +71,10 @@ $(document).ready(function() {
$('#schalter').html('Laufschrift <b>AUS</b> schalten'); $('#schalter').html('Laufschrift <b>AUS</b> schalten');
$('#status').text('EIN'); $('#status').text('EIN');
$('#laufzeile').addClass('machrot'); $('#laufzeile').addClass('machrot');
if(data.offtime != undefined) {
$('#auszeit').text(data.offtime); $('#auszeit').text(data.offtime);
$('#auszeile').show(); $('#auszeile').show();
}
} else { } else {
$('#schalter').html('Laufschrift <b>EIN</b> schalten'); $('#schalter').html('Laufschrift <b>EIN</b> schalten');
$('#status').text('AUS'); $('#status').text('AUS');

4
public/javascripts/version.js
View File

@@ -1,7 +1,7 @@
// VersiosNummern und -Geschichte // VersiosNummern und -Geschichte
var VERSION="1.0"; var VERSION="1.1";
var VDATE="2019-04-05"; var VDATE="2019-04-10";
/* History /* History

14
routes/switch.js
View File

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