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

package/CHANGELOG.md

@@ -6,6 +6,11 @@
 
 # CHANGELOG
 
+<p>
+<b>Version 2.0.7</b> - June 2023<br/>
+- HUE Button node: added an output PIN<br/>
+- HUE Button node: added an option to emit a simplified msg
+</p>
 <p>
 <b>Version 2.0.6</b> - June 2023<br/>
 - NEW: HUE Button node. All HUE integrations are in BETA.<br/>

package/nodes/hue-config.js

@@ -115,7 +115,8 @@ module.exports = (RED) => {
         (async () => {
           try {
             // °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°
-            const jRet = await node.hueManager.getDevices(req.query.rtype)
+            const _node = RED.nodes.getNode(req.query.nodeID)// Retrieve node.id of the config node.
+            const jRet = await node.hueManager.getDevices(req.query.rtype, _node.host, _node.credentials.username)
             res.json(jRet)
             // °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°
           } catch (err) {

package/nodes/knxUltimateHueButton.html

@@ -32,11 +32,12 @@
             GAlong_press: { value: "" },
             dptlong_press: { value: "" },
 
+            outputSimpleMode: { value: true },
             toggleValues: { value: true },
             hueDevice: { value: "" }
         },
         inputs: 0,
-        outputs: 0,
+        outputs: 1,
         icon: "node-hue-icon.svg",
         label: function () {
             return (this.name);
@@ -533,7 +534,11 @@
             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>
         
 
@@ -579,7 +584,8 @@ Start typing in the GA field, the name or group address of your KNX device, the
 | 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. |
+| 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 |
 
 
 <br/>

package/nodes/knxUltimateHueButton.js

@@ -25,7 +25,6 @@ module.exports = function (RED) {
     node.serverHue = RED.nodes.getNode(config.serverHue)
     node.topic = node.name
     node.name = config.name === undefined ? 'Hue' : config.name
-    node.outputtopic = node.name
     node.dpt = ''
     node.notifyreadrequest = false
     node.notifyreadrequestalsorespondtobus = 'false'
@@ -49,7 +48,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 {
@@ -122,6 +121,18 @@ module.exports = function (RED) {
             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 })
           }
+          // 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)
+          }
         }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'HUE->KNX error ' + error.message + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })

package/nodes/utils/hueUtils.js

@@ -17,10 +17,10 @@ class classHUE extends EventEmitter {
   }
 
   // Get all devices and join it with relative rooms, by adding the room name to the device name
-  getDevices = async (_rtype) => {
+  getDevices = async (_rtype, _host, _username) => {
     try {
       // V2
-      const hue = hueApiV2.connect({ host: this.HUEBridgeIP, key: this.username })
+      const hue = hueApiV2.connect({ host: _host, key: _username })
       const retArray = []
       const allResources = await hue.getResources()
       const allRooms = await hue.getRooms()

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "version": "2.0.6",
+  "version": "2.0.7",
   "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",