node-red-contrib-knx-ultimate 2.0.0 → 2.0.1

package/CHANGELOG.md

@@ -6,6 +6,10 @@
 
 # CHANGELOG
 
+<p>
+<b>Version 2.0.1</b> - June 2023<br/>
+- NEW: more KNX group addresses in the HUE Light node<br/>
+</p>
 <p>
 <b>Version 2.0.0</b> - June 2023<br/>
 - NEW Added HUE Light node. More HUE nodes to come. Please feel free to try it.<br/>

package/KNXEngine/dptlib/index.js

@@ -95,7 +95,7 @@ dpts.populateAPDU = function (value, apdu, dptid) {
       }
     }
     // generic APDU is assumed to convey an unsigned integer of arbitrary bitlength
-    if (dpt.basetype.hasOwnProperty('signedness') && dpt.basetype.signedness == 'signed') {
+    if (dpt.basetype.hasOwnProperty('signedness') && dpt.basetype.signedness === 'signed') {
       apdu.data.writeIntBE(tgtvalue, 0, nbytes)
     } else {
       apdu.data.writeUIntBE(tgtvalue, 0, nbytes)

package/KNXUltimate.code-workspace

@@ -9,5 +9,15 @@
 			"path": "../node-red-contrib-knx-ultimate.wiki"
 		}
 	],
-	"settings": {}
+	"settings": {
+		
+  "editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
+  "editor.formatOnPaste": false, // required 
+  "editor.formatOnType": false, // required
+  "editor.formatOnSave": true, // optional 
+  "editor.formatOnSaveMode": "file", // required to format on save
+  "files.autoSave": "onFocusChange", // optional but recommended
+  "vs-code-prettier-eslint.prettierLast": "false" // set as "true" to run 'prettier' last not first
+
+	}
 }

package/nodes/hue-config.js

@@ -81,7 +81,7 @@ module.exports = (RED) => {
 
     // Init HUE Utility
     node.hueManager = new hueClass(node.host, node.credentials.username, node.credentials.clientkey, config.bridgeid)
-    
+
     // Event clip V2
     node.hueManager.on('event', _event => {
       node.nodeClients.forEach(_oClient => {
@@ -110,11 +110,7 @@ module.exports = (RED) => {
       }
     })
 
-    // Send to HUE
-    node.setLightState = (/** @type {string} */ _LightID, /** @type {any} */ _state = { on: true }) => {
-      node.hueManager.setLightState(_LightID, _state)
-    }
-
+  
     node.addClient = (_Node) => {
       // Check if node already exists
       if (node.nodeClients.filter(x => x.id === _Node.id).length === 0) {

package/nodes/knxUltimateHueLight.html

@@ -20,6 +20,22 @@
             GALightDIM: { value: "" },
             dptLightDIM: { value: "" },
 
+            nameLightColor: { value: "" },
+            GALightColor: { value: "" },
+            dptLightColor: { value: "" },
+
+            nameLightColorState: { value: "" },
+            GALightColorState: { value: "" },
+            dptLightColorState: { value: "" },
+
+            nameLightBrightness: { value: "" },
+            GALightBrightness: { value: "" },
+            dptLightBrightness: { value: "" },
+
+            nameLightBrightnessState: { value: "" },
+            GALightBrightnessState: { value: "" },
+            dptLightBrightnessState: { value: "" },
+
             hueLight: { value: "" }
         },
         inputs: 0,
@@ -69,9 +85,11 @@
             // ########################
             $.getJSON('knxUltimateDpts', (data) => {
                 data.forEach(dpt => {
-                    $("#node-input-dptLightSwitch").append($("<option></option>")
-                        .attr("value", dpt.value)
-                        .text(dpt.text))
+                    if (dpt.value.startsWith("1.")) {
+                        $("#node-input-dptLightSwitch").append($("<option></option>")
+                            .attr("value", dpt.value)
+                            .text(dpt.text))
+                    }
                 });
                 $("#node-input-dptLightSwitch").val(this.dptLightSwitch)
             })
@@ -84,7 +102,7 @@
                     $.getJSON("knxUltimatecsv?nodeID=" + oNodeServer.id, (data) => {
                         response($.map(data, function (value, key) {
                             var sSearch = (value.ga + " (" + value.devicename + ") DPT" + value.dpt);
-                            if (fullSearch(sSearch, request.term)) {
+                            if (fullSearch(sSearch, request.term + " 1.")) {
                                 return {
                                     label: value.ga + " # " + value.devicename + " # " + value.dpt, // Label for Display
                                     value: value.ga // Value
@@ -102,7 +120,6 @@
                     } catch (error) {
                     }
                     $('#node-input-nameLightSwitch').val(sDevName);
-                    $('#node-input-name').val(sDevName);
                     var optVal = $("#node-input-dptLightSwitch option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
                     // Select the option value 
                     $("#node-input-dptLightSwitch").val(optVal);
@@ -116,10 +133,13 @@
             // ########################
             $.getJSON('knxUltimateDpts', (data) => {
                 data.forEach(dpt => {
-                    $("#node-input-dptLightState").append($("<option></option>")
-                        .attr("value", dpt.value)
-                        .text(dpt.text))
+                    if (dpt.value.startsWith("1.")) {
+                        $("#node-input-dptLightState").append($("<option></option>")
+                            .attr("value", dpt.value)
+                            .text(dpt.text))
+                    }
                 });
+
                 $("#node-input-dptLightState").val(this.dptLightState)
             })
 
@@ -130,7 +150,7 @@
                     $.getJSON("knxUltimatecsv?nodeID=" + oNodeServer.id, (data) => {
                         response($.map(data, function (value, key) {
                             var sSearch = (value.ga + " (" + value.devicename + ") DPT" + value.dpt);
-                            if (fullSearch(sSearch, request.term)) {
+                            if (fullSearch(sSearch, request.term + " 1.")) {
                                 return {
                                     label: value.ga + " # " + value.devicename + " # " + value.dpt, // Label for Display
                                     value: value.ga // Value
@@ -159,11 +179,15 @@
             // ########################
             $.getJSON('knxUltimateDpts', (data) => {
                 data.forEach(dpt => {
-                    $("#node-input-dptLightDIM").append($("<option></option>")
-                        .attr("value", dpt.value)
-                        .text(dpt.text))
+                    if (dpt.value === "3.007") {
+                        $("#node-input-dptLightDIM").append($("<option></option>")
+                            .attr("value", dpt.value)
+                            .text(dpt.text))
+                    }
                 });
+
                 $("#node-input-dptLightDIM").val(this.dptLightDIM)
+
             })
 
             // Autocomplete suggestion with ETS csv File
@@ -173,7 +197,7 @@
                     $.getJSON("knxUltimatecsv?nodeID=" + oNodeServer.id, (data) => {
                         response($.map(data, function (value, key) {
                             var sSearch = (value.ga + " (" + value.devicename + ") DPT" + value.dpt);
-                            if (fullSearch(sSearch, request.term)) {
+                            if (fullSearch(sSearch, request.term + " 3.007")) {
                                 return {
                                     label: value.ga + " # " + value.devicename + " # " + value.dpt, // Label for Display
                                     value: value.ga // Value
@@ -198,6 +222,174 @@
             });
 
 
+            // DPT dptLightColor and dptLightColorStateƒ
+            // ########################
+            $.getJSON('knxUltimateDpts', (data) => {
+                data.forEach(dpt => {
+                    if (dpt.value === "232.600") {
+                        $("#node-input-dptLightColor").append($("<option></option>")
+                            .attr("value", dpt.value)
+                            .text(dpt.text))
+                        $("#node-input-dptLightColorState").append($("<option></option>")
+                            .attr("value", dpt.value)
+                            .text(dpt.text))
+                    }
+                });
+
+                $("#node-input-dptLightColor").val(this.dptLightColor)
+                $("#node-input-dptLightColorState").val(this.dptLightColorState)
+
+            })
+
+            // Autocomplete suggestion with ETS csv File
+            $("#node-input-GALightColor").autocomplete({
+                minLength: 1,
+                source: function (request, response) {
+                    $.getJSON("knxUltimatecsv?nodeID=" + oNodeServer.id, (data) => {
+                        response($.map(data, function (value, key) {
+                            var sSearch = (value.ga + " (" + value.devicename + ") DPT" + value.dpt);
+                            if (fullSearch(sSearch, request.term + " 232.600")) {
+                                return {
+                                    label: value.ga + " # " + value.devicename + " # " + value.dpt, // Label for Display
+                                    value: value.ga // Value
+                                }
+                            } else {
+                                return null;
+                            }
+                        }));
+                    });
+                }, select: function (event, ui) {
+                    // Sets Datapoint and device name automatically
+                    var sDevName = ui.item.label.split("#")[1].trim();
+                    try {
+                        sDevName = sDevName.substr(sDevName.indexOf(")") + 1).trim();
+                    } catch (error) {
+                    }
+                    $('#node-input-nameLightColor').val(sDevName);
+                    var optVal = $("#node-input-dptLightColor option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
+                    // Select the option value 
+                    $("#node-input-dptLightColor").val(optVal);
+                }
+            });
+
+            // Autocomplete suggestion with ETS csv File
+            $("#node-input-GALightColorState").autocomplete({
+                minLength: 1,
+                source: function (request, response) {
+                    $.getJSON("knxUltimatecsv?nodeID=" + oNodeServer.id, (data) => {
+                        response($.map(data, function (value, key) {
+                            var sSearch = (value.ga + " (" + value.devicename + ") DPT" + value.dpt);
+                            if (fullSearch(sSearch, request.term + " 232.600")) {
+                                return {
+                                    label: value.ga + " # " + value.devicename + " # " + value.dpt, // Label for Display
+                                    value: value.ga // Value
+                                }
+                            } else {
+                                return null;
+                            }
+                        }));
+                    });
+                }, select: function (event, ui) {
+                    // Sets Datapoint and device name automatically
+                    var sDevName = ui.item.label.split("#")[1].trim();
+                    try {
+                        sDevName = sDevName.substr(sDevName.indexOf(")") + 1).trim();
+                    } catch (error) {
+                    }
+                    $('#node-input-nameLightColorState').val(sDevName);
+                    var optVal = $("#node-input-dptLightColorState option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
+                    // Select the option value 
+                    $("#node-input-dptLightColorState").val(optVal);
+                }
+            });
+
+
+
+            // DPT dptLightBrightness and dptLightBrightnessState
+            // ########################
+            $.getJSON('knxUltimateDpts', (data) => {
+                data.forEach(dpt => {
+                    if (dpt.value === "5.001") {
+                        $("#node-input-dptLightBrightness").append($("<option></option>")
+                            .attr("value", dpt.value)
+                            .text(dpt.text))
+                        $("#node-input-dptLightBrightnessState").append($("<option></option>")
+                            .attr("value", dpt.value)
+                            .text(dpt.text))
+                    }
+                });
+
+                $("#node-input-dptLightBrightness").val(this.dptLightBrightness)
+                $("#node-input-dptLightBrightnessState").val(this.dptLightBrightnessState)
+
+            })
+
+            // Autocomplete suggestion with ETS csv File
+            $("#node-input-GALightBrightness").autocomplete({
+                minLength: 1,
+                source: function (request, response) {
+                    $.getJSON("knxUltimatecsv?nodeID=" + oNodeServer.id, (data) => {
+                        response($.map(data, function (value, key) {
+                            var sSearch = (value.ga + " (" + value.devicename + ") DPT" + value.dpt);
+                            if (fullSearch(sSearch, request.term + " 5.001")) {
+                                return {
+                                    label: value.ga + " # " + value.devicename + " # " + value.dpt, // Label for Display
+                                    value: value.ga // Value
+                                }
+                            } else {
+                                return null;
+                            }
+                        }));
+                    });
+                }, select: function (event, ui) {
+                    // Sets Datapoint and device name automatically
+                    var sDevName = ui.item.label.split("#")[1].trim();
+                    try {
+                        sDevName = sDevName.substr(sDevName.indexOf(")") + 1).trim();
+                    } catch (error) {
+                    }
+                    $('#node-input-nameLightBrightness').val(sDevName);
+                    var optVal = $("#node-input-dptLightBrightness option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
+                    // Select the option value 
+                    $("#node-input-dptLightBrightness").val(optVal);
+                }
+            });
+
+            // Autocomplete suggestion with ETS csv File
+            $("#node-input-GALightBrightnessState").autocomplete({
+                minLength: 1,
+                source: function (request, response) {
+                    $.getJSON("knxUltimatecsv?nodeID=" + oNodeServer.id, (data) => {
+                        response($.map(data, function (value, key) {
+                            var sSearch = (value.ga + " (" + value.devicename + ") DPT" + value.dpt);
+                            if (fullSearch(sSearch, request.term + " 5.001")) {
+                                return {
+                                    label: value.ga + " # " + value.devicename + " # " + value.dpt, // Label for Display
+                                    value: value.ga // Value
+                                }
+                            } else {
+                                return null;
+                            }
+                        }));
+                    });
+                }, select: function (event, ui) {
+                    // Sets Datapoint and device name automatically
+                    var sDevName = ui.item.label.split("#")[1].trim();
+                    try {
+                        sDevName = sDevName.substr(sDevName.indexOf(")") + 1).trim();
+                    } catch (error) {
+                    }
+                    $('#node-input-nameLightBrightnessState').val(sDevName);
+                    var optVal = $("#node-input-dptLightBrightnessState option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
+                    // Select the option value 
+                    $("#node-input-dptLightBrightnessState").val(optVal);
+                }
+            });
+
+
+
+
+
             // Autocomplete suggestion with HUE Lights
             $("#node-input-hueLight").autocomplete({
                 minLength: 1,
@@ -220,6 +412,7 @@
                     // Sets the field
                     var sDevName = ui.item.label;
                     $('#node-input-hueLight').val(sDevName);
+                    $('#node-input-name').val(sDevName.split("#")[0]);
                 }
             });
 
@@ -282,11 +475,12 @@
 </div>
 
 <br/>
+
+<!-- <p> <img src='https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/knx.png' width='32px'> -> <img src='https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/hue.png' width='32px'></p> -->
+
 <p>
-<b>KONNEX</b>
+<b>KNX COMMANDS -> TO PHILIPS HUE</b>
 </p>
-
-<div id="GAandDPT">
     <div class="form-row">
         <label for="node-input-nameLightSwitch" style="width:100px;"><i class="fa fa-play-circle-o"></i> <span data-i18n="knxUltimateHueLight.node-input-nameLightSwitch"></span></label>
 
@@ -300,6 +494,55 @@
         <label for="node-input-nameLightSwitch" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
         <input type="text" id="node-input-nameLightSwitch" style="width:200px;margin-left: 5px; text-align: left;">
     </div>
+    </div>
+        <div class="form-row">
+        <label for="node-input-nameLightDIM" style="width:100px;"><i class="fa fa-play-circle-o"></i>Dimming</label>
+
+        <label for="node-input-GALightDIM" style="width:20px;"><span data-i18n="knxUltimateHueLight.node-input-GALightState"></span></label>
+        <input type="text" id="node-input-GALightDIM" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
+       
+        <label for="node-input-dptLightDIM" style="width:40px; margin-left: 0px; text-align: right;">
+            <span data-i18n="knxUltimateHueLight.node-input-dptLightState"></span> </label>
+        <select id="node-input-dptLightDIM" style="width:140px;"></select>
+       
+        <label for="node-input-nameLightDIM" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
+        <input type="text" id="node-input-nameLightDIM" style="width:200px;margin-left: 5px; text-align: left;">
+    </div>
+    </div>
+        <div class="form-row">
+        <label for="node-input-nameLightColor" style="width:100px;"><i class="fa fa-play-circle-o"></i>&nbspColor</label>
+
+        <label for="node-input-GALightColor" style="width:20px;"><span data-i18n="knxUltimateHueLight.node-input-GALightState"></span></label>
+        <input type="text" id="node-input-GALightColor" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
+       
+        <label for="node-input-dptLightColor" style="width:40px; margin-left: 0px; text-align: right;">
+            <span data-i18n="knxUltimateHueLight.node-input-dptLightState"></span> </label>
+        <select id="node-input-dptLightColor" style="width:140px;"></select>
+       
+        <label for="node-input-nameLightColor" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
+        <input type="text" id="node-input-nameLightColor" style="width:200px;margin-left: 5px; text-align: left;">
+    </div>
+    </div>
+        </div>
+        <div class="form-row">
+        <label for="node-input-nameLightBrightness" style="width:100px;"><i class="fa fa-play-circle-o"></i>&nbspBrightness</label>
+
+        <label for="node-input-GALightBrightness" style="width:20px;"><span data-i18n="knxUltimateHueLight.node-input-GALightState"></span></label>
+        <input type="text" id="node-input-GALightBrightness" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
+       
+        <label for="node-input-dptLightBrightness" style="width:40px; margin-left: 0px; text-align: right;">
+            <span data-i18n="knxUltimateHueLight.node-input-dptLightState"></span> </label>
+        <select id="node-input-dptLightBrightness" style="width:140px;"></select>
+       
+        <label for="node-input-nameLightBrightness" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
+        <input type="text" id="node-input-nameLightBrightness" style="width:200px;margin-left: 5px; text-align: left;">
+    </div>
+
+<br/>
+<p>
+<b>PHILIPS HUE STATES -> TO KNX</b>
+</p>
+
     <div class="form-row">
         <label for="node-input-nameLightState" style="width:100px;"><i class="fa fa-play-circle-o"></i> <span data-i18n="knxUltimateHueLight.node-input-nameLightState"></span></label>
 
@@ -314,19 +557,41 @@
         <input type="text" id="node-input-nameLightState" style="width:200px;margin-left: 5px; text-align: left;">
     </div>
         <div class="form-row">
-        <label for="node-input-nameLightDIM" style="width:100px;"><i class="fa fa-play-circle-o"></i>&nbsp DIM (3.007)</label>
+        <label for="node-input-nameLightColorState" style="width:100px;"><i class="fa fa-play-circle-o"></i>&nbspColor State</label>
 
-        <label for="node-input-GALightDIM" style="width:20px;"><span data-i18n="knxUltimateHueLight.node-input-GALightState"></span></label>
-        <input type="text" id="node-input-GALightDIM" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
+        <label for="node-input-GALightColorState" style="width:20px;"><span data-i18n="knxUltimateHueLight.node-input-GALightState"></span></label>
+        <input type="text" id="node-input-GALightColorState" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
        
-        <label for="node-input-dptLightDIM" style="width:40px; margin-left: 0px; text-align: right;">
-            <span data-i18n="knxUltimateHueLight.node-input-dptLightDIM"></span> </label>
-        <select id="node-input-dptLightDIM" style="width:140px;"></select>
+        <label for="node-input-dptLightColorState" style="width:40px; margin-left: 0px; text-align: right;">
+            <span data-i18n="knxUltimateHueLight.node-input-dptLightState"></span> </label>
+        <select id="node-input-dptLightColorState" style="width:140px;"></select>
        
-        <label for="node-input-nameLightDIM" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
-        <input type="text" id="node-input-nameLightDIM" style="width:200px;margin-left: 5px; text-align: left;">
+        <label for="node-input-nameLightColorState" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
+        <input type="text" id="node-input-nameLightColorState" style="width:200px;margin-left: 5px; text-align: left;">
     </div>
-</div>
+        </div>
+        <div class="form-row">
+        <label for="node-input-nameLightBrightnessState" style="width:100px;"><i class="fa fa-play-circle-o"></i>&nbspBrightness State</label>
+
+        <label for="node-input-GALightBrightnessState" style="width:20px;"><span data-i18n="knxUltimateHueLight.node-input-GALightState"></span></label>
+        <input type="text" id="node-input-GALightBrightnessState" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
+       
+        <label for="node-input-dptLightBrightnessState" style="width:40px; margin-left: 0px; text-align: right;">
+            <span data-i18n="knxUltimateHueLight.node-input-dptLightState"></span> </label>
+        <select id="node-input-dptLightBrightnessState" style="width:140px;"></select>
+       
+        <label for="node-input-nameLightBrightnessState" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
+        <input type="text" id="node-input-nameLightBrightnessState" style="width:200px;margin-left: 5px; text-align: left;">
+    </div>
+
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
 
 
 </script>

package/nodes/knxUltimateHueLight.js

@@ -1,7 +1,21 @@
 module.exports = function (RED) {
   const dptlib = require('./../KNXEngine/dptlib')
+  const hueColorConverter = require('./utils/hueColorConverter')
 
 
+  async function getLightState(node, config) {
+    return new Promise((resolve, reject) => {
+      try {
+        node.serverHue.hueManager.getLight(config.hueLight.split('#')[1]).then(ret => {
+          node.currentHUELight = ret[0]
+          resolve(ret)
+        })
+      } catch (error) {
+        reject(error)
+      }
+    })
+  }
+
   function knxUltimateHueLight(config) {
     RED.nodes.createNode(this, config)
     const node = this
@@ -27,6 +41,16 @@ module.exports = function (RED) {
     node.formatnegativevalue = 'leave'
     node.formatdecimalsvalue = 2
 
+
+
+    // Read the state of the light and store it in the holding object
+    try {
+      getLightState(node, config)
+    } catch (error) {
+    }
+
+
+
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload }) => {
 
@@ -34,38 +58,69 @@ module.exports = function (RED) {
 
     // This function is called by the knx-ultimate config node, to output a msg.payload.
     node.handleSend = msg => {
-      let state
+      let state = {}
       try {
         switch (msg.knx.destination) {
           case config.GALightSwitch:
             msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightSwitch))
             state = msg.payload === true ? { on: { on: true } } : { on: { on: false } }
-            node.serverHue.setLightState(config.hueLight.split('#')[1], state)
+            node.serverHue.hueManager.setLightState(config.hueLight.split('#')[1], state)
             break
           case config.GALightDIM:
             msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightDIM))
             state = msg.payload.decr_incr === 1 ? { dimming_delta: { action: 'up', brightness_delta: 20 } } : { dimming_delta: { action: 'down', brightness_delta: 20 } }
-            node.serverHue.setLightState(config.hueLight.split('#')[1], state)
+            node.serverHue.hueManager.setLightState(config.hueLight.split('#')[1], state)
+            break
+          case config.GALightBrightness:
+            msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightBrightness))
+            state = { dimming: { brightness: msg.payload } }
+            node.serverHue.hueManager.setLightState(config.hueLight.split('#')[1], state)
+            break
+          case config.GALightColor:
+            // Behavior like ISE HUE CONNECT, by setting the brightness and on/off as well
+            msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightColor))
+            const gamut = node.currentHUELight.color.gamut_type || null
+            const retXY = hueColorConverter.ColorConverter.rgbToXy(msg.payload.red, msg.payload.green, msg.payload.blue, gamut)
+            const bright = hueColorConverter.ColorConverter.getBrightnessFromRGB(msg.payload.red, msg.payload.green, msg.payload.blue)
+            bright > 0 ? state = { on: { on: true }, dimming: { brightness: bright }, color: { xy: retXY } } : state = { on: { on: false } }
+            node.serverHue.hueManager.setLightState(config.hueLight.split('#')[1], state)
             break
           default:
             break
         }
       } catch (error) {
-
+        node.status({ fill: 'red', shape: 'dot', text: 'KNX->HUE error ' + error.message + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
       }
-      //node.exposedGAs.push({ address: msg.knx.destination, addressRAW: sAddressRAW, dpt: msg.knx.dpt, payload: msg.payload, devicename: sDeviceName, lastupdate: new Date(), rawPayload: 'HEX Raw: ' + msg.knx.rawValue.toString('hex') || '?', payloadmeasureunit: (msg.payloadmeasureunit !== 'unknown' ? ' ' + msg.payloadmeasureunit : '') })
+      // node.exposedGAs.push({ address: msg.knx.destination, addressRAW: sAddressRAW, dpt: msg.knx.dpt, payload: msg.payload, devicename: sDeviceName, lastupdate: new Date(), rawPayload: 'HEX Raw: ' + msg.knx.rawValue.toString('hex') || '?', payloadmeasureunit: (msg.payloadmeasureunit !== 'unknown' ? ' ' + msg.payloadmeasureunit : '') })
     }
 
-
     node.handleSendHUE = _event => {
-      if (_event.id === config.hueLight.split('#')[1]) {
-        let knxMsgPayload = undefined
-        if (_event.hasOwnProperty('on')) knxMsgPayload = _event.on.on
-        // Send to KNX bus
-        if (knxMsgPayload !== undefined) {
-          node.status({ fill: 'green', shape: 'dot', text: 'HUE Status ' + knxMsgPayload + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
-          if (config.GALightState !== '') node.server.writeQueueAdd({ grpaddr: config.GALightState, payload: knxMsgPayload, dpt: config.dptLightState, outputtype: 'write', nodecallerid: node.id })
+      try {
+        if (_event.id === config.hueLight.split('#')[1]) {
+          let knxMsgPayload = {}
+          if (_event.hasOwnProperty('on')) {
+            knxMsgPayload.ga = config.GALightState
+            knxMsgPayload.dpt = config.dptLightState
+            knxMsgPayload.payload = _event.on.on
+          }
+          if (_event.hasOwnProperty('color')) {
+            knxMsgPayload.ga = config.GALightColorState
+            knxMsgPayload.dpt = config.dptLightColorState
+            knxMsgPayload.payload = hueColorConverter.ColorConverter.xyBriToRgb(_event.color.xy.x, _event.color.xy.y, node.currentHUELight.dimming.brightness)
+          }
+          if (_event.hasOwnProperty('dimming')) {
+            knxMsgPayload.ga = config.GALightBrightnessState
+            knxMsgPayload.dpt = config.dptLightBrightnessState
+            knxMsgPayload.payload = _event.dimming.brightness
+          }
+          // Send to KNX bus
+          if (knxMsgPayload.ga !== undefined) {
+            node.status({ fill: 'green', shape: 'dot', text: 'HUE->KNX State ' + JSON.stringify(knxMsgPayload.payload) + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
+            if (config.GALightState !== '') node.server.writeQueueAdd({ grpaddr: knxMsgPayload.ga, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id })
+          }
         }
+      } catch (error) {
+        node.status({ fill: 'red', shape: 'dot', text: 'HUE->KNX error ' + error.message + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
       }
     }
 

package/nodes/locales/en-US/knxUltimateHueLight.json

@@ -3,12 +3,12 @@
         "helplink": "&nbsp<i class=\"fa fa-question-circle\"></i>&nbsp<a target=\"_blank\" href=\"https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/en-hue-configuration\"><u>Configuration</u></a>",
         "title": "HUE node",
         "node-input-name": "Name",
-        "node-input-nameLightSwitch": "Switch (bit)",
+        "node-input-nameLightSwitch": "Switch",
         "node-input-GALightSwitch": "GA",
         "node-input-dptLightSwitch": "dpt",
-        "node-input-nameLightState": "State (bit)",
+        "node-input-nameLightState": "Switch State",
         "node-input-GALightState": "GA",
         "node-input-dptLightState": "dpt",
-        "node-input-hueLight": "HUE light"
+        "node-input-hueLight": "HUE Light"
     }
 }

package/nodes/utils/hueColorConverter.js

@@ -0,0 +1,237 @@
+const convert = require('color-convert')
+class ColorConverter {
+  static getGamutRanges() {
+    const gamutA = {
+      red: [0.704, 0.296],
+      green: [0.2151, 0.7106],
+      blue: [0.138, 0.08]
+    }
+
+    const gamutB = {
+      red: [0.675, 0.322],
+      green: [0.409, 0.518],
+      blue: [0.167, 0.04]
+    }
+
+    const gamutC = {
+      red: [0.692, 0.308],
+      green: [0.17, 0.7],
+      blue: [0.153, 0.048]
+    }
+
+    const defaultGamut = {
+      red: [1.0, 0],
+      green: [0.0, 1.0],
+      blue: [0.0, 0.0]
+    }
+
+    return { gamutA, gamutB, gamutC, default: defaultGamut }
+  }
+
+  static getLightColorGamutRange(gamutTypeABC = null) {
+    const ranges = ColorConverter.getGamutRanges()
+    const gamutA = ranges.gamutA
+    const gamutB = ranges.gamutB
+    const gamutC = ranges.gamutC
+
+    const philipsModels = {
+      A: gamutA,
+      B: gamutB,
+      C: gamutC
+    }
+
+    if (philipsModels[gamutTypeABC]) {
+      return philipsModels[gamutTypeABC]
+    }
+
+    return ranges.default
+  }
+
+  static rgbToXy(red, green, blue, gamutTypeABC = null) {
+    function getGammaCorrectedValue(value) {
+      return (value > 0.04045) ? Math.pow((value + 0.055) / (1.0 + 0.055), 2.4) : (value / 12.92)
+    }
+
+    const colorGamut = ColorConverter.getLightColorGamutRange(gamutTypeABC)
+
+    red = parseFloat(red / 255)
+    green = parseFloat(green / 255)
+    blue = parseFloat(blue / 255)
+
+    red = getGammaCorrectedValue(red)
+    green = getGammaCorrectedValue(green)
+    blue = getGammaCorrectedValue(blue)
+
+    const x = red * 0.649926 + green * 0.103455 + blue * 0.197109
+    const y = red * 0.234327 + green * 0.743075 + blue * 0.022598
+    const z = red * 0.0000000 + green * 0.053077 + blue * 1.035763
+
+    let xy = {
+      x: x / (x + y + z),
+      y: y / (x + y + z)
+    }
+
+    if (!ColorConverter.xyIsInGamutRange(xy, colorGamut)) {
+      xy = ColorConverter.getClosestColor(xy, colorGamut)
+    }
+
+    return xy
+  }
+
+  static getBrightnessFromRGB(red, green, blue) {
+    const hsv = convert.rgb.hsv(red, green, blue)
+    const brightness = hsv[2]
+    return brightness
+  }
+
+  static convert_1_255_ToPercentage(number) {
+    const percentage = (number / 255) * 100
+    return percentage
+  }
+
+  static xyIsInGamutRange(xy, gamut) {
+    gamut = gamut || ColorConverter.getGamutRanges().gamutC
+    if (Array.isArray(xy)) {
+      xy = {
+        x: xy[0],
+        y: xy[1]
+      }
+    }
+
+    const v0 = [gamut.blue[0] - gamut.red[0], gamut.blue[1] - gamut.red[1]]
+    const v1 = [gamut.green[0] - gamut.red[0], gamut.green[1] - gamut.red[1]]
+    const v2 = [xy.x - gamut.red[0], xy.y - gamut.red[1]]
+
+    const dot00 = (v0[0] * v0[0]) + (v0[1] * v0[1])
+    const dot01 = (v0[0] * v1[0]) + (v0[1] * v1[1])
+    const dot02 = (v0[0] * v2[0]) + (v0[1] * v2[1])
+    const dot11 = (v1[0] * v1[0]) + (v1[1] * v1[1])
+    const dot12 = (v1[0] * v2[0]) + (v1[1] * v2[1])
+
+    const invDenom = 1 / (dot00 * dot11 - dot01 * dot01)
+
+    const u = (dot11 * dot02 - dot01 * dot12) * invDenom
+    const v = (dot00 * dot12 - dot01 * dot02) * invDenom
+
+    return ((u >= 0) && (v >= 0) && (u + v < 1))
+  }
+
+  static getClosestColor(xy, gamut) {
+    function getLineDistance(pointA, pointB) {
+      return Math.hypot(pointB.x - pointA.x, pointB.y - pointA.y)
+    }
+
+    function getClosestPoint(xy, pointA, pointB) {
+      const xy2a = [xy.x - pointA.x, xy.y - pointA.y]
+      const a2b = [pointB.x - pointA.x, pointB.y - pointA.y]
+      const a2bSqr = Math.pow(a2b[0], 2) + Math.pow(a2b[1], 2)
+      const xy2a_dot_a2b = xy2a[0] * a2b[0] + xy2a[1] * a2b[1]
+      const t = xy2a_dot_a2b / a2bSqr
+
+      return {
+        x: pointA.x + a2b[0] * t,
+        y: pointA.y + a2b[1] * t
+      }
+    }
+
+    const greenBlue = {
+      a: {
+        x: gamut.green[0],
+        y: gamut.green[1]
+      },
+      b: {
+        x: gamut.blue[0],
+        y: gamut.blue[1]
+      }
+    }
+
+    const greenRed = {
+      a: {
+        x: gamut.green[0],
+        y: gamut.green[1]
+      },
+      b: {
+        x: gamut.red[0],
+        y: gamut.red[1]
+      }
+    }
+
+    const blueRed = {
+      a: {
+        x: gamut.red[0],
+        y: gamut.red[1]
+      },
+      b: {
+        x: gamut.blue[0],
+        y: gamut.blue[1]
+      }
+    }
+
+    const closestColorPoints = {
+      greenBlue: getClosestPoint(xy, greenBlue.a, greenBlue.b),
+      greenRed: getClosestPoint(xy, greenRed.a, greenRed.b),
+      blueRed: getClosestPoint(xy, blueRed.a, blueRed.b)
+    }
+
+    const distance = {
+      greenBlue: getLineDistance(xy, closestColorPoints.greenBlue),
+      greenRed: getLineDistance(xy, closestColorPoints.greenRed),
+      blueRed: getLineDistance(xy, closestColorPoints.blueRed)
+    }
+
+    let closestDistance
+    let closestColor
+    for (const i in distance) {
+      if (distance.hasOwnProperty(i)) {
+        if (!closestDistance) {
+          closestDistance = distance[i]
+          closestColor = i
+        }
+
+        if (closestDistance > distance[i]) {
+          closestDistance = distance[i]
+          closestColor = i
+        }
+      }
+    }
+    return closestColorPoints[closestColor]
+  }
+
+  static xyBriToRgb(x, y, bri) {
+    function getReversedGammaCorrectedValue(value) {
+      return value <= 0.0031308 ? 12.92 * value : (1.0 + 0.055) * Math.pow(value, (1.0 / 2.4)) - 0.055
+    }
+
+    const z = 1.0 - x - y
+    const Y = bri / 255
+    const X = (Y / y) * x
+    const Z = (Y / y) * z
+    let r = X * 1.612 - Y * 0.203 - Z * 0.302
+    let g = -X * 0.509 + Y * 1.412 + Z * 0.066
+    let b = X * 0.026 - Y * 0.072 + Z * 0.962
+
+    r = getReversedGammaCorrectedValue(r)
+    g = getReversedGammaCorrectedValue(g)
+    b = getReversedGammaCorrectedValue(b)
+
+    // Bring all negative components to zero
+    r = Math.max(r, 0)
+    g = Math.max(g, 0)
+    b = Math.max(b, 0)
+
+    // If one component is greater than 1, weight components by that value
+    const max = Math.max(r, g, b)
+    if (max > 1) {
+      r = r / max
+      g = g / max
+      b = b / max
+    }
+
+    return {
+      red: Math.floor(r * 255),
+      geen: Math.floor(g * 255),
+      blue: Math.floor(b * 255)
+    }
+  }
+}
+exports.ColorConverter = ColorConverter

package/nodes/utils/hueUtils.js

@@ -13,6 +13,7 @@ class classHUE extends EventEmitter {
     this.bridgeid = _bridgeid
     this.startPushEvents()
     this.timerWatchDog = undefined
+    this.hue = undefined
   }
 
   getAllLights = async () => {
@@ -54,6 +55,16 @@ class classHUE extends EventEmitter {
     }
   }
 
+  // Get light state
+  getLight = async (_LightID) => {
+    try {
+      const hue = hueApiV2.connect({ host: this.HUEBridgeIP, key: this.username })
+      return await hue.getLight(_LightID)
+    } catch (error) {
+      return ({ error: error.message })
+    }
+  }
+
   // Check the bridge for disconnections
   handleTheDog = async () => {
     this.timerWatchDog = setInterval(async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-knx-ultimate",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Control your KNX intallation via Node-Red! Single Node KNX IN/OUT with optional ETS group address importer. Easy to use and highly configurable.",
   "dependencies": {
     "mkdirp": "1.0.4",
@@ -14,7 +14,8 @@
     "xml2js": "0.5.0",
     "dns-sync": "0.2.1",
     "node-hue-api": "5.0.0-beta.16",
-    "node-hue": "1.0.3"
+    "node-hue": "1.0.3",
+    "color-convert": "2.0.1"
   },
   "node-red": {
     "nodes": {