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

package/CHANGELOG.md

@@ -6,6 +6,11 @@
 
 # CHANGELOG
 
+<p>
+<b>Version 2.0.2</b> - June 2023<br/>
+- NEW: HUE Button node. All HUE integrations are in BETA.<br/>
+- Slowly integrating the help in the node-red help section.<br/>
+</p>
 <p>
 <b>Version 2.0.1</b> - June 2023<br/>
 - NEW: more KNX group addresses in the HUE Light node<br/>

package/README.md

@@ -35,7 +35,7 @@ msg.payload = {red:255, green:200, blue:30} // Put some colors in our life
 * **ALERTER node** [here](https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/Alerter-Configuration). With the Alerter node you can signal to a display or to the node-red-contrib-tts-ultimate node (audio feedback), whenever the selected devices are alerted, i.e. they have payload **true**.
 * **LOAD CONTROL node** [here](https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/LoadControl-Configuration). Control your loads (Oven, Washing machine, etc..) and avoit shutting down the main voltage due to too high power consumption.
 * **VIEWER node** [here](https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/knxUltimateViewer). View all Group Addresses and values of your KNX BUS, in the Node-Red Dashboard.
-* **PHILIPS HUE nodeset** [here](https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/en-hue-configuration). Link HUE lights and sensors to KNX in a simple way.
+* **PHILIPS HUE nodeset** [here](https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/en-hue-configuration). Link HUE devices to KNX in a simple way.
 
 <br>
 <br>

package/nodes/hue-config.js

@@ -90,7 +90,7 @@ module.exports = (RED) => {
       })
     })
 
-    // Endpoint for connecting to HUE Bridge
+    // Endpoint frontend
     RED.httpAdmin.get('/KNXUltimateGetAllLightsHUE', RED.auth.needsPermission('hue-config.read'), function (req, res) {
       try {
         (async () => {
@@ -110,7 +110,25 @@ module.exports = (RED) => {
       }
     })
 
-  
+    RED.httpAdmin.get('/KNXUltimateGetDevicesHUE', RED.auth.needsPermission('hue-config.read'), function (req, res) {
+      try {
+        (async () => {
+          try {
+            // °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°
+            const jRet = await node.hueManager.getDevices(req.query.rtype)
+            res.json(jRet)
+            // °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°
+          } catch (err) {
+            RED.log.error('Errore KNXUltimategetButtonsHUE non gestito ' + err.message)
+            res.json({ error: err.message })
+          }
+        })()
+      } catch (err) {
+        RED.log.error('Errore KNXUltimategetButtons bsonto ' + err.message)
+        res.json({ error: err.message })
+      }
+    })
+
     node.addClient = (_Node) => {
       // Check if node already exists
       if (node.nodeClients.filter(x => x.id === _Node.id).length === 0) {

package/nodes/knxUltimateHueButton.html

@@ -0,0 +1,586 @@
+<script type="text/javascript">
+    RED.nodes.registerType('knxUltimateHueButton', {
+        category: "KNX Ultimate",
+        color: '#C7E9C0',
+        defaults: {
+            //buttonState: {value: true},
+            server: { type: "knxUltimate-config", required: true },
+            serverHue: { type: "hue-config", required: true },
+            name: { value: "Hue Button (beta)" },
+
+            nameinitial_press: { value: "" },
+            GAinitial_press: { value: "" },
+            dptinitial_press: { value: "" },
+
+            namerepeat: { value: "" },
+            GArepeat: { value: "" },
+            dptrepeat: { value: "" },
+
+            nameshort_release: { value: "" },
+            GAshort_release: { value: "" },
+            dptshort_release: { value: "" },
+
+            namelong_release: { value: "" },
+            GAlong_release: { value: "" },
+            dptlong_release: { value: "" },
+
+            namedouble_short_release: { value: "" },
+            GAdouble_short_release: { value: "" },
+            dptdouble_short_release: { value: "" },
+
+            namelong_press: { value: "" },
+            GAlong_press: { value: "" },
+            dptlong_press: { value: "" },
+
+            toggleValues: { value: true },
+            hueDevice: { value: "" }
+        },
+        inputs: 0,
+        outputs: 0,
+        icon: "node-hue-icon.svg",
+        label: function () {
+            return (this.name);
+        },
+        paletteLabel: "Hue Button",
+        // button: {
+        //     enabled: function() {
+        //         // return whether or not the button is enabled, based on the current
+        //         // configuration of the node
+        //         return !this.changed
+        //     },
+        //     visible: function() {
+        //         // return whether or not the button is visible, based on the current
+        //         // configuration of the node
+        //         return this.hasButton
+        //     },
+        //     //toggle: "buttonState",
+        //     onclick: function() {}
+        // },
+        oneditprepare: function () {
+            var node = this;
+            var oNodeServer = RED.nodes.node($("#node-input-server").val()); // Store the config-node
+            var oNodeServerHue = RED.nodes.node($("#node-input-serverHue").val()); // Store the config-node
+
+            // 19/02/2020 Used to get the server sooner als deploy.
+            $("#node-input-server").change(function () {
+                try {
+                    oNodeServer = RED.nodes.node($(this).val());
+                } catch (error) { }
+            });
+            // 19/02/2020 Used to get the server sooner als deploy.
+            $("#node-input-serverHue").change(function () {
+                try {
+                    oNodeServerHue = RED.nodes.node($(this).val());
+                } catch (error) { }
+            });
+
+            // 31/03/2020 Search Helper
+            function fullSearch(sourceText, searchString) {
+                // This searches for all words in a string
+                var aSearchWords = searchString.toLowerCase().split(" ");
+                var i = 0;
+                for (let index = 0; index < aSearchWords.length; index++) {
+                    if (sourceText.toLowerCase().indexOf(aSearchWords[index]) > -1) i += 1;
+                }
+                return i == aSearchWords.length;
+            }
+
+            // DPT Switch command
+            // ########################
+            $.getJSON('knxUltimateDpts', (data) => {
+                data.forEach(dpt => {
+                    if (dpt.value.startsWith("1.")) {
+                        $("#node-input-dptinitial_press").append($("<option></option>")
+                            .attr("value", dpt.value)
+                            .text(dpt.text))
+                    }
+                });
+                $("#node-input-dptinitial_press").val(this.dptinitial_press)
+            })
+
+            // Autocomplete suggestion with ETS csv File
+            $("#node-input-GAinitial_press").autocomplete({
+                minLength: 1,
+                source: function (request, response) {
+                    //$.getJSON("csv", request, function( data, status, xhr ) {
+                    $.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 + " 1.")) {
+                                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-nameinitial_press').val(sDevName);
+                    var optVal = $("#node-input-dptinitial_press option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
+                    // Select the option value 
+                    $("#node-input-dptinitial_press").val(optVal);
+                }
+            });
+            // ######################## 
+
+
+
+            // DPT repeat
+            // ########################
+            $.getJSON('knxUltimateDpts', (data) => {
+                data.forEach(dpt => {
+                    if (dpt.value.startsWith("1.") || dpt.value.startsWith("3.007")) {
+                        $("#node-input-dptrepeat").append($("<option></option>")
+                            .attr("value", dpt.value)
+                            .text(dpt.text))
+                    }
+                });
+
+                $("#node-input-dptrepeat").val(this.dptrepeat)
+            })
+
+            // Autocomplete suggestion with ETS csv File
+            $("#node-input-GArepeat").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)) {
+                                if (value.dpt.startsWith('1.') || value.dpt.startsWith('3.007')) {
+                                    return {
+                                        label: value.ga + " # " + value.devicename + " # " + value.dpt, // Label for Display
+                                        value: value.ga // Value
+                                    }
+                                } else { return null; }
+                            } 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-namerepeat').val(sDevName);
+                    var optVal = $("#node-input-dptrepeat option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
+                    // Select the option value 
+                    $("#node-input-dptrepeat").val(optVal);
+                }
+            });
+
+
+            // DPT dptshort_release
+            // ########################
+            $.getJSON('knxUltimateDpts', (data) => {
+                data.forEach(dpt => {
+                    if (dpt.value.startsWith('1.')) {
+                        $("#node-input-dptshort_release").append($("<option></option>")
+                            .attr("value", dpt.value)
+                            .text(dpt.text))
+                    }
+                });
+
+                $("#node-input-dptshort_release").val(this.dptshort_release)
+
+            })
+
+            // Autocomplete suggestion with ETS csv File
+            $("#node-input-GAshort_release").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 + " 1.")) {
+                                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-nameshort_release').val(sDevName);
+                    var optVal = $("#node-input-dptshort_release option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
+                    // Select the option value 
+                    $("#node-input-dptshort_release").val(optVal);
+                }
+            });
+
+
+            // DPT dptlong_release and dptLightColorStateƒ
+            // ########################
+            $.getJSON('knxUltimateDpts', (data) => {
+                data.forEach(dpt => {
+                    if (dpt.value.startsWith('1.')) {
+                        $("#node-input-dptlong_release").append($("<option></option>")
+                            .attr("value", dpt.value)
+                            .text(dpt.text))
+                        $("#node-input-dptdouble_short_release").append($("<option></option>")
+                            .attr("value", dpt.value)
+                            .text(dpt.text))
+                    }
+                });
+
+                $("#node-input-dptlong_release").val(this.dptlong_release)
+                $("#node-input-dptdouble_short_release").val(this.dptdouble_short_release)
+
+            })
+
+            // Autocomplete suggestion with ETS csv File
+            $("#node-input-GAlong_release").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 + " 1.")) {
+                                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-namelong_release').val(sDevName);
+                    var optVal = $("#node-input-dptlong_release option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
+                    // Select the option value 
+                    $("#node-input-dptlong_release").val(optVal);
+                }
+            });
+
+            // Autocomplete suggestion with ETS csv File
+            $("#node-input-GAdouble_short_release").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 + " 1.")) {
+                                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-namedouble_short_release').val(sDevName);
+                    var optVal = $("#node-input-dptdouble_short_release option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
+                    // Select the option value 
+                    $("#node-input-dptdouble_short_release").val(optVal);
+                }
+            });
+
+
+
+            // DPT dptlong_press 
+            // ########################
+            $.getJSON('knxUltimateDpts', (data) => {
+                data.forEach(dpt => {
+                    if (dpt.value.startsWith('1.')) {
+                        $("#node-input-dptlong_press").append($("<option></option>")
+                            .attr("value", dpt.value)
+                            .text(dpt.text))
+                    }
+                });
+
+                $("#node-input-dptlong_press").val(this.dptlong_press)
+
+            })
+
+            // Autocomplete suggestion with ETS csv File
+            $("#node-input-GAlong_press").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 + " 1.")) {
+                                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-namelong_press').val(sDevName);
+                    var optVal = $("#node-input-dptlong_press option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
+                    // Select the option value 
+                    $("#node-input-dptlong_press").val(optVal);
+                }
+            });
+
+
+
+
+
+
+            // Autocomplete suggestion with HUE Lights
+            $("#node-input-name").autocomplete({
+                minLength: 1,
+                source: function (request, response) {
+                    $.getJSON("KNXUltimateGetDevicesHUE?rtype=button&nodeID=" + oNodeServerHue.id, (data) => {
+                        response($.map(data.devices, function (value, key) {
+                            //alert(JSON.stringify(value) + " "+ key)
+                            var sSearch = (value.name);
+                            if (fullSearch(sSearch, request.term)) {
+                                return {
+                                    hueDevice: value.id, // Label for Display
+                                    value: value.name // Value
+                                }
+                            } else {
+                                return null;
+                            }
+                        }));
+                    });
+                }, select: function (event, ui) {
+                    // Sets the fields
+                    $('#node-input-hueDevice').val(ui.item.hueDevice);
+                }
+            });
+
+
+            // ########################
+
+
+        },
+        oneditsave: function () {
+
+
+        },
+        oneditcancel: function () {
+
+        }
+    })
+
+</script>
+
+<script type="text/x-red" data-template-name="knxUltimateHueButton">
+
+
+<div class="form-row">
+    <b>HUE Light</b>&nbsp&nbsp<span style="color:red"
+    &nbsp<i class="fa fa-question-circle"></i></span>
+    &nbsp<a target="_blank" href="https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/en-hue-configuration"><u>Configuration</u></a> 
+    <br />
+    <p align="center"><img src='https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/hueButton.png'></p>
+    <br />
+    <label for="node-input-server" >
+        <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAKnRFWHRDcmVhdGlvbiBUaW1lAEZyIDYgQXVnIDIwMTAgMjE6NTI6MTkgKzAxMDD84aS8AAAAB3RJTUUH3gYYCicNV+4WIQAAAAlwSFlzAAALEgAACxIB0t1+/AAAAARnQU1BAACxjwv8YQUAAACUSURBVHjaY2CgFZg5c+Z/ZEyWAZ8+f/6/ZsWs/xoamqMGkGrA6Wla/1+fVARjEBuGsSoGmY4eZSCNL59d/g8DIDbIAHR14OgFGQByKjIGKX5+6/T///8gGMQGiV1+/B0Fg70GIkD+RMYgxf/O5/7//2MSmAZhkBi6OrgB6Bg5DGB4ajr3f2xqsYYLSDE2THJUDg0AAAqyDVd4tp4YAAAAAElFTkSuQmCC"></img>
+        KNX GW
+    </label>
+    <input type="text" id="node-input-server" />
+</div>
+
+<div class="form-row">
+    <label for="node-input-serverHue">
+        <img src="data:image/png;base64, iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAEKADAAQAAAABAAAAEAAAAAA0VXHyAAABFUlEQVQ4EZWSsWoCQRCG1yiENEFEi6QSkjqWWoqFoBYJ+Br6JHkMn8Iibd4ihQpaJIhWNkry/ZtdGZY78Qa+m39nZ+dm9s4550awglNBluS/gVtAX6KgDclf68w2OThgfR9iT/jnoEv4TtByDThWTCDKW4SSZTf/zj9/eZbN+izTDuKGimu0vPF8B/YN8aC8LmcOj/AAn9CFTEs70Js/oGqy79C69bqJ5XbQI2kGO5N8QL9D08S8zBtBF5ZaVsznpCMoqJnVdjTpb1Db0fwIWmQV6BLXzFOYgA6/gDVfQN9bBWp2J2hdWDPoBV5FrKnAJutHikk/CHHR8i7x4iG7qQ720IYvu3GFbpHjx3pFrOFYkA354z/5bkK826phyAAAAABJRU5ErkJggg=="/>
+        HUE Bridge
+    </label>
+    <input type="text" id="node-input-serverHue" />
+</div>
+
+<br/>
+<p>
+<b>Philips HUE</b>
+</p>
+    
+<div class="form-row">
+    <label for="node-input-hueDevice" >
+        <i class="fa fa-play-circle"></i>&nbspHue Button</label>
+        <input type="text" id="node-input-name" placeholder="Enter your hue device name" />
+    <input type="hidden" id="node-input-hueDevice" />
+</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>PHILIPS HUE BUTTON EVENTS -> TO KNX</b>
+</p>
+
+    <div class="form-row">
+        <label for="node-input-nameinitial_press" style="width:100px;"><i class="fa fa-play-circle-o"></i> Initial press</span></label>
+
+        <label for="node-input-GAinitial_press" style="width:20px;">GA</label>
+        <input type="text" id="node-input-GAinitial_press" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
+    
+        <label for="node-input-dptinitial_press" style="width:40px; margin-left: 0px; text-align: right;">dpt</label>
+        <select id="node-input-dptinitial_press" style="width:140px;"></select>
+    
+        <label for="node-input-nameinitial_press" style="width:50px; margin-left: 0px; text-align: right;">Name</label>
+        <input type="text" id="node-input-nameinitial_press" style="width:200px;margin-left: 5px; text-align: left;">
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-namerepeat" style="width:100px;"><i class="fa fa-play-circle-o"></i> Repeat</span></label>
+
+        <label for="node-input-GArepeat" style="width:20px;">GA</label>
+        <input type="text" id="node-input-GArepeat" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
+       
+        <label for="node-input-dptrepeat" style="width:40px; margin-left: 0px; text-align: right;">dpt</label>
+        <select id="node-input-dptrepeat" style="width:140px;"></select>
+       
+        <label for="node-input-namerepeat" style="width:50px; margin-left: 0px; text-align: right;">Name</label>
+        <input type="text" id="node-input-namerepeat" style="width:200px;margin-left: 5px; text-align: left;">
+    </div>
+    
+    <div class="form-row">
+        <label for="node-input-nameshort_release" style="width:100px;"><i class="fa fa-play-circle-o"></i>&nbspShort release</label>
+
+        <label for="node-input-GAhort_release" style="width:20px;">GA</label>
+        <input type="text" id="node-input-GAshort_release" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
+       
+        <label for="node-input-dptshort_release" style="width:40px; margin-left: 0px; text-align: right;">dpt</label>
+        <select id="node-input-dptshort_release" style="width:140px;"></select>
+       
+        <label for="node-input-nameshort_release" style="width:50px; margin-left: 0px; text-align: right;">Name</label>
+        <input type="text" id="node-input-nameshort_release" style="width:200px;margin-left: 5px; text-align: left;">
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-namelong_release" style="width:100px;"><i class="fa fa-play-circle-o"></i>&nbspLong release</label>
+
+        <label for="node-input-GAhort_release" style="width:20px;">GA</label>
+        <input type="text" id="node-input-GAlong_release" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
+       
+        <label for="node-input-dptlong_release" style="width:40px; margin-left: 0px; text-align: right;">dpt</label>
+        <select id="node-input-dptlong_release" style="width:140px;"></select>
+       
+        <label for="node-input-namelong_release" style="width:50px; margin-left: 0px; text-align: right;">Name</label>
+        <input type="text" id="node-input-namelong_release" style="width:200px;margin-left: 5px; text-align: left;">
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-namedouble_short_release" style="width:100px;"><i class="fa fa-play-circle-o"></i>&nbspDouble short release</label>
+
+        <label for="node-input-GAdouble_short_release" style="width:20px;">GA</label>
+        <input type="text" id="node-input-GAdouble_short_release" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
+       
+        <label for="node-input-dptdouble_short_release" style="width:40px; margin-left: 0px; text-align: right;">dpt</label>
+        <select id="node-input-dptdouble_short_release" style="width:140px;"></select>
+       
+        <label for="node-input-namedouble_short_release" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueButton.node-input-name"></span></label>
+        <input type="text" id="node-input-namedouble_short_release" style="width:200px;margin-left: 5px; text-align: left;">
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-namelong_press" style="width:100px;"><i class="fa fa-play-circle-o"></i>&nbspLong press</label>
+
+        <label for="node-input-GAhort_release" style="width:20px;">GA</label>
+        <input type="text" id="node-input-GAlong_press" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
+       
+        <label for="node-input-dptlong_press" style="width:40px; margin-left: 0px; text-align: right;">dpt</label>
+        <select id="node-input-dptlong_press" style="width:140px;"></select>
+       
+        <label for="node-input-namelong_press" style="width:50px; margin-left: 0px; text-align: right;">Name</label>
+        <input type="text" id="node-input-namelong_press" style="width:200px;margin-left: 5px; text-align: left;">
+    </div>
+    
+    <div class="form-row">
+        <input type="checkbox" id="node-input-toggleValues" style="display:inline-block; width:auto; vertical-align:top;" />
+        <label style="width:auto" for="node-input-toggleValues">
+            <img
+                src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAACXBIWXMAAB7CAAAewgFu0HU+AAAFGmlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDggNzkuMTY0MDM2LCAyMDE5LzA4LzEzLTAxOjA2OjU3ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgMjEuMSAoTWFjaW50b3NoKSIgeG1wOkNyZWF0ZURhdGU9IjIwMjAtMDMtMjNUMTY6MjM6MjMrMDE6MDAiIHhtcDpNb2RpZnlEYXRlPSIyMDIwLTAzLTIzVDE2OjI1OjM0KzAxOjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDIwLTAzLTIzVDE2OjI1OjM0KzAxOjAwIiBkYzpmb3JtYXQ9ImltYWdlL3BuZyIgcGhvdG9zaG9wOkNvbG9yTW9kZT0iMyIgcGhvdG9zaG9wOklDQ1Byb2ZpbGU9InNSR0IgSUVDNjE5NjYtMi4xIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOmJmNGM3NWVjLTIwNGYtNGY1YS05YTMxLTQ5NTU5YWJmZDE4NSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpiZjRjNzVlYy0yMDRmLTRmNWEtOWEzMS00OTU1OWFiZmQxODUiIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpiZjRjNzVlYy0yMDRmLTRmNWEtOWEzMS00OTU1OWFiZmQxODUiPiA8eG1wTU06SGlzdG9yeT4gPHJkZjpTZXE+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJjcmVhdGVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOmJmNGM3NWVjLTIwNGYtNGY1YS05YTMxLTQ5NTU5YWJmZDE4NSIgc3RFdnQ6d2hlbj0iMjAyMC0wMy0yM1QxNjoyMzoyMyswMTowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDIxLjEgKE1hY2ludG9zaCkiLz4gPC9yZGY6U2VxPiA8L3htcE1NOkhpc3Rvcnk+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+nhtLUgAAAE9JREFUKJG1UMsOACAIgub//7IdqvVQtjrExU1EEQLuiGCvgTNgl5D74MmVZPu4wIxQAgm+/sDec2VhgQPgf0sq1unjMlYJE/3MZrvy+kMFZQkZEWfC7ikAAAAASUVORK5CYII="></img>
+            Toggle values
+        </label>
+    </div>
+
+</div>
+        
+
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+
+
+</script>
+
+<script type="text/markdown" data-help-name="knxUltimateHueButton">
+
+[Find it useful?](https://www.paypal.me/techtoday)
+
+This node lets you get the events of your HUE button.<br/>
+There are many event you can choose from. The relevants one are *short release* and *repeat*.<br/>
+In *short release* you can send true/false to your KNX group address to, for example, toggle a light.<br/>
+In *repeat* event, you can DIM a KNX light.<br/>
+The **toggle values** option is enabled by default. This option toggles the value of each KNX group address (*true/false, increase/decrease dim*))
+
+**General**
+|Property|Description|
+|--|--|
+| KNX GW | Select the KNX gateway to be used |
+| HUE Bridge | Select the HUE Bridge to be used |
+| Hue Button | HUE button to be used. The avaiable buttons start showing up while you're typing.|
+
+<br/>
+
+**PHILIPS HUE BUTTON EVENTS -> TO KNX**
+Here you can get the HUE button events.<br/>
+Start typing in the GA field, the name or group address of your KNX device, the avaiable devices start showing up while you're typing.
+
+|Property|Description|
+|--|--|
+| Initial press | As soon as you press your HUE button, this event fires|
+| Repeat | This command is used either to send DIM (increase/decrease) or true/false commands to the KNX group address |
+| Short release | Rapid push of the button, fired as soon as you release your finger from the button. Usually used to toggle a KNX light true/false |
+| Long release | Long press of the button, fired as soon as you release your finger from the button |
+| Long press | Long press of the button, fired as soon as you long press the button |
+| Toggle values | Enable or disable toggling values. If enabled, all values toggles, otherwise, all values are sent as *true* or *increase dim*, to the selected KNX group address. |
+
+
+<br/>
+    </script>

package/nodes/knxUltimateHueButton.js

@@ -0,0 +1,159 @@
+module.exports = function (RED) {
+  const dptlib = require('./../KNXEngine/dptlib')
+  const hueColorConverter = require('./utils/hueColorConverter')
+
+
+  async function getLightState(node, _lightID) {
+    return new Promise((resolve, reject) => {
+      try {
+        if (node !== null && node.serverHue !== null && node.serverHue.hueManager !== null) {
+          node.serverHue.hueManager.getLight(_lightID).then(ret => {
+            node.currentHUEDevice = ret[0]
+            resolve(ret)
+          })
+        }
+      } catch (error) {
+        reject(error)
+      }
+    })
+  }
+
+  function knxUltimateHueButton(config) {
+    RED.nodes.createNode(this, config)
+    const node = this
+    node.server = RED.nodes.getNode(config.server)
+    node.serverHue = RED.nodes.getNode(config.serverHue)
+    node.topic = node.name
+    node.name = config.name === undefined ? 'Hue' : config.name
+    node.outputtopic = node.name
+    node.dpt = ''
+    node.notifyreadrequest = false
+    node.notifyreadrequestalsorespondtobus = 'false'
+    node.notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized = ''
+    node.notifyresponse = false
+    node.notifywrite = true
+    node.initialread = true
+    node.listenallga = true // Don't remove
+    node.outputtype = 'write'
+    node.outputRBE = false // Apply or not RBE to the output (Messages coming from flow)
+    node.inputRBE = false // Apply or not RBE to the input (Messages coming from BUS)
+    node.currentPayload = '' // Current value for the RBE input and for the .previouspayload msg
+    node.passthrough = 'no'
+    node.formatmultiplyvalue = 1
+    node.formatnegativevalue = 'leave'
+    node.formatdecimalsvalue = 2
+    node.toggle1 = false
+    node.toggle2 = false // up or down if repeat field is set to DIM
+    node.toggle3 = false
+    node.toggle4 = false
+    node.toggle4 = false
+    node.toggle5 = false
+    node.toggle5 = false
+
+
+    // Read the state of the light and store it in the holding object
+    try {
+      if (config.hueLight !== undefined && config.hueLight !== '') getLightState(node, config.hueLight)
+    } catch (error) {
+    }
+
+
+
+    // Used to call the status update from the config node.
+    node.setNodeStatus = ({ fill, shape, text, payload }) => {
+
+    }
+
+    // This function is called by the knx-ultimate config node, to output a msg.payload.
+    node.handleSend = msg => {
+    }
+
+    node.handleSendHUE = _event => {
+      try {
+        if (_event.id === config.hueDevice) {
+          const knxMsgPayload = {}
+          if (_event.button.last_event === 'initial_press') {
+            knxMsgPayload.ga = config.GAinitial_press
+            knxMsgPayload.dpt = config.dptinitial_press
+            config.toggleValues ? node.toggle1 = !node.toggle1 : node.toggle1 = true
+            knxMsgPayload.payload = node.toggle1
+            // Toggle the DIM direction
+            config.toggleValues ? node.toggle2 = !node.toggle2 : node.toggle2 = true
+          }
+          if (_event.button.last_event === 'repeat') {
+            knxMsgPayload.ga = config.GArepeat
+            knxMsgPayload.dpt = config.dptrepeat
+            // True/False or DIM
+            if (knxMsgPayload.dpt.startsWith('1.')) {
+              config.toggleValues ? node.toggle2 = !node.toggle2 : node.toggle2 = true
+              knxMsgPayload.payload = node.toggle2
+            }
+            if (knxMsgPayload.dpt.startsWith('3.007')) {
+              if (!config.toggleValues) node.toggle2 = true
+              knxMsgPayload.payload = node.toggle2 ? { decr_incr: 1, data: 5 } : { decr_incr: 0, data: 5 }
+            }
+          }
+          if (_event.button.last_event === 'short_release') {
+            knxMsgPayload.ga = config.GAshort_release
+            knxMsgPayload.dpt = config.dptshort_release
+            config.toggleValues ? node.toggle3 = !node.toggle3 : node.toggle3 = true
+            knxMsgPayload.payload = node.toggle3
+          }
+          if (_event.button.last_event === 'long_release') {
+            knxMsgPayload.ga = config.GAlong_release
+            knxMsgPayload.dpt = config.dptlong_release
+            config.toggleValues ? node.toggle4 = !node.toggle4 : node.toggle4 = true
+            knxMsgPayload.payload = node.toggle4
+          }
+          if (_event.button.last_event === 'double_short_release') {
+            knxMsgPayload.ga = config.GAdouble_short_release
+            knxMsgPayload.dpt = config.dptdouble_short_release
+            config.toggleValues ? node.toggle5 = !node.toggle5 : node.toggle5 = true
+            knxMsgPayload.payload = node.toggle5
+          }
+          if (_event.button.last_event === 'long_press') {
+            knxMsgPayload.ga = config.GAlong_press
+            knxMsgPayload.dpt = config.dptlong_press
+            config.toggleValues ? node.toggle6 = !node.toggle6 : node.toggle6 = true
+            knxMsgPayload.payload = node.toggle6
+          }
+          // Send to KNX bus
+          if (knxMsgPayload.ga !== undefined) {
+            node.status({ fill: 'green', shape: 'dot', text: 'HUE->KNX ' + _event.button.last_event + ' ' + JSON.stringify(knxMsgPayload.payload) + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
+            if (knxMsgPayload.ga !== '' && knxMsgPayload.ga !== undefined) 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() + ')' })
+      }
+    }
+
+    // On each deploy, unsubscribe+resubscribe
+    if (node.server) {
+      node.server.removeClient(node)
+      node.server.addClient(node)
+    }
+    if (node.serverHue) {
+      node.serverHue.removeClient(node)
+      node.serverHue.addClient(node)
+    }
+
+    node.on('input', function (msg) {
+
+    })
+
+    node.on('close', function (done) {
+      if (node.server) {
+        node.server.removeClient(node)
+      }
+      done()
+    })
+
+    // On each deploy, unsubscribe+resubscribe
+    if (node.server) {
+      node.server.removeClient(node)
+      node.server.addClient(node)
+    }
+  }
+  RED.nodes.registerType('knxUltimateHueButton', knxUltimateHueButton)
+}

package/nodes/knxUltimateHueLight.html

@@ -6,7 +6,7 @@
             //buttonState: {value: true},
             server: { type: "knxUltimate-config", required: true },
             serverHue: { type: "hue-config", required: true },
-            name: { value: "Hue Light" },
+            name: { value: "Hue Light (beta)" },
 
             nameLightSwitch: { value: "" },
             GALightSwitch: { value: "" },
@@ -36,7 +36,7 @@
             GALightBrightnessState: { value: "" },
             dptLightBrightnessState: { value: "" },
 
-            hueLight: { value: "" }
+            hueDevice: { value: "" }
         },
         inputs: 0,
         outputs: 0,
@@ -44,7 +44,7 @@
         label: function () {
             return (this.name);
         },
-        paletteLabel: "Hue Light (beta)",
+        paletteLabel: "Hue Light",
         // button: {
         //     enabled: function() {
         //         // return whether or not the button is enabled, based on the current
@@ -62,6 +62,7 @@
         oneditprepare: function () {
             var node = this;
             var oNodeServer = RED.nodes.node($("#node-input-server").val()); // Store the config-node
+            var oNodeServerHue = RED.nodes.node($("#node-input-serverHue").val()); // Store the config-node
 
             // 19/02/2020 Used to get the server sooner als deploy.
             $("#node-input-server").change(function () {
@@ -69,6 +70,12 @@
                     oNodeServer = RED.nodes.node($(this).val());
                 } catch (error) { }
             });
+            // 19/02/2020 Used to get the server sooner als deploy.
+            $("#node-input-serverHue").change(function () {
+                try {
+                    oNodeServerHue = RED.nodes.node($(this).val());
+                } catch (error) { }
+            });
 
             // 31/03/2020 Search Helper
             function fullSearch(sourceText, searchString) {
@@ -391,17 +398,17 @@
 
 
             // Autocomplete suggestion with HUE Lights
-            $("#node-input-hueLight").autocomplete({
+            $("#node-input-name").autocomplete({
                 minLength: 1,
                 source: function (request, response) {
-                    $.getJSON("KNXUltimateGetAllLightsHUE", (data) => {
-                        response($.map(data.lights, function (value, key) {
+                    $.getJSON("KNXUltimateGetDevicesHUE?rtype=light&nodeID=" + oNodeServerHue.id, (data) => {
+                        response($.map(data.devices, function (value, key) {
                             //alert(JSON.stringify(value) + " "+ key)
-                            var sSearch = (value.metadata.name + " (" + value.metadata.archetype + " " + value.type + ") #" + value.id);
+                            var sSearch = (value.name);
                             if (fullSearch(sSearch, request.term)) {
                                 return {
-                                    label: value.metadata.name + " (" + value.metadata.archetype + " " + value.type + ") #" + value.id, // Label for Display
-                                    value: value.metadata.name + " (" + value.metadata.archetype + " " + value.type + ") #" + value.id // Value
+                                    hueDevice: value.id, // Label for Display
+                                    value: value.name // Value
                                 }
                             } else {
                                 return null;
@@ -409,10 +416,8 @@
                         }));
                     });
                 }, select: function (event, ui) {
-                    // Sets the field
-                    var sDevName = ui.item.label;
-                    $('#node-input-hueLight').val(sDevName);
-                    $('#node-input-name').val(sDevName.split("#")[0]);
+                    // Sets the fields
+                    $('#node-input-hueDevice').val(ui.item.hueDevice);
                 }
             });
 
@@ -436,32 +441,27 @@
 
 
 <div class="form-row">
-    <b><span data-i18n="knxUltimateHueLight.title"></span></b>&nbsp&nbsp<span style="color:red"
-        data-i18n="[html]knxUltimateHueLight.helplink"></span>
+    <b>HUE Light</b>&nbsp&nbsp<span style="color:red"
+    &nbsp<i class="fa fa-question-circle"></i></span>
+    &nbsp<a target="_blank" href="https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/en-hue-configuration"><u>Configuration</u></a> 
     <br />
+    <p align="center"><img src='https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/hueLight.png'></p>
     <br />
     <label for="node-input-server" >
-        <i class="fa fa-square-o"></i>
-        <span data-i18n="knxUltimateHueLight.advanced.node-input-server"></span>
+        <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAKnRFWHRDcmVhdGlvbiBUaW1lAEZyIDYgQXVnIDIwMTAgMjE6NTI6MTkgKzAxMDD84aS8AAAAB3RJTUUH3gYYCicNV+4WIQAAAAlwSFlzAAALEgAACxIB0t1+/AAAAARnQU1BAACxjwv8YQUAAACUSURBVHjaY2CgFZg5c+Z/ZEyWAZ8+f/6/ZsWs/xoamqMGkGrA6Wla/1+fVARjEBuGsSoGmY4eZSCNL59d/g8DIDbIAHR14OgFGQByKjIGKX5+6/T///8gGMQGiV1+/B0Fg70GIkD+RMYgxf/O5/7//2MSmAZhkBi6OrgB6Bg5DGB4ajr3f2xqsYYLSDE2THJUDg0AAAqyDVd4tp4YAAAAAElFTkSuQmCC"></img>
+        KNX GW
     </label>
     <input type="text" id="node-input-server" />
 </div>
 
 <div class="form-row">
     <label for="node-input-serverHue">
-        <i class="fa fa-lightbulb-o"></i>
-        <span data-i18n="knxUltimateHueLight.advanced.node-input-serverHue"></span>
+        <img src="data:image/png;base64, iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAEKADAAQAAAABAAAAEAAAAAA0VXHyAAABFUlEQVQ4EZWSsWoCQRCG1yiENEFEi6QSkjqWWoqFoBYJ+Br6JHkMn8Iibd4ihQpaJIhWNkry/ZtdGZY78Qa+m39nZ+dm9s4550awglNBluS/gVtAX6KgDclf68w2OThgfR9iT/jnoEv4TtByDThWTCDKW4SSZTf/zj9/eZbN+izTDuKGimu0vPF8B/YN8aC8LmcOj/AAn9CFTEs70Js/oGqy79C69bqJ5XbQI2kGO5N8QL9D08S8zBtBF5ZaVsznpCMoqJnVdjTpb1Db0fwIWmQV6BLXzFOYgA6/gDVfQN9bBWp2J2hdWDPoBV5FrKnAJutHikk/CHHR8i7x4iG7qQ720IYvu3GFbpHjx3pFrOFYkA354z/5bkK826phyAAAAABJRU5ErkJggg=="/>
+        HUE Bridge
     </label>
     <input type="text" id="node-input-serverHue" />
 </div>
 
-<div class="form-row">
-    <label for="node-input-name" >
-        <i class="fa fa-tag"></i>
-        <span data-i18n="knxUltimateHueLight.node-input-name"></span>
-    </label>
-    <input style="width:35%;" type="text" id="node-input-name" data-i18n="[placeholder]knxUltimateHueLight.node-input-name" />
-</div>
 
 <br/>
 <p>
@@ -469,9 +469,10 @@
 </p>
     
 <div class="form-row">
-    <label for="node-input-hueLight" >
-        <i class="fa fa-lightbulb-o"></i>&nbsp<span data-i18n="knxUltimateHueLight.node-input-hueLight"></span></label>
-    <input type="text" id="node-input-hueLight" />
+    <label for="node-input-hueDevice" >
+        <i class="fa fa-play-circle"></i>&nbspName</label>
+    <input type="text" id="node-input-name" placeholder="Enter your hue device name"/>
+    <input type="hidden" id="node-input-hueDevice"/>
 </div>
 
 <br/>
@@ -496,7 +497,7 @@
     </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-nameLightDIM" style="width:100px;"><i class="fa fa-play-circle-o"></i>&nbspDimming</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;">
@@ -540,13 +541,13 @@
 
 <br/>
 <p>
-<b>PHILIPS HUE STATES -> TO KNX</b>
+<b>PHILIPS HUE LIGHT STATE -> 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>
+        <label for="node-input-nameLightState" style="width:100px;"><i class="fa fa-play-circle-o"></i> Switch</label>
 
-        <label for="node-input-GALightState" style="width:20px;"><span data-i18n="knxUltimateHueLight.node-input-GALightState"></span></label>
+        <label for="node-input-GALightState" style="width:20px;">GA</label>
         <input type="text" id="node-input-GALightState" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
        
         <label for="node-input-dptLightState" style="width:40px; margin-left: 0px; text-align: right;">
@@ -557,7 +558,7 @@
         <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-nameLightColorState" style="width:100px;"><i class="fa fa-play-circle-o"></i>&nbspColor State</label>
+        <label for="node-input-nameLightColorState" style="width:100px;"><i class="fa fa-play-circle-o"></i>&nbspColor</label>
 
         <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;">
@@ -571,7 +572,7 @@
     </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-nameLightBrightnessState" style="width:100px;"><i class="fa fa-play-circle-o"></i>&nbspBrightness</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;">
@@ -594,4 +595,46 @@
 <br/>
 
 
+</script>
+
+
+<script type="text/markdown" data-help-name="knxUltimateHueLight">
+
+[Find it useful?](https://www.paypal.me/techtoday)
+
+This node lets you control your Philips HUE light and also get the states of this lights.
+
+**General**
+|Property|Description|
+|--|--|
+| KNX GW | Select the KNX gateway to be used |
+| HUE Bridge | Select the HUE Bridge to be used |
+| Name | HUE light to be used. The avaiable lights start showing up while you're typing.|
+
+<br/>
+
+**KNX COMMANDS -> TO PHILIPS HUE**
+Here you can choose the KNX addresses to be linked to the avaiable HUE light commands.<br/>
+Start typing in the GA field, the name or group address of your KNX device, the avaiable devices start showing up while you're typing.
+
+|Property|Description|
+|--|--|
+| Switch | This command is used to turn on/off the HUE light via a boolean KNX value true/false|
+| Dimming | This command is used to DIM the HUE light via a KNX relative DIM datapoint |
+| Color | This command is used to change the HUE light's color. Accepted datapoint is RGB triplet (r,g,b)|
+| Brightness | This command is used to change the absolute HUE light's brightness |
+
+<br/>
+
+**PHILIPS HUE LIGHT STATE -> TO KNX**
+Here you can link the state changes of your HUE light, to any KNX group address you want.<br/>
+Start typing in the GA field, the name or group address of your KNX device, the avaiable devices start showing up while you're typing.
+
+|Property|Description|
+|--|--|
+| Switch | This state is used to send on/off value to the selected KNX group address |
+| Color | This state is used to send changes of the HUE light's color. Accepted datapoint is RGB triplet (r,g,b)|
+| Brightness | This state is used to send changes of your absolute HUE light's brightness, to a KNX group address |
+
+<br/>
 </script>

package/nodes/knxUltimateHueLight.js

@@ -3,13 +3,15 @@ module.exports = function (RED) {
   const hueColorConverter = require('./utils/hueColorConverter')
 
 
-  async function getLightState(node, config) {
+  async function getLightState(node, _lightID) {
     return new Promise((resolve, reject) => {
       try {
-        node.serverHue.hueManager.getLight(config.hueLight.split('#')[1]).then(ret => {
-          node.currentHUELight = ret[0]
-          resolve(ret)
-        })
+        if (node !== null && node.serverHue !== null && node.serverHue.hueManager !== null) {
+          node.serverHue.hueManager.getLight(_lightID).then(ret => {
+            node.currentHUEDevice = ret[0]
+            resolve(ret)
+          })
+        }
       } catch (error) {
         reject(error)
       }
@@ -45,7 +47,7 @@ module.exports = function (RED) {
 
     // Read the state of the light and store it in the holding object
     try {
-      getLightState(node, config)
+      if (config.hueDevice !== undefined && config.hueDevice !== '') getLightState(node, config.hueDevice)
     } catch (error) {
     }
 
@@ -64,26 +66,26 @@ module.exports = function (RED) {
           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.hueManager.setLightState(config.hueLight.split('#')[1], state)
+            node.serverHue.hueManager.setLightState(config.hueDevice, 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.hueManager.setLightState(config.hueLight.split('#')[1], state)
+            node.serverHue.hueManager.setLightState(config.hueDevice, 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)
+            node.serverHue.hueManager.setLightState(config.hueDevice, 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 gamut = node.currentHUEDevice.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)
+            node.serverHue.hueManager.setLightState(config.hueDevice, state)
             break
           default:
             break
@@ -96,7 +98,7 @@ module.exports = function (RED) {
 
     node.handleSendHUE = _event => {
       try {
-        if (_event.id === config.hueLight.split('#')[1]) {
+        if (_event.id === config.hueDevice) {
           let knxMsgPayload = {}
           if (_event.hasOwnProperty('on')) {
             knxMsgPayload.ga = config.GALightState
@@ -106,7 +108,7 @@ module.exports = function (RED) {
           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)
+            knxMsgPayload.payload = hueColorConverter.ColorConverter.xyBriToRgb(_event.color.xy.x, _event.color.xy.y, node.currentHUEDevice.dimming.brightness)
           }
           if (_event.hasOwnProperty('dimming')) {
             knxMsgPayload.ga = config.GALightBrightnessState
@@ -116,7 +118,7 @@ module.exports = function (RED) {
           // 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 })
+            if (knxMsgPayload.ga !== '' && knxMsgPayload.ga !== undefined) node.server.writeQueueAdd({ grpaddr: knxMsgPayload.ga, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id })
           }
         }
       } catch (error) {

package/nodes/utils/hueUtils.js

@@ -1,6 +1,6 @@
 'use strict'
 
-//const hueApi = require('node-hue-api')
+// const hueApi = require('node-hue-api')
 const hueApiV2 = require('node-hue')
 const { EventEmitter } = require('events')
 
@@ -16,28 +16,34 @@ class classHUE extends EventEmitter {
     this.hue = undefined
   }
 
-  getAllLights = async () => {
+  // Get all devices and join it with relative rooms, by adding the room name to the device name
+  getDevices = async (_rtype) => {
     try {
       // V2
       const hue = hueApiV2.connect({ host: this.HUEBridgeIP, key: this.username })
-      const allLights = await hue.getLights()
-      //  allLights.forEach(light => {
-      //    console.log(JSON.stringify(light))
-      //    console.log("\n")
-      //    console.log("\n")
-      //  })
-
-      // V2
-      // const bridgeHUE = await hueApi.v3.api.createLocal(this.HUEBridgeIP).connect(this.username)
-      // const allLights = await bridgeHUE.lights.getAll()
-      // allLights.forEach(light => {
-      //   console.log(light.toStringDetailed())
-      // })
-
-      return { lights: allLights }
+      const retArray = []
+      const allResources = await hue.getResources()
+      const allRooms = await hue.getRooms()
+      const newArray = allResources.filter(x => x.type === _rtype)
+      // Add room name to the device name
+      newArray.forEach(device => {
+        // const Room = allRooms.find(room => {
+        //   return room.children.find(child => child.rid === device.id)
+        // })
+        const Room = allRooms.find(room => room.children.find(child => child.rid === device.owner.rid))
+        const linkedDevName = allResources.find(dev => dev.type === 'device' && dev.services.find(serv => serv.rid === device.id)).metadata.name || ''
+        if (_rtype === 'button') {
+          const controlID = device.metadata !== undefined ? (device.metadata.control_id || '') : ''
+          retArray.push({ name: linkedDevName + (controlID !== '' ? ', button ' + controlID : '') + (Room !== undefined ? ', room ' + Room.metadata.name : ''), id: device.id })
+        }
+        if (_rtype === 'light') {
+          retArray.push({ name: linkedDevName + (Room !== undefined ? ', room ' + Room.metadata.name : ''), id: device.id })
+        }
+      })
+      return { devices: retArray }
     } catch (error) {
-      console.log('KNXUltimateHue: classHUE: error ' + error.message)
-      return ({ lights: error.message })
+      console.log('KNXUltimateHue: HueUtils: classHUE: getDevices: error ' + error.message)
+      return ({ devices: error.message })
     }
   }
 
@@ -69,7 +75,7 @@ class classHUE extends EventEmitter {
   handleTheDog = async () => {
     this.timerWatchDog = setInterval(async () => {
       try {
-        //const hue = hueApiV2.connect({ host: this.HUEBridgeIP, key: this.username })
+        // const hue = hueApiV2.connect({ host: this.HUEBridgeIP, key: this.username })
         if (this.hue !== undefined) {
           const sRet = await this.hue.getBridges()
           if (sRet.filter(e => e.bridge_id.toString().toLowerCase() === this.bridgeid.toString().toLowerCase()).length === 0) {
@@ -107,4 +113,3 @@ class classHUE extends EventEmitter {
   }
 }
 module.exports.classHUE = classHUE
-

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-red-contrib-knx-ultimate",
-  "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.",
+  "version": "2.0.2",
+  "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. With integrated Philips HUE devices handling.",
   "dependencies": {
     "mkdirp": "1.0.4",
     "ping": "0.4.1",
@@ -29,7 +29,8 @@
       "knxUltimateLoadControl": "/nodes/knxUltimateLoadControl.js",
       "knxUltimateViewer": "/nodes/knxUltimateViewer.js",
       "hueConfig": "/nodes/hue-config.js",
-      "knxUltimateHueLight": "/nodes/knxUltimateHueLight.js"
+      "knxUltimateHueLight": "/nodes/knxUltimateHueLight.js",
+      "knxUltimateHueButton": "/nodes/knxUltimateHueButton.js"
     }
   },
   "repository": {

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

@@ -1,10 +0,0 @@
-<script type="text/x-red" data-help-name="knxUltimateHueLight">
-    <h1>KNX Ultimate - Nodo HUE</h1>
-    
-
-  
-    <p>
-        <a href="https://www.paypal.me/techtoday" target="_blank"><img src='https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square' width='30%'></a>
-      
-    </p>
-</script>