fixed crash in event handling (single event)

thkl · Dec 23, 2016 · f239148 · f239148
1 parent 39f27e2
commit f239148
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/ChannelServices/HomeKitGenericService.js b/ChannelServices/HomeKitGenericService.js
@@ -222,7 +222,10 @@ HomeKitGenericService.prototype = {
 
     var that = this;
 
+	if ((channel!=undefined) && (dp!=undefined)) {
+
     var tp = this.transformDatapoint(dp);
+
     if (tp[1] == 'LEVEL') {
     	newValue = newValue * 100;
     }
@@ -273,6 +276,7 @@ HomeKitGenericService.prototype = {
         this.cache(dp,newValue);
     }
     this.eventupdate = false;
+    }
   },
 
   mappedValue:function(dp,value) {
@@ -378,15 +382,19 @@ HomeKitGenericService.prototype = {
 
 
   transformDatapoint : function(dp) {
-    var pos = dp.indexOf(":");
-    if (pos==-1) {
-      return [this.adress,dp];
+    if (dp) {
+    	var pos = dp.indexOf(":");
+   	 	if (pos==-1) {
+      		return [this.adress,dp];
+    	}
+    	var ndp = dp.substr(pos+1,dp.length);
+    	var nadr = this.adress.substr(0,this.adress.indexOf(":"));
+    	var chnl = dp.substr(0,pos);
+    	nadr = nadr + ":" + chnl;
+	    return [nadr,ndp];
+    } else {
+    	return -1;
     }
-    var ndp = dp.substr(pos+1,dp.length);
-    var nadr = this.adress.substr(0,this.adress.indexOf(":"));
-    var chnl = dp.substr(0,pos);
-    nadr = nadr + ":" + chnl;
-    return [nadr,ndp];
   },
 
   getServices: function() {

diff --git a/HomeMaticRPC.js b/HomeMaticRPC.js
@@ -102,7 +102,7 @@ HomeMaticRPC.prototype.init = function() {
 
       that.platform.foundAccessories.map(function(accessory) {
        if ((accessory.adress == channel) || ((accessory.cadress != undefined) && (accessory.cadress == channel))) {
-         accessory.event(datapoint, value);
+         accessory.event(channel, datapoint, value);
        }
       });
       callback(null,[]);
@@ -129,9 +129,7 @@ HomeMaticRPC.prototype.init = function() {
                 if ((accessory.adress == channel) || 
                 ((accessory.cadress != undefined) && (accessory.cadress == channel)) || 
                 ((accessory.deviceAdress != undefined) && (accessory.deviceAdress == deviceAdress))) {
-
                   accessory.event(channel,datapoint, value);
-
                 }
 
               });

diff --git a/changelog b/changelog
@@ -3,6 +3,9 @@ Changelog
 
 **** BEGINNING OF VERSION 0.0.41 the selection of channels to use with HomeKit via a CCU Subsection is mandatory
 
+Version 0.0.62
+fixed Crash in Device Event Handling 
+
 Version 0.0.61
 fixed Crash in RPC
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-homematic",
-  "version": "0.0.61",
+  "version": "0.0.62",
   "description": "Homematic plugin for homebridge: https://github.com/nfarina/homebridge",
   "license": "ISC",
   "keywords": [