aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2015-11-01 21:06:08 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2015-11-01 21:06:08 +0100
commitf17922bcafe1f2f369c9be0f236570771c8ab214 (patch)
tree5f4050a4c125d85417f617a16cb77e75ea444d6f
parent478a69d834904f62cc4fb5ff52d5ed345e6859af (diff)
downloaddiller-server-f17922bcafe1f2f369c9be0f236570771c8ab214.tar.gz
diller-server-f17922bcafe1f2f369c9be0f236570771c8ab214.tar.bz2
diller-server-f17922bcafe1f2f369c9be0f236570771c8ab214.tar.xz
diller-server-f17922bcafe1f2f369c9be0f236570771c8ab214.zip
core:
o Replacing 'sensor' with 'property'.
-rw-r--r--src/Diller.js4
-rw-r--r--src/web/DillerWeb.js2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Diller.js b/src/Diller.js
index e2dd47d..230af7a 100644
--- a/src/Diller.js
+++ b/src/Diller.js
@@ -80,9 +80,9 @@ function Diller(config, pg, dao) {
log.info('Processing message to ' + topic);
- // /diller/5c:cf:7f:06:59:a5/sensors/temp-0/value
+ // /diller/5c:cf:7f:06:59:a5/property/temp-0/value
- if (parts[3] == 'sensors') {
+ if (parts[3] == 'sensors' || parts[3] == 'sensor') {
parts[3] = 'property';
}
diff --git a/src/web/DillerWeb.js b/src/web/DillerWeb.js
index 5f52bde..4d032ed 100644
--- a/src/web/DillerWeb.js
+++ b/src/web/DillerWeb.js
@@ -145,7 +145,7 @@ function DillerWeb(config, mqttClient, tx) {
p = diller.updatePropertyAttributes(propertyId, attributes);
- var topic = '/diller/' + device.key + '/sensors/' + property.key + '/' + body.attribute;
+ var topic = '/diller/' + device.key + '/property/' + property.key + '/' + body.attribute;
var opts = {
retain: true
};