Service in JSON hinzugefügt

Schnittcher · Feb 7, 2017 · c54c8ae · c54c8ae
1 parent af7d2d8
commit c54c8ae
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/lib/websocket.js b/lib/websocket.js
@@ -180,13 +180,13 @@ Websocket.prototype.validate = function(accessory) {
   return {isValid: isValid, message: message, value: value};
 }
 
-Websocket.prototype.get = function(name, c, callback) {
+Websocket.prototype.get = function(name, service, c, callback) {
 
   //this.log.debug("get %s %s", name, c);
 
   if (typeof(this.ws) !== "undefined" && this.ws.OPEN) {
     this.g_callback[name+c] = callback;
-    var data = {"topic": "get", "payload": {"name": name, "characteristic": c}};
+    var data = {"topic": "get", "service": service, "payload": {"name": name, "characteristic": c}};
     this.sendData(data);
   } else {
     this.log.debug("get client disconnected.");
@@ -207,16 +207,16 @@ Websocket.prototype.get = function(name, c, callback) {
   }.bind(this), 1000);
 }
 
-Websocket.prototype.set = function(name, c, value, callback) {
- 
-  if (typeof(this.ws) !== "undefined" && this.ws.OPEN) {       
+Websocket.prototype.set = function(name, service, c, value, callback) {
+
+  if (typeof(this.ws) !== "undefined" && this.ws.OPEN) {
 
     if (c === "On") {
       value = (value == 0 || value == false) ? false : true;
     }
-    
-    var data = {"topic": "set", "payload": {"name": name, "characteristic": c, "value": value}};
-    
+
+    var data = {"topic": "set", "service": service, "payload": {"name": name, "characteristic": c, "value": value}};
+
     switch (c) {
       case "Brightness":
       case "TargetPosition":