Fixes
This commit is contained in:
parent
771e325ae3
commit
8dd7992043
@ -65,7 +65,7 @@ function connect(item) {
|
|||||||
function () {
|
function () {
|
||||||
Log.log('Motion detected');
|
Log.log('Motion detected');
|
||||||
var callOptions = item.on.motion.call;
|
var callOptions = item.on.motion.call;
|
||||||
doMotionCall(callOptions);
|
doMotionCall(HOST, callOptions);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -77,7 +77,10 @@ function connect(item) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* private */
|
/* private */
|
||||||
function doMotionCall(options) {
|
function doMotionCall(host, options) {
|
||||||
|
const HOST = host;
|
||||||
|
|
||||||
|
|
||||||
callback = function(response) {
|
callback = function(response) {
|
||||||
var str = '';
|
var str = '';
|
||||||
|
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
"motion": {
|
"motion": {
|
||||||
"call": {
|
"call": {
|
||||||
"type": "web",
|
"type": "web",
|
||||||
"host": "hobu",
|
"host": "hobu.local",
|
||||||
"port": "2999",
|
"port": "2999",
|
||||||
"path": "/home/motion/detected/in/1/"
|
"path": "/home/motion/detected/in/1/"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -69,9 +69,9 @@ function connect(item) {
|
|||||||
Log.log('Distance Value: ' + distance);
|
Log.log('Distance Value: ' + distance);
|
||||||
|
|
||||||
if(distance < item.value) {
|
if(distance < item.value) {
|
||||||
doDoorStateChangedCall(item.on.action.open);
|
doDoorStateChangedCall(HOST, item.on.action.open);
|
||||||
} else {
|
} else {
|
||||||
doDoorStateChangedCall(item.on.action.closed);
|
doDoorStateChangedCall(HOST, item.on.action.closed);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@ -84,7 +84,9 @@ function connect(item) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* private */
|
/* private */
|
||||||
function doDoorStateChangedCall(options) {
|
function doDoorStateChangedCall(host, options) {
|
||||||
|
const HOST = host;
|
||||||
|
|
||||||
Log.inspect('Call options', options);
|
Log.inspect('Call options', options);
|
||||||
|
|
||||||
callback = function(response) {
|
callback = function(response) {
|
||||||
|
|||||||
@ -9,12 +9,12 @@
|
|||||||
"action": {
|
"action": {
|
||||||
"timeout": 2000,
|
"timeout": 2000,
|
||||||
"open": {
|
"open": {
|
||||||
"host": "hobu",
|
"host": "hobu.local",
|
||||||
"port": "2999",
|
"port": "2999",
|
||||||
"path": "/set/state/of/door/100/to/open/"
|
"path": "/set/state/of/door/100/to/open/"
|
||||||
},
|
},
|
||||||
"closed": {
|
"closed": {
|
||||||
"host": "hobu",
|
"host": "hobu.local",
|
||||||
"port": "2999",
|
"port": "2999",
|
||||||
"path": "/set/state/of/door/100/to/closed/"
|
"path": "/set/state/of/door/100/to/closed/"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -76,7 +76,7 @@ function connect(item) {
|
|||||||
var url2callObj = (counter % 2 == 0 ? item.on.action.on : item.on.action.off);
|
var url2callObj = (counter % 2 == 0 ? item.on.action.on : item.on.action.off);
|
||||||
|
|
||||||
Log.log('Distance Value: ' + distance + ', URL to call: ' + url2callObj.host + ':' + url2callObj.port + url2callObj.path);
|
Log.log('Distance Value: ' + distance + ', URL to call: ' + url2callObj.host + ':' + url2callObj.port + url2callObj.path);
|
||||||
doHoBuDoorBellCall(url2callObj);
|
doHoBuDoorBellCall(HOST, url2callObj);
|
||||||
|
|
||||||
setTimeout(function() { readyForNextNotification = true; }, item.on.action.timeout);
|
setTimeout(function() { readyForNextNotification = true; }, item.on.action.timeout);
|
||||||
}
|
}
|
||||||
@ -92,7 +92,9 @@ function connect(item) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* private */
|
/* private */
|
||||||
function doHoBuDoorBellCall(options) {
|
function doHoBuDoorBellCall(host, options) {
|
||||||
|
const HOST = host;
|
||||||
|
|
||||||
callback = function(response) {
|
callback = function(response) {
|
||||||
var str = '';
|
var str = '';
|
||||||
|
|
||||||
|
|||||||
@ -10,12 +10,12 @@
|
|||||||
"action": {
|
"action": {
|
||||||
"timeout": 2200,
|
"timeout": 2200,
|
||||||
"on": {
|
"on": {
|
||||||
"host": "hobu",
|
"host": "hobu.local",
|
||||||
"port": "2999",
|
"port": "2999",
|
||||||
"path": "/set/state/of/powercontrol/23/to/1/"
|
"path": "/set/state/of/powercontrol/23/to/1/"
|
||||||
},
|
},
|
||||||
"off": {
|
"off": {
|
||||||
"host": "hobu",
|
"host": "hobu.local",
|
||||||
"port": "2999",
|
"port": "2999",
|
||||||
"path": "/set/state/of/powercontrol/23/to/0/"
|
"path": "/set/state/of/powercontrol/23/to/0/"
|
||||||
}
|
}
|
||||||
@ -32,12 +32,12 @@
|
|||||||
"action": {
|
"action": {
|
||||||
"timeout": 2200,
|
"timeout": 2200,
|
||||||
"on": {
|
"on": {
|
||||||
"host": "hobu",
|
"host": "hobu.local",
|
||||||
"port": "2999",
|
"port": "2999",
|
||||||
"path": "/set/state/of/powercontrol/27/to/1/"
|
"path": "/set/state/of/powercontrol/27/to/1/"
|
||||||
},
|
},
|
||||||
"off": {
|
"off": {
|
||||||
"host": "hobu",
|
"host": "hobu.local",
|
||||||
"port": "2999",
|
"port": "2999",
|
||||||
"path": "/set/state/of/powercontrol/27/to/0/"
|
"path": "/set/state/of/powercontrol/27/to/0/"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -93,17 +93,19 @@ function connect(item) {
|
|||||||
function handleDependingOnValue(item, value2check) {
|
function handleDependingOnValue(item, value2check) {
|
||||||
switch(value2check) {
|
switch(value2check) {
|
||||||
case item.on.action.open.value:
|
case item.on.action.open.value:
|
||||||
doDoorStateChangedCall(item.on.action.open);
|
doDoorStateChangedCall(HOST, item.on.action.open);
|
||||||
break;
|
break;
|
||||||
case item.on.action.closed.value:
|
case item.on.action.closed.value:
|
||||||
doDoorStateChangedCall(item.on.action.closed);
|
doDoorStateChangedCall(HOST, item.on.action.closed);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* private */
|
/* private */
|
||||||
function doDoorStateChangedCall(options) {
|
function doDoorStateChangedCall(host, options) {
|
||||||
|
const HOST = host;
|
||||||
|
|
||||||
Log.inspect('Call options', options);
|
Log.inspect('Call options', options);
|
||||||
|
|
||||||
callback = function(response) {
|
callback = function(response) {
|
||||||
|
|||||||
@ -9,13 +9,13 @@
|
|||||||
"timeout": 2000,
|
"timeout": 2000,
|
||||||
"open": {
|
"open": {
|
||||||
"value": "1110",
|
"value": "1110",
|
||||||
"host": "hobu",
|
"host": "hobu.local",
|
||||||
"port": "2999",
|
"port": "2999",
|
||||||
"path": "/set/state/of/door/100/to/open/"
|
"path": "/set/state/of/door/100/to/open/"
|
||||||
},
|
},
|
||||||
"closed": {
|
"closed": {
|
||||||
"value": "1111",
|
"value": "1111",
|
||||||
"host": "hobu",
|
"host": "hobu.local",
|
||||||
"port": "2999",
|
"port": "2999",
|
||||||
"path": "/set/state/of/door/100/to/closed/"
|
"path": "/set/state/of/door/100/to/closed/"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -68,7 +68,7 @@ function connect(item) {
|
|||||||
// Callback function for intensity callback
|
// Callback function for intensity callback
|
||||||
function (intensity) {
|
function (intensity) {
|
||||||
Log.log('Intensity: ' + intensity);
|
Log.log('Intensity: ' + intensity);
|
||||||
doHoBuDoorBellCall(item);
|
doHoBuDoorBellCall(HOST, item);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -81,7 +81,9 @@ function connect(item) {
|
|||||||
|
|
||||||
|
|
||||||
/* private */
|
/* private */
|
||||||
function doHoBuDoorBellCall(item) {
|
function doHoBuDoorBellCall(host, item) {
|
||||||
|
const HOST = host;
|
||||||
|
|
||||||
var options = {
|
var options = {
|
||||||
host: item.on.action.ring.host,
|
host: item.on.action.ring.host,
|
||||||
port: item.on.action.ring.port,
|
port: item.on.action.ring.port,
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
"period": 1000,
|
"period": 1000,
|
||||||
"ring": {
|
"ring": {
|
||||||
"marker": 2300,
|
"marker": 2300,
|
||||||
"host": "hobu",
|
"host": "hobu.local",
|
||||||
"port": "2999",
|
"port": "2999",
|
||||||
"path": "/doorbell/ring/Wohnungstür/"
|
"path": "/doorbell/ring/Wohnungstür/"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -117,6 +117,7 @@ function connectCategoryHR(item, ipcon) {
|
|||||||
|
|
||||||
/* private */
|
/* private */
|
||||||
function saveValue(value, item) {
|
function saveValue(value, item) {
|
||||||
|
const HOST = item.host;
|
||||||
var room = item.on.new.value.room;
|
var room = item.on.new.value.room;
|
||||||
var category = item.on.new.value.category;
|
var category = item.on.new.value.category;
|
||||||
|
|
||||||
|
|||||||
@ -11,7 +11,7 @@
|
|||||||
"new": {
|
"new": {
|
||||||
"value": {
|
"value": {
|
||||||
"type": "web",
|
"type": "web",
|
||||||
"host": "hobu",
|
"host": "hobu.local",
|
||||||
"port": "2999",
|
"port": "2999",
|
||||||
"category": "TEMPERATURE",
|
"category": "TEMPERATURE",
|
||||||
"room": 1
|
"room": 1
|
||||||
@ -30,7 +30,7 @@
|
|||||||
"new": {
|
"new": {
|
||||||
"value": {
|
"value": {
|
||||||
"type": "web",
|
"type": "web",
|
||||||
"host": "hobu",
|
"host": "hobu.local",
|
||||||
"port": "2999",
|
"port": "2999",
|
||||||
"category": "RH",
|
"category": "RH",
|
||||||
"room": 1
|
"room": 1
|
||||||
@ -49,7 +49,7 @@
|
|||||||
"new": {
|
"new": {
|
||||||
"value": {
|
"value": {
|
||||||
"type": "web",
|
"type": "web",
|
||||||
"host": "hobu",
|
"host": "hobu.local",
|
||||||
"port": "2999",
|
"port": "2999",
|
||||||
"category": "TEMPERATURE",
|
"category": "TEMPERATURE",
|
||||||
"room": 3
|
"room": 3
|
||||||
@ -68,7 +68,7 @@
|
|||||||
"new": {
|
"new": {
|
||||||
"value": {
|
"value": {
|
||||||
"type": "web",
|
"type": "web",
|
||||||
"host": "hobu",
|
"host": "hobu.local",
|
||||||
"port": "2999",
|
"port": "2999",
|
||||||
"category": "RH",
|
"category": "RH",
|
||||||
"room": 3
|
"room": 3
|
||||||
@ -87,7 +87,7 @@
|
|||||||
"new": {
|
"new": {
|
||||||
"value": {
|
"value": {
|
||||||
"type": "web",
|
"type": "web",
|
||||||
"host": "hobu",
|
"host": "hobu.local",
|
||||||
"port": "2999",
|
"port": "2999",
|
||||||
"category": "TEMPERATURE",
|
"category": "TEMPERATURE",
|
||||||
"room": 2
|
"room": 2
|
||||||
@ -106,7 +106,7 @@
|
|||||||
"new": {
|
"new": {
|
||||||
"value": {
|
"value": {
|
||||||
"type": "web",
|
"type": "web",
|
||||||
"host": "hobu",
|
"host": "hobu.local",
|
||||||
"port": "2999",
|
"port": "2999",
|
||||||
"category": "RH",
|
"category": "RH",
|
||||||
"room": 2
|
"room": 2
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user