updates to merge user_data

damianxd · Mar 12, 2017 · bc5f404 · bc5f404
1 parent 455669b
commit bc5f404
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/index.js b/index.js
@@ -26,7 +26,7 @@ VeraLinkPlatform.prototype = {
           .getVeraInfo()
           .then( (verainfo)=>{
             if(typeof verainfo === 'object'){
-              var devices = this.functions.processall(this.verainfo);
+              var devices = this.functions.processall(verainfo);
               var accessories = devices.map( (device)=>{
                   return this.createAccessory(device,this);
               });

diff --git a/lib/functions.js b/lib/functions.js
@@ -31,13 +31,27 @@ module.exports = function(HAPnode, config)
 
       module.getVeraInfo = function()
       {
-          var url = "http://" + config.veraIP + ":3480/data_request?id=user_data";
-          return HAPnode.
-            request({
+          return HAPnode
+            .request({
               method: 'GET',
-              uri: url,
+              uri: "http://" + config.veraIP + ":3480/data_request?id=user_data",
               json: true
-            }).then(function (data) {
+            }).then( (data)=> {
+              return HAPnode
+                .request({
+                  method: 'GET',
+                  uri: "http://" + config.veraIP + ":3480/data_request?id=lu_sdata",
+                  json: true
+                }).then( (response)=>{
+                  data.devices.forEach( (device, index)=>{
+                    var match = response.devices.find( (sdevice, index)=>{
+                      return parseInt(device.id) === parseInt(sdevice.id);
+                    })
+                    Object.assign(device, match);
+                  });
+                  return data;
+                });
+            }).then( function(data){
               devices = {};
               if(typeof data === 'object'){
                 data.devices.forEach(function(device)
@@ -49,7 +63,6 @@ module.exports = function(HAPnode, config)
 
                     devices[device.room].push(device);
                 });
-
                 return(
                   {
                     rooms: data.rooms,
@@ -62,9 +75,9 @@ module.exports = function(HAPnode, config)
               } else {
                 return(null);
               }
-          }.bind(this)).catch(function (err) {
-            HAPnode.debug("Request error:"+err);
-          });
+            }.bind(this)).catch(function (err) {
+              HAPnode.debug("Request error:"+err);
+            });
       },
 
       module.processall = function(verainfo)
@@ -174,10 +187,13 @@ module.exports = function(HAPnode, config)
       module.processdevices = function(list, verainfo)
       {
           var accessories = [];
-
           list.forEach(function(device)
           {
               HAPnode.debug(device.name + ' ID:' +device.id);
+              device.category = device.category_num;
+              device.subcategory = device.subcategory_num;
+              delete device.category_num;
+              delete device.subcategory_num;
               switch (device.category)
               {
                   case 2: // Dimmable Light:

diff --git a/lib/types/sensor.js b/lib/types/sensor.js
@@ -123,7 +123,6 @@ module.exports = function (HAPnode, config, functions) {
         module = {};
 
     return function (device) {
-
         var hapuuid = uuid.generate('device:sensor:' + config.cardinality + ':' + device.id),
             accessory = new Accessory(device.name, hapuuid),
             serviceMap = SensorMap.find(function(service, index){