npm - node-red-contrib-knx-ultimate - Versions diffs - 2.0.9 → 2.0.11 - Mend

node-red-contrib-knx-ultimate 2.0.9 → 2.0.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/CHANGELOG.md +15 -1
package/nodes/knxUltimateHueButton.html +54 -197
package/nodes/knxUltimateHueButton.js +42 -54
package/nodes/knxUltimateHueLight.html +14 -28
package/nodes/knxUltimateHueLight.js +4 -5
package/nodes/knxUltimateHueMotion.html +4 -8
package/nodes/knxUltimateHueMotion.js +2 -4
package/nodes/knxUltimateHueTapDial.html +8 -12
package/nodes/knxUltimateHueTapDial.js +2 -4
package/package.json +1 -1

package/CHANGELOG.md CHANGED Viewed

@@ -6,10 +6,24 @@
 # CHANGELOG
+<p>
+<b>Version 2.0.10</b> - June 2023<br/>
+- HUE: CAUTION BREAKING CHANGES TO THE HUE NODES. PLEASE BE AWARE THAT HUE NODES ARE STILL IN BETA<br/>
+- Hotfix for Hue Button node, not retain property in config window.<br/>
+- Removed "Double Tap" event, because it doesn't exists yet.<br/>
+</p>
+<p>
+<b>Version 2.0.10</b> - June 2023<br/>
+- HUE: CAUTION BREAKING CHANGES TO THE HUE NODES. PLEASE BE AWARE THAT HUE NODES ARE STILL IN BETA<br/>
+- Hue Button node redesign.<br/>
+- Other hue nodes fixes<br/>
+</p>
+<p>
 <p>
 <b>Version 2.0.9</b> - June 2023<br/>
 - NEW: HUE Motion node<br/>
-- NEW: HUE Tap Dial node<br/></p>
+- NEW: HUE Tap Dial node<br/>
+</p>
 <p>
 <b>Version 2.0.7</b> - June 2023<br/>
 - HUE Button node: added an output PIN<br/>

package/nodes/knxUltimateHueButton.html CHANGED Viewed

@@ -8,29 +8,17 @@
             serverHue: { type: "hue-config", required: true },
             name: { value: "" },
-            nameinitial_press: { value: "" },
-            GAinitial_press: { value: "" },
-            dptinitial_press: { value: "" },
             namerepeat: { value: "" },
             GArepeat: { value: "" },
-            dptrepeat: { value: "" },
+            dptrepeat: { value: "3.007" },
             nameshort_release: { value: "" },
             GAshort_release: { value: "" },
-            dptshort_release: { value: "" },
-            namelong_release: { value: "" },
-            GAlong_release: { value: "" },
-            dptlong_release: { value: "" },
+            dptshort_release: { value: "1.001" },
-            namedouble_short_release: { value: "" },
-            GAdouble_short_release: { value: "" },
-            dptdouble_short_release: { value: "" },
-            namelong_press: { value: "" },
-            GAlong_press: { value: "" },
-            dptlong_press: { value: "" },
+            nameshort_releaseStatus: { value: "" },
+            GAshort_releaseStatus: { value: "" },
+            dptshort_releaseStatus: { value: "1.001" },
             toggleValues: { value: true },
             hueDevice: { value: "" }
@@ -85,65 +73,16 @@
                 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")) {
+                    if (dpt.value.startsWith("3.007")) {
                         $("#node-input-dptrepeat").append($("<option></option>")
                             .attr("value", dpt.value)
                             .text(dpt.text))
                     }
                 });
                 $("#node-input-dptrepeat").val(this.dptrepeat)
             })
@@ -155,7 +94,7 @@
                         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')) {
+                                if (value.dpt.startsWith('3.007')) {
                                     return {
                                         label: value.ga + " # " + value.devicename + " # " + value.dpt, // Label for Display
                                         value: value.ga // Value
@@ -189,11 +128,12 @@
                         $("#node-input-dptshort_release").append($("<option></option>")
                             .attr("value", dpt.value)
                             .text(dpt.text))
+                        $("#node-input-dptshort_releaseStatus").append($("<option></option>")
+                            .attr("value", dpt.value)
+                            .text(dpt.text))
                     }
                 });
                 $("#node-input-dptshort_release").val(this.dptshort_release)
             })
             // Autocomplete suggestion with ETS csv File
@@ -227,28 +167,8 @@
                 }
             });
-            // 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({
+            $("#node-input-GAshort_releaseStatus").autocomplete({
                 minLength: 1,
                 source: function (request, response) {
                     $.getJSON("knxUltimatecsv?nodeID=" + oNodeServer.id, (data) => {
@@ -271,13 +191,14 @@
                         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');
+                    $('#node-input-nameshort_releaseStatus').val(sDevName);
+                    var optVal = $("#node-input-dptshort_releaseStatus option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
                     // Select the option value
-                    $("#node-input-dptlong_release").val(optVal);
+                    $("#node-input-dptshort_releaseStatus").val(optVal);
                 }
             });
             // Autocomplete suggestion with ETS csv File
             $("#node-input-GAdouble_short_release").autocomplete({
                 minLength: 1,
@@ -309,25 +230,8 @@
                 }
             });
-            // 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({
+            $("#node-input-GAdouble_short_releaseStatus").autocomplete({
                 minLength: 1,
                 source: function (request, response) {
                     $.getJSON("knxUltimatecsv?nodeID=" + oNodeServer.id, (data) => {
@@ -350,18 +254,13 @@
                         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');
+                    $('#node-input-namedouble_short_releaseStatus').val(sDevName);
+                    var optVal = $("#node-input-dptdouble_short_releaseStatus option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
                     // Select the option value
-                    $("#node-input-dptlong_press").val(optVal);
+                    $("#node-input-dptdouble_short_releaseStatus").val(optVal);
                 }
             });
             // Autocomplete suggestion with HUE
             $("#node-input-name").autocomplete({
                 minLength: 1,
@@ -406,7 +305,7 @@
 <div class="form-row">
-    <b>HUE Light</b>&nbsp&nbsp<span style="color:red"
+    <b>HUE Button node</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 />
@@ -444,87 +343,51 @@
 <!-- <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>
+<b>KNX DATAPOINTS</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-nameshort_release" style="width:100px;"><i class="fa fa-play-circle-o"></i> Switch</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>
+        <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 style="width:100px;"><i class="fa fa-play-circle-o"></i> Switch Status</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;">
+        <label for="node-input-GAshort_releaseStatus" style="width:20px;">GA</label>
+        <input type="text" id="node-input-GAshort_releaseStatus" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
+        <label for="node-input-dptshort_releaseStatus" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
+        <select id="node-input-dptshort_releaseStatus" style="width:140px;"></select>
+        <label for="node-input-nameshort_releaseStatus" style="width:50px; margin-left: 0px; text-align: right;">Name</label>
+        <input type="text" id="node-input-nameshort_releaseStatus" style="width:200px;margin-left: 5px; text-align: left;">
     </div>
+    <br/>
+    <br/>
     <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 style="width:100px;"><i class="fa fa-play-circle-o"></i> Dim</span></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-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-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-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-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;">
+        <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>
+    <br/>
+    <br/>
-    <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">
@@ -537,11 +400,6 @@
 </div>
-<br/>
-<br/>
-<br/>
-<br/>
-<br/>
 <br/>
 <br/>
 <br/>
@@ -552,11 +410,9 @@
 <script type="text/markdown" data-help-name="knxUltimateHueButton">
 <p> This node lets you get the events from your HUE button.<br/>
-There are many event you can choose from. The relevants one are *Initial press* and *repeat*.
-In *Initial press* you can send true/false to your KNX group address to, for example, toggle a light.
-In *repeat* event, you can DIM a KNX light.
+Link the Group Adresses you want, to the respective events.
+All fields are optional.
 The **toggle values** option is enabled by default. This option toggles the value of each KNX group address (*true/false, increase/decrease dim*)
-If you want to simply switch on and off a KNX load or light, use the *Initial press* group address and be sure that the *Toggle values* is enabled.
 **General**
@@ -568,17 +424,17 @@ If you want to simply switch on and off a KNX load or light, use the *Initial pr
 <br/>
-**PHILIPS HUE BUTTON EVENTS -> TO KNX**
+**KNX DATAPOINTS**
 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.
+The Status fields need to be filled only if you set the *Toggle values* option.
+This allows the internal logic to be aware of external devices, like wall switches.
 |Property|Description|
 |--|--|
-| Initial press | As soon as you press your HUE button, this event fires|
+| Switch | As soon as you quickly press and release your HUE button, this event fires |
+| Switch Status | To allow internal logic to take care of the external KNX devices, for example an external wall switch, you should set this group address |
 | Repeat | This event 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 |
 ### Outputs
@@ -589,7 +445,8 @@ Start typing in the GA field, the name or group address of your KNX device, the
 ### Details
 `msg.payload` is used as the payload of the published message.
-If it contains an Object it will be converted to a JSON string before being sent.
+If it contains an Object it will be converted to a JSON string before being sent.
+It contains the detailed event sent by your Hue devicem so you can use it for whatever you want.
 [Find it useful?](https://www.paypal.me/techtoday)

package/nodes/knxUltimateHueButton.js CHANGED Viewed

@@ -1,4 +1,5 @@
 module.exports = function (RED) {
+  const dptlib = require('./../KNXEngine/dptlib')
   function knxUltimateHueButton(config) {
     RED.nodes.createNode(this, config)
@@ -23,14 +24,8 @@ module.exports = function (RED) {
     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
-    node.toggle6 = false
+    node.toggleGArepeat = false // up or down if repeat field is set to DIM
+    node.toggleGAshort_release = false
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload }) => {
@@ -39,66 +34,59 @@ module.exports = function (RED) {
     // This function is called by the knx-ultimate config node, to output a msg.payload.
     node.handleSend = msg => {
+      const state = {}
+      try {
+        switch (msg.knx.destination) {
+          case config.GAshort_releaseStatus:
+            msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptshort_release))
+            node.toggleGAshort_release = msg.payload
+            setTimeout(() => {
+              node.status({ fill: 'blue', shape: 'dot', text: 'Updated Switch ' + msg.knx.destination + ' ' + JSON.stringify(msg.payload) + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
+            }, 500)
+            break
+          case config.GArepeatStatus:
+            msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptrepeat))
+            node.toggleGArepeat = msg.payload.decr_incr === 1
+            setTimeout(() => {
+              node.status({ fill: 'blue', shape: 'dot', text: 'Updated Dim ' + msg.knx.destination + ' ' + JSON.stringify(msg.payload) + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
+            }, 500)
+            break
+          default:
+            break
+        }
+      } catch (error) {
+        node.status({ fill: 'red', shape: 'dot', text: 'KNX->HUE error ' + error.message + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
+      }
     }
     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 }
-            }
-          }
+          // Switch
           if (_event.button.last_event === 'short_release') {
-            knxMsgPayload.ga = config.GAshort_release
+            knxMsgPayload.topic = 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
+            config.toggleValues ? (node.toggleGAshort_release = !node.toggleGAshort_release) : node.toggleGAshort_release = true
+            knxMsgPayload.payload = node.toggleGAshort_release
+            node.status({ fill: 'green', shape: 'dot', text: 'HUE->KNX ' + _event.button.last_event + ' ' + JSON.stringify(knxMsgPayload.payload) + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
           }
-          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
+          // Dim
+          if (_event.button.last_event === 'repeat') {
+            knxMsgPayload.topic = config.GArepeat
+            knxMsgPayload.dpt = config.dptrepeat
+            if (!config.toggleValues) node.toggleGArepeat = true
+            knxMsgPayload.payload = node.toggleGArepeat ? { decr_incr: 1, data: 5 } : { decr_incr: 0, data: 5 }
+            node.status({ fill: 'green', shape: 'dot', text: 'HUE->KNX ' + _event.button.last_event + ' ' + JSON.stringify(knxMsgPayload.payload) + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
           }
           // Send to KNX bus
-          if (knxMsgPayload.ga !== '' && knxMsgPayload.ga !== undefined) {
-            node.server.writeQueueAdd({ grpaddr: knxMsgPayload.ga, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id })
+          if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) {
+            node.server.writeQueueAdd({ grpaddr: knxMsgPayload.topic, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id })
           }
-          node.status({ fill: 'green', shape: 'dot', text: 'HUE->KNX ' + _event.button.last_event + ' ' + JSON.stringify(knxMsgPayload.payload) + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
           // Setup the output msg
-          knxMsgPayload.topic = knxMsgPayload.ga
-          delete knxMsgPayload.ga
           knxMsgPayload.name = node.name
           knxMsgPayload.event = _event.button.last_event
           knxMsgPayload.rawEvent = _event

package/nodes/knxUltimateHueLight.html CHANGED Viewed

@@ -441,7 +441,7 @@
 <div class="form-row">
-    <b>HUE Light</b>&nbsp&nbsp<span style="color:red"
+    <b>HUE Light node</b>&nbsp&nbsp<span style="color:red"
     &nbsp
     &nbsp<i class="fa fa-youtube"></i></span>&nbsp<a target="_blank" href="https://youtu.be/3M02Du2gero"><u>Youtube sample</u></a>
     <br />
@@ -488,8 +488,7 @@
         <label for="node-input-GALightSwitch" style="width:20px;"><span data-i18n="knxUltimateHueLight.node-input-GALightSwitch"></span></label>
         <input type="text" id="node-input-GALightSwitch" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
-        <label for="node-input-dptLightSwitch" style="width:40px; margin-left: 0px; text-align: right;">
-            <span data-i18n="knxUltimateHueLight.node-input-dptLightSwitch"></span> </label>
+        <label for="node-input-dptLightSwitch" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
         <select id="node-input-dptLightSwitch" style="width:140px;"></select>
         <label for="node-input-nameLightSwitch" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
@@ -502,8 +501,7 @@
         <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>
+        <label for="node-input-dptLightDIM" style="width:40px; margin-left: 0px; text-align: right;">DPT</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>
@@ -516,8 +514,7 @@
         <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>
+        <label for="node-input-dptLightColor" style="width:40px; margin-left: 0px; text-align: right;">DPT</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>
@@ -531,8 +528,7 @@
         <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>
+        <label for="node-input-dptLightBrightness" style="width:40px; margin-left: 0px; text-align: right;">DPT</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>
@@ -545,26 +541,24 @@
 </p>
     <div class="form-row">
-        <label for="node-input-nameLightState" style="width:100px;"><i class="fa fa-play-circle-o"></i> Switch</label>
+        <label for="node-input-nameLightState" style="width:100px;"><i class="fa fa-play-circle-o"></i> Switch Status</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;">
-            <span data-i18n="knxUltimateHueLight.node-input-dptLightState"></span> </label>
+        <label for="node-input-dptLightState" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
         <select id="node-input-dptLightState" style="width:140px;"></select>
         <label for="node-input-nameLightState" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
         <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</label>
+        <label for="node-input-nameLightColorState" style="width:100px;"><i class="fa fa-play-circle-o"></i> Color Status</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;">
-        <label for="node-input-dptLightColorState" style="width:40px; margin-left: 0px; text-align: right;">
-            <span data-i18n="knxUltimateHueLight.node-input-dptLightState"></span> </label>
+        <label for="node-input-dptLightColorState" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
         <select id="node-input-dptLightColorState" style="width:140px;"></select>
         <label for="node-input-nameLightColorState" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
@@ -572,13 +566,12 @@
     </div>
         </div>
         <div class="form-row">
-        <label for="node-input-nameLightBrightnessState" style="width:100px;"><i class="fa fa-play-circle-o"></i>&nbspBrightness</label>
+        <label for="node-input-nameLightBrightnessState" style="width:100px;"><i class="fa fa-play-circle-o"></i>Brightness Status</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>
+        <label for="node-input-dptLightBrightnessState" style="width:40px; margin-left: 0px; text-align: right;">DPT</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>
@@ -588,13 +581,6 @@
 <br/>
 <br/>
 <br/>
-<br/>
-<br/>
-<br/>
-<br/>
-<br/>
 </script>
@@ -629,9 +615,9 @@ Start typing in the GA field, the name or group address of your KNX device, the
 |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 |
+| Switch Status| This state is used to send on/off value to the selected KNX group address |
+| Color Status | This state is used to send changes of the HUE light's color. Accepted datapoint is RGB triplet (r,g,b)|
+| Brightness Status| This state is used to send changes of your absolute HUE light's brightness, to a KNX group address |
 [Find it useful?](https://www.paypal.me/techtoday)

package/nodes/knxUltimateHueLight.js CHANGED Viewed

@@ -93,7 +93,6 @@ module.exports = function (RED) {
       } 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.handleSendHUE = _event => {
@@ -101,22 +100,22 @@ module.exports = function (RED) {
         if (_event.id === config.hueDevice) {
           let knxMsgPayload = {}
           if (_event.hasOwnProperty('on')) {
-            knxMsgPayload.ga = config.GALightState
+            knxMsgPayload.topic = config.GALightState
             knxMsgPayload.dpt = config.dptLightState
             knxMsgPayload.payload = _event.on.on
           }
           if (_event.hasOwnProperty('color')) {
-            knxMsgPayload.ga = config.GALightColorState
+            knxMsgPayload.topic = config.GALightColorState
             knxMsgPayload.dpt = config.dptLightColorState
             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
+            knxMsgPayload.topic = config.GALightBrightnessState
             knxMsgPayload.dpt = config.dptLightBrightnessState
             knxMsgPayload.payload = _event.dimming.brightness
           }
           // Send to KNX bus
-          if (knxMsgPayload.ga !== '' && knxMsgPayload.ga !== undefined) node.server.writeQueueAdd({ grpaddr: knxMsgPayload.ga, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id })
+          if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) node.server.writeQueueAdd({ grpaddr: knxMsgPayload.topic, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id })
           node.status({ fill: 'green', shape: 'dot', text: 'HUE->KNX State ' + JSON.stringify(knxMsgPayload.payload) + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
         }

package/nodes/knxUltimateHueMotion.html CHANGED Viewed

@@ -157,7 +157,7 @@
 <div class="form-row">
-    <b>HUE Light</b>&nbsp&nbsp<span style="color:red"
+    <b>HUE Motion node</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 />
@@ -202,7 +202,7 @@
         <label for="node-input-GAmotion" style="width:20px;">GA</label>
         <input type="text" id="node-input-GAmotion" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
-        <label for="node-input-dptmotion" style="width:40px; margin-left: 0px; text-align: right;">dpt</label>
+        <label for="node-input-dptmotion" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
         <select id="node-input-dptmotion" style="width:140px;"></select>
         <label for="node-input-namemotion" style="width:50px; margin-left: 0px; text-align: right;">Name</label>
@@ -212,11 +212,6 @@
 </div>
-<br/>
-<br/>
-<br/>
-<br/>
-<br/>
 <br/>
 <br/>
 <br/>
@@ -242,7 +237,8 @@ Start typing in the GA field, the name or group address of your KNX device, the
 ### Details
-`msg.payload` is used as the payload of the published message.
+`msg.payload` is used as the payload of the published message.
+It contains the detailed event sent by your Hue devicem so you can use it for whatever you want.
 [Find it useful?](https://www.paypal.me/techtoday)

package/nodes/knxUltimateHueMotion.js CHANGED Viewed

@@ -40,18 +40,16 @@ module.exports = function (RED) {
       try {
         if (_event.id === config.hueDevice) {
           const knxMsgPayload = {}
-          knxMsgPayload.ga = config.GAmotion
+          knxMsgPayload.topic = config.GAmotion
           knxMsgPayload.dpt = config.dptmotion
           knxMsgPayload.payload = _event.motion.motion
           if (_event.hasOwnProperty('motion') && _event.motion.hasOwnProperty('motion')) {
             // Send to KNX bus
-            if (knxMsgPayload.ga !== '' && knxMsgPayload.ga !== undefined) node.server.writeQueueAdd({ grpaddr: knxMsgPayload.ga, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id })
+            if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) node.server.writeQueueAdd({ grpaddr: knxMsgPayload.topic, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id })
             node.status({ fill: 'green', shape: 'dot', text: 'HUE->KNX ' + JSON.stringify(knxMsgPayload.payload) + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
             // Setup the output msg
-            knxMsgPayload.topic = knxMsgPayload.ga
-            delete knxMsgPayload.ga
             knxMsgPayload.name = node.name
             knxMsgPayload.event = 'motion'

package/nodes/knxUltimateHueTapDial.html CHANGED Viewed

@@ -159,7 +159,7 @@
 <div class="form-row">
-    <b>HUE Light</b>&nbsp&nbsp<span style="color:red"
+    <b>HUE Tap Dial node (rotary)</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 />
@@ -204,7 +204,7 @@
         <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>
+        <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>
@@ -215,11 +215,6 @@
 </div>
-<br/>
-<br/>
-<br/>
-<br/>
-<br/>
 <br/>
 <br/>
 <br/>
@@ -228,11 +223,11 @@
 </script>
 <script type="text/markdown" data-help-name="knxUltimateHueTapDial">
-<p> This node lets you get the events from your HUE rotary, for example Tap Dial.<br/>
+<p> This node lets you get the events from your HUE rotary device, for example the Tap Dial.<br/>
-The Tap Dial button has 4 buttons and 1 rotary knob.
-You can find the 4 buttons in the **Button node**, not here!
-The rotary service of the Tap Dial button, can send a DIM (Datapoint 3.007) or absolute brightness (Datapoint 5.001) to the KNX bus,
+The Tap Dial device has 4 buttons and 1 rotary knob.
+You can find the 4 buttons in the **Hue Button node**, not here!
+The rotary service of the Tap Dial, can send a DIM (Datapoint 3.007) or absolute brightness (Datapoint 5.001) to the KNX bus,
 to the selected group address.
 **General**
@@ -260,7 +255,8 @@ Start typing in the GA field, the name or group address of your KNX device, the
 ### Details
 `msg.payload` is used as the payload of the published message.
-If it contains an Object it will be converted to a JSON string before being sent.
+If it contains an Object it will be converted to a JSON string before being sent.
+It contains the detailed event sent by your Hue devicem so you can use it for whatever you want.
 [Find it useful?](https://www.paypal.me/techtoday)

package/nodes/knxUltimateHueTapDial.js CHANGED Viewed

@@ -61,7 +61,7 @@ module.exports = function (RED) {
       try {
         if (_event.id === config.hueDevice) {
           const knxMsgPayload = {}
-          knxMsgPayload.ga = config.GArepeat
+          knxMsgPayload.topic = config.GArepeat
           knxMsgPayload.dpt = config.dptrepeat
           if (_event.relative_rotary.last_event.rotation.direction === 'clock_wise') {
             if (knxMsgPayload.dpt.startsWith('3.007')) {
@@ -81,12 +81,10 @@ module.exports = function (RED) {
           }
           // Send to KNX bus
-          if (knxMsgPayload.ga !== '' && knxMsgPayload.ga !== undefined) node.server.writeQueueAdd({ grpaddr: knxMsgPayload.ga, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id })
+          if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) node.server.writeQueueAdd({ grpaddr: knxMsgPayload.topic, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id })
           node.status({ fill: 'green', shape: 'dot', text: 'HUE->KNX ' + JSON.stringify(knxMsgPayload.payload) + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
           // Setup the output msg
-          knxMsgPayload.topic = knxMsgPayload.ga
-          delete knxMsgPayload.ga
           knxMsgPayload.name = node.name
           knxMsgPayload.event = 'rotation ' + _event.relative_rotary.last_event.rotation.direction
           knxMsgPayload.payload = _event

package/package.json CHANGED Viewed

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "version": "2.0.9",
+  "version": "2.0.11",
   "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",