node-red-contrib-knx-ultimate 2.1.53 → 2.1.55

package/CHANGELOG.md

@@ -7,8 +7,12 @@
 # CHANGELOG
 
 <p>
-<b>Version 2.1.53</b> - October 2023<br/>
-- Fixed descriptive error in case the HUE bridge's IP is wrong.<br/>
+<b>Version 2.1.55</b> - October 2023<br/>
+- HUE Scene: removed non existant scene 0.<br/>
+</p>
+<p>
+<b>Version 2.1.54</b> - October 2023<br/>
+- HUE Scene: NEW: you can now use also the Datapoint 18.001, to recall a scene via a KNX scene pushbutton.<br/>
 </p>
 <p>
 <b>Version 2.1.52</b> - October 2023<br/>

package/nodes/knxUltimateHueBattery.html

@@ -195,6 +195,8 @@
 
 <br/>
 
+<p>
+    <b>KNX</b>
 </p>
 
     <div class="form-row">
@@ -210,8 +212,7 @@
         <input type="text" id="node-input-namebatterysensor" style="width:200px;margin-left: 5px; text-align: left;">
     </div>
    
-</div>
-        
+       
 
 <br/>
 <br/>

package/nodes/knxUltimateHueButton.html

@@ -342,6 +342,8 @@
 
 <br/>
 
+<p>
+    <b>KNX</b>
 </p>
 
     <div class="form-row">
@@ -395,7 +397,6 @@
         </label>
     </div>
        
-</div>
         
 
 <br/>

package/nodes/knxUltimateHueLightSensor.html

@@ -194,6 +194,8 @@
 
 <br/>
 
+<p>
+    <b>KNX</b>
 </p>
 
     <div class="form-row">
@@ -209,7 +211,7 @@
         <input type="text" id="node-input-namelightsensor" style="width:200px;margin-left: 5px; text-align: left;">
     </div>
    
-</div>
+
         
 
 <br/>

package/nodes/knxUltimateHueMotion.html

@@ -194,6 +194,8 @@
 
 <br/>
 
+<p>
+    <b>KNX</b>
 </p>
 
     <div class="form-row">
@@ -209,10 +211,7 @@
         <input type="text" id="node-input-namemotion" style="width:200px;margin-left: 5px; text-align: left;">
     </div>
    
-</div>
-        
-
-<br/>
+s<br/>
 <br/>
 <br/>
 

package/nodes/knxUltimateHueScene.html

@@ -11,6 +11,7 @@
             namescene: { value: "" },
             GAscene: { value: "" },
             dptscene: { value: "" },
+            valscene: { value: 0 }, // the scene number or true/false
 
             hueDevice: { value: "" },
             hueSceneRecallType: { value: "active" }
@@ -41,6 +42,14 @@
             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
 
+            for (let index = 1; index < 64; index++) {
+                $("#node-input-valscene").append($("<option></option>")
+                    .attr("value", index)
+                    .text("Scene n. " + index)
+                )
+            }
+            $("#node-input-valscene").val(node.valscene)
+
             // 19/02/2020 Used to get the server sooner als deploy.
             $("#node-input-server").change(function () {
                 try {
@@ -69,13 +78,14 @@
             // ########################
             $.getJSON('knxUltimateDpts', (data) => {
                 data.forEach(dpt => {
-                    if (dpt.value.startsWith("1.")) {
+                    if (dpt.value.startsWith("1.") || dpt.value.startsWith("18.")) {
                         $("#node-input-dptscene").append($("<option></option>")
                             .attr("value", dpt.value)
                             .text(dpt.text))
                     }
                 });
                 $("#node-input-dptscene").val(this.dptscene)
+                ShowHideValScene();
             })
 
             // Autocomplete suggestion with ETS csv File
@@ -86,11 +96,13 @@
                     $.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
-                                }
+                            if (fullSearch(sSearch, request.term)) {
+                                if (value.dpt.startsWith("1.") || value.dpt.startsWith("18.")) {
+                                    return {
+                                        label: value.ga + " # " + value.devicename + " # " + value.dpt, // Label for Display
+                                        value: value.ga // Value
+                                    }
+                                } else { return null; }
                             } else {
                                 return null;
                             }
@@ -111,8 +123,22 @@
             });
             // ######################## 
 
-
-
+            function ShowHideValScene() {
+                if ($("#node-input-dptscene").val() !== null) {
+                    // Adapt the scene value/true
+                    if ($("#node-input-dptscene").val().startsWith("1.")) {
+                        $("#divValScene").hide();
+                        //$("#node-input-valscene").attr("disabled", "disabled");
+                    } else {
+                        $("#divValScene").show()
+                        //$("#node-input-valscene").removeAttr("disabled");
+                    }
+                }
+            }
+            $("#node-input-dptscene").on("change", function () {
+                ShowHideValScene()
+            });
+            ShowHideValScene();
 
             // Autocomplete suggestion with HUE
             $("#node-input-name").autocomplete({
@@ -137,10 +163,7 @@
                     $('#node-input-hueDevice').val(ui.item.hueDevice);
                 }
             });
-
-
-            // ########################
-
+            // ########################            
 
         },
         oneditsave: function () {
@@ -163,7 +186,7 @@
     <br />
     <br />
     <p align="center">
-       <i class="fal fa-star-and-crescent fa-8x"></i>
+       <i class="fa fa-star-and-crescent fa-bounce fa-8x"></i>
     </p>
     <br />
     <label for="node-input-server" >
@@ -188,7 +211,7 @@
     
 <div class="form-row">
     <label for="node-input-hueDevice" >
-        <i class="fa fa-play-circle"></i>&nbspHue Sceme</label>
+        <i class="fa fa-play-circle"></i>&nbspHue Scene</label>
         <input type="text" id="node-input-name" placeholder="Enter your hue device name" />
     <input type="hidden" id="node-input-hueDevice" />
 </div>
@@ -205,23 +228,28 @@
 
 <br/>
 
+<p>
+    <b>KNX</b>
 </p>
 
-    <div class="form-row">
-        <label for="node-input-namescene" style="width:100px;"><i class="fa fa-play-circle-o"></i> Scene</span></label>
+<div class="form-row">
+    <label for="node-input-namescene" style="width:100px;"><i class="fa fa-play-circle-o"></i> Recall</label>
 
-        <label for="node-input-GAscene" style="width:20px;">GA</label>
-        <input type="text" id="node-input-GAscene" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
-    
-        <label for="node-input-dptscene" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
-        <select id="node-input-dptscene" style="width:140px;"></select>
-    
-        <label for="node-input-namescene" style="width:50px; margin-left: 0px; text-align: right;">Name</label>
-        <input type="text" id="node-input-namescene" style="width:200px;margin-left: 5px; text-align: left;">
-    </div>
-   
+    <label for="node-input-GAscene" style="width:20px;">GA</label>
+    <input type="text" id="node-input-GAscene" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
+
+    <label for="node-input-dptscene" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
+    <select id="node-input-dptscene" style="width:140px;"></select>
+
+    <label for="node-input-namescene" style="width:50px; margin-left: 0px; text-align: right;">Name</label>
+    <input type="text" id="node-input-namescene" style="width:200px;margin-left: 5px; text-align: left;">       
+</div>
+
+<div class="form-row" id="divValScene" hidden>
+    <label for="node-input-valscene" style="width:100px;"></label>
+    <label for="node-input-valscene" style="width:20px;">#</label>
+    <select id="node-input-valscene" style="width:180px;margin-left: 5px; text-align: left;"></select>
 </div>
-        
 
 <br/>
 <br/>
@@ -246,7 +274,8 @@ Start typing in the GA field, the name or group address of your KNX device, the
 
 |Property|Description|
 |--|--|
-| Scene | Choose your group address to be used for recalling the HUE scene. Send *true* to that group address to recall the scene, *false* to switch off all lights belonging to the scene. |
+| Recall | Choose your group address to be used for recalling the HUE scene. In case of Datapoint 1.x, send *true* to that group address to recall the scene, *false* to switch off all lights belonging to the scene. |
+| # | Select the KNX scene number. Visible only with datapoint 18.001. |
 
 <br/>
 

package/nodes/knxUltimateHueScene.js

@@ -1,71 +1,78 @@
-const dptlib = require('./../KNXEngine/src/dptlib')
+const dptlib = require('./../KNXEngine/src/dptlib');
 
 module.exports = function (RED) {
   function knxUltimateHueScene(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
+    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 }) => {
 
-    }
+    };
     // Used to call the status update from the HUE config node.
     node.setNodeStatusHue = ({ fill, shape, text, payload }) => {
-      if (payload === undefined) return
-      const dDate = new Date()
-      payload = typeof payload === 'object' ? JSON.stringify(payload) : payload.toString()
-      node.status({ fill, shape, text: text + ' ' + payload + ' (' + dDate.getDate() + ', ' + dDate.toLocaleTimeString() + ')' })
-    }
+      if (payload === undefined) return;
+      const dDate = new Date();
+      payload = typeof payload === 'object' ? JSON.stringify(payload) : payload.toString();
+      node.status({ fill, shape, text: text + ' ' + payload + ' (' + dDate.getDate() + ', ' + dDate.toLocaleTimeString() + ')' });
+    };
 
     // This function is called by the knx-hue config node
     node.handleSend = msg => {
-      let state = {}
+      let state = {};
       try {
         switch (msg.knx.destination) {
           case config.GAscene:
-            msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptscene))
-            if (msg.payload === true) {
-              state = { recall: { action: config.hueSceneRecallType } }
-              node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, 'setScene')
+            msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptscene));
+            if (config.dptscene.startsWith("1.")) {
+              if (msg.payload === true) {
+                state = { recall: { action: config.hueSceneRecallType } };
+                node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, 'setScene');
+              } else {
+                // Turn off all light belonging to the scene
+                (async () => {
+                  try {
+                    node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, { on: { on: false } }, 'stopScene');
+                  } catch (error) {
+                    RED.log.error('KNXUltimateHUEConfig: classHUE: handleQueue: stopScene: ' + error.message);
+                  }
+                })();
+              }
             } else {
-              // Turn off all light belonging to the scene
-              (async () => {
-                try {
-                  node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, { on: { on: false } }, 'stopScene')
-                } catch (error) {
-                  console.log('KNXUltimateHUEConfig: classHUE: handleQueue: stopScene: ' + error.message)
-                }
-              })()
+              if (Number(config.valscene) === msg.payload.scenenumber && msg.payload.save_recall === 0) {
+                state = { recall: { action: config.hueSceneRecallType } };
+                node.serverHue.hueManager.writeHueQueueAdd(config.hueDevice, state, 'setScene');
+              }
             }
-            node.setNodeStatusHue({ fill: 'green', shape: 'dot', text: 'KNX->HUE', payload: msg.payload })
-            break
+            node.setNodeStatusHue({ fill: 'green', shape: 'dot', text: 'KNX->HUE', payload: msg.payload });
+            break;
           default:
-            break
+            break;
         }
       } catch (error) {
-        node.status({ fill: 'red', shape: 'dot', text: 'KNX->HUE error ' + error.message + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
+        node.status({ fill: 'red', shape: 'dot', text: 'KNX->HUE error ' + error.message + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' });
       }
-    }
+    };
 
     node.handleSendHUE = _event => {
       try {
@@ -90,33 +97,33 @@ module.exports = function (RED) {
           // }
         }
       } catch (error) {
-        node.status({ fill: 'red', shape: 'dot', text: 'HUE->KNX error ' + error.message + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
+        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)
+      node.server.removeClient(node);
+      node.server.addClient(node);
     }
     if (node.serverHue) {
-      node.serverHue.removeClient(node)
-      node.serverHue.addClient(node)
+      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)
+        node.server.removeClient(node);
       }
       if (node.serverHue) {
-        node.serverHue.removeClient(node)
+        node.serverHue.removeClient(node);
       }
-      done()
-    })
+      done();
+    });
   }
-  RED.nodes.registerType('knxUltimateHueScene', knxUltimateHueScene)
-}
+  RED.nodes.registerType('knxUltimateHueScene', knxUltimateHueScene);
+};

package/nodes/knxUltimateHueTapDial.html

@@ -196,6 +196,8 @@
 
 <br/>
 
+<p>
+    <b>KNX</b>
 </p>
 
     <div class="form-row">
@@ -212,7 +214,7 @@
     </div>
     
     
-</div>
+
         
 
 <br/>

package/nodes/knxUltimateHueTemperatureSensor.html

@@ -195,7 +195,7 @@
 <br/>
 
 <p>
-<b>PHILIPS HUE LIGHT EVENTS -> TO KNX</b>
+    <b>KNX</b>
 </p>
 
     <div class="form-row">
@@ -211,8 +211,6 @@
         <input type="text" id="node-input-nametemperaturesensor" style="width:200px;margin-left: 5px; text-align: left;">
     </div>
    
-</div>
-        
 
 <br/>
 <br/>
@@ -235,7 +233,7 @@ Start typing in the GA field, the name or group address of your KNX device, the
 | HUE Bridge | Select the HUE Bridge to be used |
 | Hue Sensor | HUE sensor to be used. The avaiable buttons start showing up while you're typing.|
 
-**PHILIPS HUE LIGHT EVENTS -> TO KNX**
+**KNX**
 |Property|Description|
 |--|--|
 | Temp | temperature value, in Celsius degrees |

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "version": "2.1.53",
+  "version": "2.1.55",
   "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": {
     "binary-parser": "2.2.1",