node-red-contrib-knx-ultimate 2.1.0 → 2.1.2

package/CHANGELOG.md

@@ -6,6 +6,14 @@
 
 # CHANGELOG
 
+<p>
+<b>Version 2.1.2</b> - June 2023<br/>
+- NEW: Hue Hue Light node, added BLINK option.<br/>
+</p>
+<p>
+<b>Version 2.1.1</b> - June 2023<br/>
+- NEW: Hue Tap Dial node: setting a color datapoint(232.600), the rotary dial will send a random color to the KNX group address.<br/>
+</p>
 <p>
 <b>Version 2.1.0</b> - June 2023<br/>
 - HUE nodes exited the BETA version. You can now start using HUE nodes.<br/>

package/nodes/knxUltimateHueLight.html

@@ -36,6 +36,10 @@
             GALightBrightnessState: { value: "" },
             dptLightBrightnessState: { value: "" },
 
+            nameLightBlink: { value: "" },
+            GALightBlink: { value: "" },
+            dptLightBlink: { value: "" },
+
             hueDevice: { value: "" }
         },
         inputs: 0,
@@ -395,6 +399,52 @@
 
 
 
+            // DPT Blink command
+            // ########################
+            $.getJSON('knxUltimateDpts', (data) => {
+                data.forEach(dpt => {
+                    if (dpt.value.startsWith("1.")) {
+                        $("#node-input-dptLightBlink").append($("<option></option>")
+                            .attr("value", dpt.value)
+                            .text(dpt.text))
+                    }
+                });
+                $("#node-input-dptLightBlink").val(this.dptLightSwitch)
+            })
+
+            // Autocomplete suggestion with ETS csv File
+            $("#node-input-GALightBlink").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-nameLightBlink').val(sDevName);
+                    var optVal = $("#node-input-dptLightBlink option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
+                    // Select the option value 
+                    $("#node-input-dptLightBlink").val(optVal);
+                }
+            });
+            // ########################
+
 
 
             // Autocomplete suggestion with HUE Lights
@@ -567,7 +617,7 @@
     </div>
   </div>
         <div class="form-row">
-        <label for="node-input-nameLightBrightnessState" style="width:100px;"><i class="fa fa-play-circle-o"></i>Brightness Status</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;">
@@ -578,6 +628,21 @@
         <label for="node-input-nameLightBrightnessState" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
         <input type="text" id="node-input-nameLightBrightnessState" style="width:200px;margin-left: 5px; text-align: left;">
     </div>
+    <br/>
+    <br/>
+    </div>
+        <div class="form-row">
+        <label for="node-input-nameLightBlink" style="width:100px;"><i class="fa fa-play-circle-o"></i> Blink</label>
+
+        <label for="node-input-GALightBlink" style="width:20px;"><span data-i18n="knxUltimateHueLight.node-input-GALightState"></span></label>
+        <input type="text" id="node-input-GALightBlink" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
+       
+        <label for="node-input-dptLightBlink" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
+        <select id="node-input-dptLightBlink" style="width:140px;"></select>
+       
+        <label for="node-input-nameLightBlink" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
+        <input type="text" id="node-input-nameLightBlink" style="width:200px;margin-left: 5px; text-align: left;">
+    </div>
 
 <br/>
 <br/>
@@ -611,6 +676,7 @@ Start typing in the GA field, the name or group address of your KNX device, the
 | Color Status | Link this to the light's color status group address. Accepted datapoint is RGB triplet (r,g,b)|
 | Brightness | This command is used to change the absolute HUE light's brightness |
 | Brightness Status| Link this to the light's brightness status group address |
+| Blink| *true* Blink the light, *false* Stop blinking. Blinks the light on and off. Useful for signalling. It is compatible with all HUE lights. |
 
 <br/>
 

package/nodes/knxUltimateHueLight.js

@@ -71,6 +71,23 @@ module.exports = function (RED) {
             state = bright > 0 ? { on: { on: true }, dimming: { brightness: bright }, color: { xy: retXY } } : { on: { on: false } }
             node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state)
             break
+          case config.GALightBlink:
+            const gaVal = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightSwitch))
+            if (gaVal) {
+              node.timerBlink = setInterval(() => {
+                if (node.blinkValue === undefined) node.blinkValue = true
+                node.blinkValue = !node.blinkValue
+                msg.payload = node.blinkValue
+                //state = msg.payload === true ? { on: { on: true } } : { on: { on: false } }
+                state = msg.payload === true ? { on: { on: true }, dimming: { brightness: 100 } } : { on: { on: false } }
+                node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state)
+                node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state)
+              }, 600);
+            } else {
+              if (node.timerBlink !== undefined) clearInterval(node.timerBlink)
+              node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, { on: { on: false } })
+            }
+            break
           default:
             break
         }

package/nodes/knxUltimateHueTapDial.html

@@ -69,7 +69,7 @@
             // ########################
             $.getJSON('knxUltimateDpts', (data) => {
                 data.forEach(dpt => {
-                    if (dpt.value.startsWith("3.007") || dpt.value.startsWith("5.00")) {
+                    if (dpt.value.startsWith("3.007") || dpt.value.startsWith("5.001") || dpt.value.startsWith("232.600")) {
                         $("#node-input-dptrepeat").append($("<option></option>")
                             .attr("value", dpt.value)
                             .text(dpt.text))
@@ -87,7 +87,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('5.001') || value.dpt.startsWith('3.007')) {
+                                if (value.dpt.startsWith('5.001') || value.dpt.startsWith('3.007') || value.dpt.startsWith("232.600")) {
                                     return {
                                         label: value.ga + " # " + value.devicename + " # " + value.dpt, // Label for Display
                                         value: value.ga // Value
@@ -231,8 +231,8 @@
 
 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.
+The rotary service of the Tap Dial, can send a DIM (Datapoint 3.007), absolute brightness (Datapoint 5.001) to the KNX bus,  
+or a random color (Datapoint 232.600) to the selected group address.
 
 **General**
 |Property|Description|
@@ -249,7 +249,7 @@ Start typing in the GA field, the name or group address of your KNX device, the
 
 |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* |
+| Rotate | This command is used either to send DIM (increase/decrease), aboslute brightness, or a random color, depending on the selected datapoint. |
 
 ### Outputs
 

package/nodes/knxUltimateHueTapDial.js

@@ -78,6 +78,17 @@ module.exports = function (RED) {
               //0 – maximum: 32767
               node.brightnessState < 100 ? node.brightnessState += 20 : node.brightnessState = 100
               knxMsgPayload.payload = node.brightnessState
+            } else if (knxMsgPayload.dpt.startsWith('232.600')) {
+              // Random color
+              knxMsgPayload.payload = { red: getRandomIntInclusive(0, 255), green: getRandomIntInclusive(0, 255), blue: getRandomIntInclusive(0, 255) }
+              function getRandomIntInclusive(min, max) {
+                min = Math.ceil(min);
+                max = Math.floor(max);
+                return Math.floor(Math.random() * (max - min + 1) + min); // The maximum is inclusive and the minimum is inclusive
+              }
+              // Send to KNX bus
+              if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) node.server.writeQueueAdd({ grpaddr: knxMsgPayload.topic, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id })
+              if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) node.status({ fill: 'green', shape: 'dot', text: 'HUE->KNX start Dim' + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
             }
           } else if (_event.relative_rotary.last_event.rotation.direction === 'counter_clock_wise') {
             if (knxMsgPayload.dpt.startsWith('3.007')) {
@@ -91,6 +102,17 @@ module.exports = function (RED) {
             } else if (knxMsgPayload.dpt.startsWith('5.001')) {
               node.brightnessState > 0 ? node.brightnessState -= 20 : node.brightnessState = 0
               knxMsgPayload.payload = node.brightnessState
+            } else if (knxMsgPayload.dpt.startsWith('232.600')) {
+              // Random color
+              knxMsgPayload.payload = { red: getRandomIntInclusive(0, 255), green: getRandomIntInclusive(0, 255), blue: getRandomIntInclusive(0, 255) } 
+              function getRandomIntInclusive(min, max) {
+                min = Math.ceil(min);
+                max = Math.floor(max);
+                return Math.floor(Math.random() * (max - min + 1) + min); // The maximum is inclusive and the minimum is inclusive
+              }
+              // Send to KNX bus
+              if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) node.server.writeQueueAdd({ grpaddr: knxMsgPayload.topic, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id })
+              if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) node.status({ fill: 'green', shape: 'dot', text: 'HUE->KNX start Dim' + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
             }
           }
 

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Control your KNX intallation via Node-Red! Single Node KNX IN/OUT with optional ETS group address importer. Easy to use and highly configurable. With integrated Philips HUE devices handling.",
   "dependencies": {
     "mkdirp": "1.0.4",

package/.vscode/launch.json

@@ -1,17 +0,0 @@
-{
-    // Usare IntelliSense per informazioni sui possibili attributi.
-    // Al passaggio del mouse vengono visualizzate le descrizioni degli attributi esistenti.
-    // Per altre informazioni, visitare: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "Avvia programma",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "program": "${workspaceFolder}/nodes/utils/hueUtils.js"
-        }
-    ]
-}