node-red-contrib-knx-ultimate 2.0.21 → 2.1.1

package/CHANGELOG.md

@@ -6,6 +6,14 @@
 
 # CHANGELOG
 
+<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/>
+</p>
 <p>
 <b>Version 2.0.21</b> - June 2023<br/>
 - HUE: CAUTION POSSIBLE BREAKING CHANGES TO THE HUE NODES. PLEASE BE AWARE THAT HUE NODES ARE STILL IN BETA<br/>

package/nodes/knxUltimateHueButton.html

@@ -29,7 +29,7 @@
         label: function () {
             return (this.name);
         },
-        paletteLabel: "Hue Button (beta)",
+        paletteLabel: "Hue Button",
         // button: {
         //     enabled: function() {
         //         // return whether or not the button is enabled, based on the current

package/nodes/knxUltimateHueLight.html

@@ -44,7 +44,7 @@
         label: function () {
             return (this.name);
         },
-        paletteLabel: "Hue Light (beta)",
+        paletteLabel: "Hue Light",
         // button: {
         //     enabled: function() {
         //         // return whether or not the button is enabled, based on the current

package/nodes/knxUltimateHueLightSensor.html

@@ -20,7 +20,7 @@
         label: function () {
             return (this.name);
         },
-        paletteLabel: "Hue Light Sensor (beta)",
+        paletteLabel: "Hue Light Sensor",
         // button: {
         //     enabled: function() {
         //         // return whether or not the button is enabled, based on the current

package/nodes/knxUltimateHueMotion.html

@@ -20,7 +20,7 @@
         label: function () {
             return (this.name);
         },
-        paletteLabel: "Hue Motion (beta)",
+        paletteLabel: "Hue Motion",
         // button: {
         //     enabled: function() {
         //         // return whether or not the button is enabled, based on the current
@@ -163,7 +163,7 @@
     <br />
     <br />
     <p align="center">
-       <i class="fa-solid fa-person-walking fa-8x"></i>
+       <i class="fa-solid fa-person-walking fa-shake fa-8x"></i>
     </p>
     <br />
     <label for="node-input-server" >

package/nodes/knxUltimateHueTapDial.html

@@ -20,7 +20,7 @@
         label: function () {
             return (this.name);
         },
-        paletteLabel: "Hue Tap Dial (beta)",
+        paletteLabel: "Hue Tap Dial",
         // button: {
         //     enabled: function() {
         //         // return whether or not the button is enabled, based on the current
@@ -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/nodes/knxUltimateHueTemperatureSensor.html

@@ -20,7 +20,7 @@
         label: function () {
             return (this.name);
         },
-        paletteLabel: "Hue Temperature Sensor (beta)",
+        paletteLabel: "Hue Temperature Sensor",
         // button: {
         //     enabled: function() {
         //         // return whether or not the button is enabled, based on the current

package/nodes/utils/hueUtils.js

@@ -136,10 +136,10 @@ class classHUE extends EventEmitter {
           retArray.push({ name: 'Light Level: ' + linkedDevName + (Room !== undefined ? ', room ' + Room.metadata.name : ''), id: device.id })
         }
         if (_rtype === 'temperature') {
-          retArray.push({ name: 'Temp: ' + linkedDevName + (Room !== undefined ? ', room ' + Room.metadata.name : ''), id: device.id })
+          retArray.push({ name: 'Temperature: ' + linkedDevName + (Room !== undefined ? ', room ' + Room.metadata.name : ''), id: device.id })
         }
         if (_rtype === 'scene') {
-          retArray.push({ name: 'Temp: ' + linkedDevName + (Room !== undefined ? ', room ' + Room.metadata.name : ''), id: device.id })
+          retArray.push({ name: 'Scene: ' + linkedDevName + (Room !== undefined ? ', room ' + Room.metadata.name : ''), id: device.id })
         }
 
       })

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "version": "2.0.21",
+  "version": "2.1.1",
   "description": "Control your KNX intallation via Node-Red! Single Node KNX IN/OUT with optional ETS group address importer. Easy to use and highly configurable. 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"
-        }
-    ]
-}