node-red-contrib-knx-ultimate 2.2.4 → 2.2.6

package/nodes/knxUltimateHueLight.js

@@ -35,6 +35,8 @@ module.exports = function (RED) {
     node.DayTime = true;
     node.isGrouped_light = config.hueDevice.split("#")[1] === "grouped_light";
     node.hueDevice = config.hueDevice.split("#")[0];
+    node.readStatusAtStartup = config.readStatusAtStartup;
+    if (config.readStatusAtStartup === undefined) node.readStatusAtStartup = "yes";
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({
@@ -58,7 +60,7 @@ module.exports = function (RED) {
     node.handleSend = (msg) => {
       if (node.currentHUEDevice === undefined) {
         node.setNodeStatusHue({
-          fill: "grey",
+          fill: "red",
           shape: "ring",
           text: "Currently not ready.",
           payload: "",
@@ -419,6 +421,9 @@ module.exports = function (RED) {
             });
             return;
           }
+          // IMPORTANT: exit if no button last_event present.
+          if (_event.initializingAtStart === true && node.readStatusAtStartup === "no") return;
+
           if (_event.hasOwnProperty("on")) {
             node.updateKNXLightState(_event.on.on);
             // In case of switch off, set the dim to zero
@@ -621,13 +626,7 @@ module.exports = function (RED) {
     }
     if (node.serverHue) {
       node.serverHue.removeClient(node);
-      if (node.serverHue !== null && node.serverHue.hueManager !== null) {
-        try {
-          node.serverHue.addClient(node);
-        } catch (err) {
-          RED.log.error(`Errore knxUltimateHueLight node.currentHUEDevice ${err.message}`);
-        }
-      }
+      node.serverHue.addClient(node);
     }
 
     node.on("input", (msg) => { });

package/nodes/knxUltimateHueLightSensor.html

@@ -11,6 +11,7 @@
             namelightsensor: { value: "" },
             GAlightsensor: { value: "" },
             dptlightsensor: { value: "" },
+            readStatusAtStartup: { value: "no" },
 
             hueDevice: { value: "" }
         },
@@ -211,7 +212,13 @@
         <input type="text" id="node-input-namelightsensor" style="width:200px;margin-left: 5px; text-align: left;">
     </div>
    
-
+    <div class="form-row">
+        <label style="width:180px" for="node-input-readStatusAtStartup"><i class="fa fa-play-circle"></i> Read status at startup</label>
+        <select id="node-input-readStatusAtStartup">       
+        <option value="no">No</option>
+        <option value="yes">Yes, and emit KNX telegrams.</option>
+</select>
+    </div>
         
 
 <br/>
@@ -234,6 +241,7 @@ Start typing in the GA field, the name or group address of your KNX device, the
 | KNX GW | Select the KNX gateway to be used |
 | 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.|
+| Read status at startup | Read the status at startup and emit the event to the KNX bus at startup/reconnection. (Default "no")|
 
 |Property|Description|
 |--|--|

package/nodes/knxUltimateHueLightSensor.js

@@ -22,6 +22,7 @@ module.exports = function (RED) {
     node.formatmultiplyvalue = 1;
     node.formatnegativevalue = 'leave';
     node.formatdecimalsvalue = 2;
+    node.hueDevice = config.hueDevice;
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload }) => {
@@ -42,6 +43,11 @@ module.exports = function (RED) {
     node.handleSendHUE = _event => {
       try {
         if (_event.id === config.hueDevice) {
+
+          // IMPORTANT: exit if no event presen.
+          if (_event.initializingAtStart === true && (config.readStatusAtStartup === undefined || config.readStatusAtStartup === "no")) return;
+          if (!_event.hasOwnProperty('light') || _event.light.light_level === undefined) return;
+
           const knxMsgPayload = {};
           knxMsgPayload.topic = config.GAlightsensor;
           knxMsgPayload.dpt = config.dptlightsensor;
@@ -76,11 +82,7 @@ module.exports = function (RED) {
     }
     if (node.serverHue) {
       node.serverHue.removeClient(node);
-      // I must get the object, to store read the status
-      // I queue the state request, by passing the callback to call whenever the HUE bridge send me the light status async
-      if (node.serverHue !== null && node.serverHue.hueManager !== null) {
-        node.serverHue.addClient(node);
-      }
+      node.serverHue.addClient(node);
     }
 
     node.on('input', function (msg) {

package/nodes/knxUltimateHueMotion.html

@@ -11,6 +11,7 @@
             namemotion: { value: "" },
             GAmotion: { value: "" },
             dptmotion: { value: "" },
+            readStatusAtStartup: { value: "no" },
 
             hueDevice: { value: "" }
         },
@@ -211,6 +212,14 @@
         <input type="text" id="node-input-namemotion" style="width:200px;margin-left: 5px; text-align: left;">
     </div>
    
+    <div class="form-row">
+        <label style="width:180px" for="node-input-readStatusAtStartup"><i class="fa fa-play-circle"></i> Read status at startup</label>
+        <select id="node-input-readStatusAtStartup">       
+        <option value="no">No</option>
+        <option value="yes">Yes, and emit KNX telegrams.</option>
+</select>
+    </div>
+
 <br/>
 <br/>
 <br/>
@@ -235,7 +244,8 @@ Start typing in the GA field, the name or group address of your KNX device, the
 |Property|Description|
 |--|--|
 | Motion | As soon as someone moves in the motion device's range, a *true* KNX value is sent to this group address, otherwise *false* is sent. |
-
+| Read status at startup | Read the status at startup and emit the event to the KNX bus at startup/reconnection. (Default "no")|
+    
 ### Outputs
 
 1. Standard output

package/nodes/knxUltimateHueMotion.js

@@ -22,6 +22,7 @@ module.exports = function (RED) {
     node.formatmultiplyvalue = 1;
     node.formatnegativevalue = "leave";
     node.formatdecimalsvalue = 2;
+    node.hueDevice = config.hueDevice;
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload }) => { };
@@ -39,6 +40,12 @@ module.exports = function (RED) {
     node.handleSendHUE = (_event) => {
       try {
         if (_event.id === config.hueDevice) {
+
+          // IMPORTANT: exit if no event presen.
+          if (_event.initializingAtStart === true && (config.readStatusAtStartup === undefined || config.readStatusAtStartup === "no")) return;
+          if (!_event.hasOwnProperty("motion") || _event.motion.motion === undefined) return;
+
+
           const knxMsgPayload = {};
           knxMsgPayload.topic = config.GAmotion;
           knxMsgPayload.dpt = config.dptmotion;

package/nodes/knxUltimateHueScene.html

@@ -12,6 +12,7 @@
             GAscene: { value: "" },
             dptscene: { value: "" },
             valscene: { value: 0 }, // the scene number or true/false
+            readStatusAtStartup: { value: "no" },
 
             hueDevice: { value: "" },
             hueSceneRecallType: { value: "active" }
@@ -251,6 +252,14 @@
     <select id="node-input-valscene" style="width:180px;margin-left: 5px; text-align: left;"></select>
 </div>
 
+<div class="form-row">
+    <label style="width:180px" for="node-input-readStatusAtStartup"><i class="fa fa-play-circle"></i> Read status at startup</label>
+    <select id="node-input-readStatusAtStartup">       
+    <option value="no">No</option>
+    <option value="yes">Yes, and emit KNX telegrams.</option>
+</select>
+</div>
+
 <br/>
 <br/>
 <br/>
@@ -276,6 +285,7 @@ Start typing in the GA field, the name or group address of your KNX device, the
 |--|--|
 | 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. |
+| Read status at startup | Read the status at startup and emit the event to the KNX bus at startup/reconnection. (Default "no")|
 
 <br/>
 

package/nodes/knxUltimateHueScene.js

@@ -24,6 +24,7 @@ module.exports = function (RED) {
     node.formatmultiplyvalue = 1;
     node.formatnegativevalue = 'leave';
     node.formatdecimalsvalue = 2;
+    node.hueDevice = config.hueDevice;
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload }) => {
@@ -77,6 +78,10 @@ module.exports = function (RED) {
     node.handleSendHUE = _event => {
       try {
         if (_event.id === config.hueDevice) {
+
+          // IMPORTANT: exit if no event presen.
+          if (_event.initializingAtStart === true && (config.readStatusAtStartup === undefined || config.readStatusAtStartup === "no")) return;
+
           // const knxMsgPayload = {}
           // knxMsgPayload.topic = config.GAmotion
           // knxMsgPayload.dpt = config.dptmotion

package/nodes/knxUltimateHueTapDial.html

@@ -11,6 +11,7 @@
             namerepeat: { value: "" },
             GArepeat: { value: "" },
             dptrepeat: { value: "" },
+            readStatusAtStartup: { value: "no" },
 
             hueDevice: { value: "" }
         },
@@ -214,7 +215,13 @@
     </div>
     
     
-
+    <div class="form-row">
+        <label style="width:180px" for="node-input-readStatusAtStartup"><i class="fa fa-play-circle"></i> Read status at startup</label>
+        <select id="node-input-readStatusAtStartup">       
+        <option value="no">No</option>
+        <option value="yes">Yes, and emit KNX telegrams.</option>
+</select>
+    </div>
         
 
 <br/>
@@ -245,6 +252,7 @@ or a random color (Datapoint 232.600) to the selected group address.
 |Property|Description|
 |--|--|
 | Rotate | This command is used either to send DIM (increase/decrease), aboslute brightness, or a random color, depending on the selected datapoint. If the random color (datapoint 232.600) is selected, **clockwise rotation** changes random colors and **counterclockwise rotation** set the light to **white** |
+| Read status at startup | Read the status at startup and emit the event to the KNX bus at startup/reconnection. (Default "no")|
 
 ### Outputs
 

package/nodes/knxUltimateHueTapDial.js

@@ -25,6 +25,7 @@ module.exports = function (RED) {
     node.formatdecimalsvalue = 2;
     node.brightnessState = 0;
     node.isTimerDimStopRunning = false;
+    node.hueDevice = config.hueDevice;
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({
@@ -48,6 +49,17 @@ module.exports = function (RED) {
     node.handleSendHUE = (_event) => {
       try {
         if (_event.id === config.hueDevice) {
+
+          // IMPORTANT: exit if no event presen.
+          if (_event.initializingAtStart === true && (config.readStatusAtStartup === undefined || config.readStatusAtStartup === "no")) return;
+          if (!_event.hasOwnProperty("relative_rotary")
+            || !_event.relative_rotary.hasOwnProperty("last_event")
+            || _event.relative_rotary.last_event === undefined
+            || !_event.relative_rotary.last_event.hasOwnProperty("rotation")
+            || !_event.relative_rotary.last_event.rotation.direction === undefined
+            || _event.relative_rotary.last_event.action === undefined) return;
+
+
           const knxMsgPayload = {};
           knxMsgPayload.topic = config.GArepeat;
           knxMsgPayload.dpt = config.dptrepeat;

package/nodes/knxUltimateHueTemperatureSensor.js

@@ -22,6 +22,7 @@ module.exports = function (RED) {
     node.formatmultiplyvalue = 1;
     node.formatnegativevalue = 'leave';
     node.formatdecimalsvalue = 2;
+    node.hueDevice = config.hueDevice;
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({
@@ -84,9 +85,7 @@ module.exports = function (RED) {
     }
     if (node.serverHue) {
       node.serverHue.removeClient(node);
-      if (node.serverHue !== null && node.serverHue.hueManager !== null) {
-        node.serverHue.addClient(node);
-      }
+      node.serverHue.addClient(node);
     }
 
     node.on('input', (msg) => {

package/nodes/knxUltimateLoadControl.js

@@ -334,7 +334,7 @@ module.exports = function (RED) {
         node.send({ topic: node.name || node.topic, operation: 'Enabled', payload: node.sheddingStage })
       }
 
-      // 24/04/2021 if payload is read or the output type is set to "read", do a read
+      // 24/04/2021 if payload is read or the Telegram type is set to "read", do a read
       if ((msg.hasOwnProperty('readstatus') && msg.readstatus === true)) {
         node.initialReadAllDevicesInRules()
       }

package/nodes/locales/en-US/knxUltimate.json

@@ -8,21 +8,21 @@
             "node-input-topic": "Group Addr.",
             "node-input-outputtopic": "Topic",
             "node-input-dpt": "Datapoint",
-            "node-input-initialread": "Read status upon connection",
+            "node-input-initialread": "Read status on start",
             "node-input-initialread0": "No",
-            "node-input-initialread1": "Read from KNX BUS (to receive the response from BUS, enable also -React to event GroupValue response-)",
+            "node-input-initialread1": "Read from KNX BUS (to receive the response from BUS, enable also -React to response telegrams-)",
             "node-input-initialread2": "Read the last value saved to file prior to disconnection",
-            "node-input-initialread3": "Read the last value saved to file prior to disconnection. If the file is missing, read from KNX BUS (to receive the response from BUS, enable also -React to event GroupValue response-)",
-            "node-input-notifyreadrequest": "React to event GroupValue read",
-            "node-input-notifyresponse": "React to event GroupValue response",
-            "node-input-notifywrite": "React to event GroupValue write",
+            "node-input-initialread3": "Read the last value saved to file prior to disconnection. If the file is missing, read from KNX BUS (to receive the response from BUS, enable also -React to response telegrams-)",
+            "node-input-notifyreadrequest": "React to read telegrams",
+            "node-input-notifyresponse": "React to response telegrams",
+            "node-input-notifywrite": "React to write telegrams",
             "node-input-notifyreadrequestalsorespondtobus": "Auto send node value as response to the BUS",
             "node-input-notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized": "If value is undefined, send",
             "node-input-listenallga": "Universal mode (listen to all Group Addresses)",
             "node-input-name": "Node Name",
-            "node-input-outputtype": "Output Type",
-            "node-input-outputRBE": "Send payload to BUS only if changed (RBE filter)",
-            "node-input-inputRBE": "React only if payload from BUS is changed (RBE filter)",
+            "node-input-outputtype": "Telegram type",
+            "node-input-outputRBE": "Send payload to KNX only if changed (RBE filter)",
+            "node-input-inputRBE": "React only by changed payload (RBE filter)",
             "node-input-formatmultiplyvalue": "Multiply",
             "node-input-formatnegativevalue": "Negatives",
             "node-input-formatdecimalsvalue": "Decimals",
@@ -36,8 +36,8 @@
             "Advancedoptions": "Advanced options",
             "Formatting": "Format INPUT (datagram coming from the KNX BUS)",
             "Operations": "NUMERIC VALUES (operations are performed in order)",
-            "OUTPUT": "OUTPUT (sends datagram to the KNX BUS)",
-            "INPUT": "INPUT (listen to datagram from the KNX BUS)",
+            "OUTPUT": "CONTROL (payload to KNX bus)",
+            "INPUT": "STATUS (payload from KNX BUS)",
             "NUMERICVALUES": "NUMERIC VALUES (operations are performed in order)",
             "noETSWarning": "You haven't imported the ETS csv file. <br/> The node will work as blind transmitter/receiver. <a href=\"https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/2.-Node-Configuration\" target='_blank'>Click here for help about that</a>.",
             "notify-DPT3007": "You selected a relative DIM. Please <a target='_blank' href='https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/-Sample---Dimming'>click here to view this sample</a> and learn how to handle such payload.",

package/nodes/locales/en-US/knxUltimateSceneController.html

@@ -11,7 +11,7 @@
         <table style="font-size:12px">
             <tr>
                 <td><img src="https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/greendot.png"></img></td>
-                <td>React to event GroupValue write</td>
+                <td>React to write telegrams</td>
             </tr>
             <tr>
                 <td><img src="https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/greenring.png"></img></td>
@@ -19,7 +19,7 @@
             </tr>
             <tr>
                 <td><img src="https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/bluedot.png"></img></td>
-                <td>React to event GroupValue response.</td>
+                <td>React to response telegrams.</td>
             </tr>
             <tr>
                 <td><img src="https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/bluering.png"></img></td>
@@ -27,7 +27,7 @@
             </tr>
             <tr>
                 <td><img src="https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/greudot.png"></img></td>
-                <td>React to event GroupValue read.</td>
+                <td>React to read telegrams.</td>
             </tr>
             <tr>
                 <td><img src="https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/greyring.png"></img></td>

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "version": "2.2.4",
+  "version": "2.2.6",
   "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 control.",
   "dependencies": {
     "binary-parser": "2.2.1",