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

package/CHANGELOG.md

@@ -6,6 +6,10 @@
 
 # CHANGELOG
 
+<p>
+<b>Version 2.0.9</b> - June 2023<br/>
+- NEW: HUE Motion node<br/>
+- 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/hue-config.html

@@ -38,14 +38,14 @@
                                             this.disabled = true;
                                             return;
                                         }
-                                       
+
                                         // Expected { bridge: bridgeConfig, user: createdUser }
                                         $("#node-config-input-name").val(data.bridge.data.name);
                                         $("#node-config-input-host").val(data.bridge.data.ipaddress);
                                         $("#node-config-input-username").val(data.user.username);
                                         $("#node-config-input-clientkey").val(data.user.clientkey);
                                         $("#node-config-input-bridgeid").val(data.bridge.data.bridgeid);
-                                        
+
                                     }).error(function (jqXHR, textStatus, errorThrown) {
                                         RED.notify("Something went wrong. Please create at least a KNX Gateway node first.",
                                             {
@@ -88,10 +88,9 @@
 
     <p align='center'> <img src='https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/huehub.jpg' width='40%'></p>
 
-       
 
-        <div class="form-row">
-            <label><i class="fa fa-sign-in"></i>&nbsp&nbsp<span data-i18n="hue-config.properties.getinfocam"</span></label>
+    <div class="form-row">
+            <label><i class="fa fa-sign-in"></i>&nbspRegister</label>
             <input type="button" id="getinfocam" class="ui-button ui-corner-all ui-widget" style="background-color:#AEE1FF;width:150px" value="CONNECT">
         </div>
 
@@ -129,4 +128,14 @@
 
     
     
+</script>
+<script type="text/x-red" data-help-name="hue-config">
+<p> This node registes to the Hue Bridge.<br/>
+
+Just click **Connect** button.
+
+[Find it useful?](https://www.paypal.me/techtoday)
+
+<br/>
+
 </script>

package/nodes/hue-config.js

@@ -90,25 +90,6 @@ module.exports = (RED) => {
       })
     })
 
-    // Endpoint frontend
-    RED.httpAdmin.get('/KNXUltimateGetAllLightsHUE', RED.auth.needsPermission('hue-config.read'), function (req, res) {
-      try {
-        (async () => {
-          try {
-            // °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°
-            const jRet = await node.hueManager.getAllLights()
-            res.json(jRet)
-            // °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°
-          } catch (err) {
-            RED.log.error('Errore KNXUltimateGetAllLightsHUE non gestito ' + err.message)
-            res.json({ error: err.message })
-          }
-        })()
-      } catch (err) {
-        RED.log.error('Errore KNXUltimateGetAllLightsHUE bsonto ' + err.message)
-        res.json({ error: err.message })
-      }
-    })
 
     RED.httpAdmin.get('/KNXUltimateGetDevicesHUE', RED.auth.needsPermission('hue-config.read'), function (req, res) {
       try {
@@ -120,12 +101,12 @@ module.exports = (RED) => {
             res.json(jRet)
             // °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°
           } catch (err) {
-            RED.log.error('Errore KNXUltimategetButtonsHUE non gestito ' + err.message)
+            RED.log.error('Errore KNXUltimateGetDevicesHUE non gestito ' + err.message)
             res.json({ error: err.message })
           }
         })()
       } catch (err) {
-        RED.log.error('Errore KNXUltimategetButtons bsonto ' + err.message)
+        RED.log.error('Errore KNXUltimateGetDevicesHUE bsonto ' + err.message)
         res.json({ error: err.message })
       }
     })

package/nodes/knxUltimateHueButton.html

@@ -4,9 +4,9 @@
         color: '#C7E9C0',
         defaults: {
             //buttonState: {value: true},
-            server: { type: "knxUltimate-config", required: true },
+            server: { type: "knxUltimate-config", required: false },
             serverHue: { type: "hue-config", required: true },
-            name: { value: "Hue Button (beta)" },
+            name: { value: "" },
 
             nameinitial_press: { value: "" },
             GAinitial_press: { value: "" },
@@ -32,7 +32,6 @@
             GAlong_press: { value: "" },
             dptlong_press: { value: "" },
 
-            outputSimpleMode: { value: true },
             toggleValues: { value: true },
             hueDevice: { value: "" }
         },
@@ -363,7 +362,7 @@
 
 
 
-            // Autocomplete suggestion with HUE Lights
+            // Autocomplete suggestion with HUE
             $("#node-input-name").autocomplete({
                 minLength: 1,
                 source: function (request, response) {
@@ -534,11 +533,7 @@
             Toggle values
         </label>
     </div>
-    <div class="form-row">
-        <input type="checkbox" id="node-input-outputSimpleMode" style="display:inline-block; width:auto; vertical-align:top;" />
-        <label style="width:auto" for="node-input-outputSimpleMode"><i class="fa fa-filter">Simple output mode</i></label>
-    </div>
-    
+       
 </div>
         
 
@@ -555,14 +550,14 @@
 </script>
 
 <script type="text/markdown" data-help-name="knxUltimateHueButton">
+<p> This node lets you get the events from your HUE button.<br/>
 
-[Find it useful?](https://www.paypal.me/techtoday)
+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.  
+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.
 
-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|
@@ -580,13 +575,24 @@ Start typing in the GA field, the name or group address of your KNX device, the
 |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 |
+| 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 |
-| Simple output mode | Enables an RBE output on the payload *true/false*, independently from the HUE Button events type. *Repeat* messages are always repeated. When disabled, the node outputs a msg for every different HUE Button events |
 
+### Outputs
+
+1. Standard output
+: payload (string|object) : the standard output of the command.
+
+### 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.
+
+[Find it useful?](https://www.paypal.me/techtoday)
 
 <br/>
+
     </script>

package/nodes/knxUltimateHueButton.js

@@ -1,22 +1,4 @@
 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)
@@ -48,15 +30,7 @@ module.exports = function (RED) {
     node.toggle4 = false
     node.toggle5 = false
     node.toggle5 = false
-    node.rbeOutputPayload = undefined
-
-    // 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) {
-    }
-
-
+    node.toggle6 = false
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload }) => {
@@ -117,22 +91,18 @@ module.exports = function (RED) {
             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 })
+          if (knxMsgPayload.ga !== '' && knxMsgPayload.ga !== undefined) {
+            node.server.writeQueueAdd({ grpaddr: knxMsgPayload.ga, 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
-
-          // Applying rbe filter
-          if (config.outputSimpleMode && knxMsgPayload.payload !== node.rbeOutputPayload) {
-            node.rbeOutputPayload = knxMsgPayload.payload
-          } else {
-            node.send(knxMsgPayload)
-          }
+          knxMsgPayload.rawEvent = _event
+          node.send(knxMsgPayload)
         }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'HUE->KNX error ' + error.message + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
@@ -159,12 +129,6 @@ module.exports = function (RED) {
       }
       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 (beta)" },
+            name: { value: "" },
 
             nameLightSwitch: { value: "" },
             GALightSwitch: { value: "" },
@@ -442,8 +442,8 @@
 
 <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> 
+    &nbsp
+    &nbsp<i class="fa fa-youtube"></i></span>&nbsp<a target="_blank" href="https://youtu.be/3M02Du2gero"><u>Youtube sample</u></a> 
     <br />
     <p align="center"><img src='https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/hueLight.png'></p>
     <br />
@@ -599,10 +599,7 @@
 
 
 <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.
+<p>This node lets you control your Philips HUE light and also get the states of this lights.
 
 **General**
 |Property|Description|
@@ -636,5 +633,7 @@ Start typing in the GA field, the name or group address of your KNX device, the
 | 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 |
 
+[Find it useful?](https://www.paypal.me/techtoday)
+
 <br/>
 </script>

package/nodes/knxUltimateHueLight.js

@@ -116,10 +116,9 @@ module.exports = function (RED) {
             knxMsgPayload.payload = _event.dimming.brightness
           }
           // Send to KNX bus
-          if (knxMsgPayload.ga !== undefined) {
-            node.status({ fill: 'green', shape: 'dot', text: 'HUE->KNX State ' + JSON.stringify(knxMsgPayload.payload) + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
-            if (knxMsgPayload.ga !== '' && knxMsgPayload.ga !== undefined) 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 })
+          node.status({ fill: 'green', shape: 'dot', text: 'HUE->KNX State ' + JSON.stringify(knxMsgPayload.payload) + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
+
         }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'HUE->KNX error ' + error.message + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
@@ -146,12 +145,6 @@ module.exports = function (RED) {
       }
       done()
     })
-
-    // On each deploy, unsubscribe+resubscribe
-    if (node.server) {
-      node.server.removeClient(node)
-      node.server.addClient(node)
-    }
   }
   RED.nodes.registerType('knxUltimateHueLight', knxUltimateHueLight)
 }

package/nodes/knxUltimateHueMotion.html

@@ -0,0 +1,251 @@
+<script type="text/javascript">
+    RED.nodes.registerType('knxUltimateHueMotion', {
+        category: "KNX Ultimate",
+        color: '#C7E9C0',
+        defaults: {
+            //buttonState: {value: true},
+            server: { type: "knxUltimate-config", required: false },
+            serverHue: { type: "hue-config", required: true },
+            name: { value: "" },
+
+            namemotion: { value: "" },
+            GAmotion: { value: "" },
+            dptmotion: { value: "" },
+
+            hueDevice: { value: "" }
+        },
+        inputs: 0,
+        outputs: 1,
+        icon: "node-hue-icon.svg",
+        label: function () {
+            return (this.name);
+        },
+        paletteLabel: "Hue Motion (beta)",
+        // 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 
+            // ########################
+            $.getJSON('knxUltimateDpts', (data) => {
+                data.forEach(dpt => {
+                    if (dpt.value.startsWith("1.")) {
+                        $("#node-input-dptmotion").append($("<option></option>")
+                            .attr("value", dpt.value)
+                            .text(dpt.text))
+                    }
+                });
+                $("#node-input-dptmotion").val(this.dptmotion)
+            })
+
+            // Autocomplete suggestion with ETS csv File
+            $("#node-input-GAmotion").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-namemotion').val(sDevName);
+                    var optVal = $("#node-input-dptmotion option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
+                    // Select the option value 
+                    $("#node-input-dptmotion").val(optVal);
+                }
+            });
+            // ######################## 
+
+
+
+
+            // Autocomplete suggestion with HUE
+            $("#node-input-name").autocomplete({
+                minLength: 1,
+                source: function (request, response) {
+                    $.getJSON("KNXUltimateGetDevicesHUE?rtype=motion&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="knxUltimateHueMotion">
+
+
+<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/hueMotion.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>
+<b>PHILIPS HUE MOTION EVENTS -> TO KNX</b>
+</p>
+
+    <div class="form-row">
+        <label for="node-input-namemotion" style="width:100px;"><i class="fa fa-play-circle-o"></i> Motion</span></label>
+
+        <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>
+        <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>
+        <input type="text" id="node-input-namemotion" style="width:200px;margin-left: 5px; text-align: left;">
+    </div>
+   
+</div>
+        
+
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+
+
+</script>
+
+<script type="text/markdown" data-help-name="knxUltimateHueMotion">
+<p> This node lets you get the events from your HUE motion device.<br/>
+
+**PHILIPS HUE MOTION EVENTS -> TO KNX**
+Here you can get the HUE motion 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|
+|--|--|
+| Motion | As soon as someone moves in the motion device's range |
+
+### Outputs
+
+1. Standard output
+: payload (boolean) : the standard output of the command. **true** for motion | **false** for motion end.
+
+### Details
+
+`msg.payload` is used as the payload of the published message.
+
+[Find it useful?](https://www.paypal.me/techtoday)
+
+<br/>
+
+    </script>

package/nodes/knxUltimateHueMotion.js

@@ -0,0 +1,90 @@
+module.exports = function (RED) {
+
+
+  function knxUltimateHueMotion(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.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
+
+
+
+    // 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 = {}
+          knxMsgPayload.ga = 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 })
+            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'
+
+            // Send payload
+            knxMsgPayload.rawEvent = _event
+            node.send(knxMsgPayload)
+          }
+        }
+      } 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()
+    })
+  }
+  RED.nodes.registerType('knxUltimateHueMotion', knxUltimateHueMotion)
+}

package/nodes/knxUltimateHueTapDial.html

@@ -0,0 +1,269 @@
+<script type="text/javascript">
+    RED.nodes.registerType('knxUltimateHueTapDial', {
+        category: "KNX Ultimate",
+        color: '#C7E9C0',
+        defaults: {
+            //buttonState: {value: true},
+            server: { type: "knxUltimate-config", required: false },
+            serverHue: { type: "hue-config", required: true },
+            name: { value: "" },
+
+            namerepeat: { value: "" },
+            GArepeat: { value: "" },
+            dptrepeat: { value: "" },
+
+            hueDevice: { value: "" }
+        },
+        inputs: 0,
+        outputs: 1,
+        icon: "node-hue-icon.svg",
+        label: function () {
+            return (this.name);
+        },
+        paletteLabel: "Hue Tap Dial (beta)",
+        // 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 repeat
+            // ########################
+            $.getJSON('knxUltimateDpts', (data) => {
+                data.forEach(dpt => {
+                    if (dpt.value.startsWith("3.007") || dpt.value.startsWith("5.00")) {
+                        $("#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('5.001') || 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);
+                }
+            });
+
+
+
+
+            // Autocomplete suggestion with HUE
+            $("#node-input-name").autocomplete({
+                minLength: 1,
+                source: function (request, response) {
+                    $.getJSON("KNXUltimateGetDevicesHUE?rtype=relative_rotary&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="knxUltimateHueTapDial">
+
+
+<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/hueTapDial.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 Device</label>
+        <input type="text" id="node-input-name" placeholder="Enter your hue device name" />
+    <input type="hidden" id="node-input-hueDevice" />
+</div>
+
+<br/>
+
+<p>
+<b>PHILIPS HUE BUTTON EVENTS -> TO KNX</b>
+</p>
+
+    <div class="form-row">
+        <label for="node-input-namerepeat" style="width:100px;"><i class="fa fa-play-circle-o"></i> Rotate</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>
+        
+
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+
+
+</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/>
+
+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,
+to the selected group address.
+
+**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 rotary service 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|
+|--|--|
+| Rotate | This command is used either to send DIM (increase/decrease) or true/false commands to the KNX group address. Only as info, in the HUE event chain, this is called *repeat* |
+
+### Outputs
+
+1. Standard output
+: payload (string|object) : the standard output of the command.
+
+### 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.
+
+[Find it useful?](https://www.paypal.me/techtoday)
+
+<br/>
+
+    </script>

package/nodes/knxUltimateHueTapDial.js

@@ -0,0 +1,122 @@
+module.exports = function (RED) {
+
+  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 knxUltimateHueTapDial(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.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.brightnessState = 0
+
+    // 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 = {}
+          knxMsgPayload.ga = config.GArepeat
+          knxMsgPayload.dpt = config.dptrepeat
+          if (_event.relative_rotary.last_event.rotation.direction === 'clock_wise') {
+            if (knxMsgPayload.dpt.startsWith('3.007')) {
+              knxMsgPayload.payload = { decr_incr: 1, data: 5 }
+            } else if (knxMsgPayload.dpt.startsWith('5.001')) {
+              //0 – maximum: 32767
+              node.brightnessState < 100 ? node.brightnessState += 20 : node.brightnessState = 100
+              knxMsgPayload.payload = node.brightnessState
+            }
+          } else if (_event.relative_rotary.last_event.rotation.direction === 'counter_clock_wise') {
+            if (knxMsgPayload.dpt.startsWith('3.007')) {
+              knxMsgPayload.payload = { decr_incr: 0, data: 5 }
+            } else if (knxMsgPayload.dpt.startsWith('5.001')) {
+              node.brightnessState > 0 ? node.brightnessState -= 20 : node.brightnessState = 0
+              knxMsgPayload.payload = node.brightnessState
+            }
+          }
+
+          // 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 })
+          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
+          node.send(knxMsgPayload)
+        }
+      } 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()
+    })
+  }
+  RED.nodes.registerType('knxUltimateHueTapDial', knxUltimateHueTapDial)
+}

package/nodes/utils/hueUtils.js

@@ -39,6 +39,12 @@ class classHUE extends EventEmitter {
         if (_rtype === 'light') {
           retArray.push({ name: linkedDevName + (Room !== undefined ? ', room ' + Room.metadata.name : ''), id: device.id })
         }
+        if (_rtype === 'motion') {
+          retArray.push({ name: linkedDevName + (Room !== undefined ? ', room ' + Room.metadata.name : ''), id: device.id })
+        }
+        if (_rtype === 'relative_rotary') {
+          retArray.push({ name: linkedDevName + (Room !== undefined ? ', room ' + Room.metadata.name : ''), id: device.id })
+        }
       })
       return { devices: retArray }
     } catch (error) {
@@ -101,6 +107,13 @@ class classHUE extends EventEmitter {
   startPushEvents = async () => {
     try {
       this.hue = await hueApiV2.connect({
+        log: {
+          trace: (msg) => { },
+          debug: (msg) => { },
+          info: (msg) => { },
+          warn: (msg) => { },
+          error: (msg) => { }
+        },
         host: this.HUEBridgeIP,
         key: this.username,
         eventListener: this.listener // The eventlistener is given as option

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "version": "2.0.7",
+  "version": "2.0.9",
   "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",
@@ -17,7 +17,7 @@
     "xml2js": "0.5.0",
     "dns-sync": "0.2.1",
     "node-hue-api": "5.0.0-beta.16",
-    "node-hue": "1.0.3",
+    "node-hue": "1.0.4",
     "color-convert": "2.0.1"
   },
   "node-red": {
@@ -34,7 +34,9 @@
       "knxUltimateViewer": "/nodes/knxUltimateViewer.js",
       "hueConfig": "/nodes/hue-config.js",
       "knxUltimateHueLight": "/nodes/knxUltimateHueLight.js",
-      "knxUltimateHueButton": "/nodes/knxUltimateHueButton.js"
+      "knxUltimateHueButton": "/nodes/knxUltimateHueButton.js",
+      "knxUltimateHueMotion": "/nodes/knxUltimateHueMotion.js",
+      "knxUltimateHueTapDial": "/nodes/knxUltimateHueTapDial.js"
     }
   },
   "repository": {

package/nodes/locales/en-US/hue-config.html

@@ -1,11 +0,0 @@
-<script type="text/x-red" data-help-name="hue-config">
-    <h1>KNX Ultimate - HUE config node</h1>
-    
-    <p> 
-        <a href="https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/en-hue-configuration" target="_blank"><i class="fa fa-info-circle"></i>&nbsp Help configuring</a>
-    </p>
-    
-    <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>