From f17922bcafe1f2f369c9be0f236570771c8ab214 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sun, 1 Nov 2015 21:06:08 +0100
Subject: core: o Replacing 'sensor' with 'property'.

---
 src/Diller.js        | 4 ++--
 src/web/DillerWeb.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

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
             };
-- 
cgit v1.2.3