node-red-contrib-knx-ultimate 2.0.14 → 2.0.15

package/CHANGELOG.md

@@ -6,9 +6,15 @@
 
 # CHANGELOG
 
+<p>
+<b>Version 2.0.15</b> - June 2023<br/>
+- HUE: CAUTION POSSIBLE BREAKING CHANGES TO THE HUE NODES. PLEASE BE AWARE THAT HUE NODES ARE STILL IN BETA<br/>
+- NEW: Temperature sensor.<br/>
+- Changes to HUE Light node, to mime the ISE KNX CONNECT HUE beavior.<br/>
+</p>
 <p>
 <b>Version 2.0.13</b> - June 2023<br/>
-- HUE: CAUTION BREAKING CHANGES TO THE HUE NODES. PLEASE BE AWARE THAT HUE NODES ARE STILL IN BETA<br/>
+- HUE: CAUTION POSSIBLE BREAKING CHANGES TO THE HUE NODES. PLEASE BE AWARE THAT HUE NODES ARE STILL IN BETA<br/>
 - Hue Button node: fixed missing events in output msg.<br/>
 </p>
 <p>

package/nodes/hue-config.js

@@ -91,22 +91,22 @@ module.exports = (RED) => {
     })
 
 
-    RED.httpAdmin.get('/KNXUltimateGetDevicesHUE', RED.auth.needsPermission('hue-config.read'), function (req, res) {
+    RED.httpAdmin.get('/KNXUltimateGetResourcesHUE', RED.auth.needsPermission('hue-config.read'), function (req, res) {
       try {
         (async () => {
           try {
             // °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°
             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)
+            const jRet = await node.hueManager.getResources(req.query.rtype, _node.host, _node.credentials.username)
             res.json(jRet)
             // °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°
           } catch (err) {
-            RED.log.error('Errore KNXUltimateGetDevicesHUE non gestito ' + err.message)
+            RED.log.error('Errore KNXUltimateGetResourcesHUE non gestito ' + err.message)
             res.json({ error: err.message })
           }
         })()
       } catch (err) {
-        RED.log.error('Errore KNXUltimateGetDevicesHUE bsonto ' + err.message)
+        RED.log.error('Errore KNXUltimateGetResourcesHUE bsonto ' + err.message)
         res.json({ error: err.message })
       }
     })

package/nodes/knxUltimateHueButton.html

@@ -265,7 +265,7 @@
             $("#node-input-name").autocomplete({
                 minLength: 1,
                 source: function (request, response) {
-                    $.getJSON("KNXUltimateGetDevicesHUE?rtype=button&nodeID=" + oNodeServerHue.id, (data) => {
+                    $.getJSON("KNXUltimateGetResourcesHUE?rtype=button&nodeID=" + oNodeServerHue.id, (data) => {
                         response($.map(data.devices, function (value, key) {
                             //alert(JSON.stringify(value) + " "+ key)
                             var sSearch = (value.name);

package/nodes/knxUltimateHueLight.html

@@ -401,7 +401,7 @@
             $("#node-input-name").autocomplete({
                 minLength: 1,
                 source: function (request, response) {
-                    $.getJSON("KNXUltimateGetDevicesHUE?rtype=light&nodeID=" + oNodeServerHue.id, (data) => {
+                    $.getJSON("KNXUltimateGetResourcesHUE?rtype=light&nodeID=" + oNodeServerHue.id, (data) => {
                         response($.map(data.devices, function (value, key) {
                             //alert(JSON.stringify(value) + " "+ key)
                             var sSearch = (value.name);
@@ -480,7 +480,7 @@
 <!-- <p> <img src='https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/knx.png' width='32px'> -> <img src='https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/hue.png' width='32px'></p> -->
 
 <p>
-<b>KNX COMMANDS -> TO PHILIPS HUE</b>
+<b>KNX LINK</b>
 </p>
     <div class="form-row">
         <label for="node-input-nameLightSwitch" style="width:100px;"><i class="fa fa-play-circle-o"></i> <span data-i18n="knxUltimateHueLight.node-input-nameLightSwitch"></span></label>
@@ -494,6 +494,19 @@
         <label for="node-input-nameLightSwitch" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
         <input type="text" id="node-input-nameLightSwitch" style="width:200px;margin-left: 5px; text-align: left;">
     </div>
+    <div class="form-row">
+        <label for="node-input-nameLightState" style="width:100px;"><i class="fa fa-play-circle-o"></i> Switch Status</label>
+
+        <label for="node-input-GALightState" style="width:20px;">GA</label>
+        <input type="text" id="node-input-GALightState" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
+       
+        <label for="node-input-dptLightState" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
+        <select id="node-input-dptLightState" style="width:140px;"></select>
+       
+        <label for="node-input-nameLightState" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
+        <input type="text" id="node-input-nameLightState" style="width:200px;margin-left: 5px; text-align: left;">
+    </div>
+   <br/>
     </div>
         <div class="form-row">
         <label for="node-input-nameLightDIM" style="width:100px;"><i class="fa fa-play-circle-o"></i>&nbspDimming</label>
@@ -507,6 +520,7 @@
         <label for="node-input-nameLightDIM" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
         <input type="text" id="node-input-nameLightDIM" style="width:200px;margin-left: 5px; text-align: left;">
     </div>
+<br/>
     </div>
         <div class="form-row">
         <label for="node-input-nameLightColor" style="width:100px;"><i class="fa fa-play-circle-o"></i>&nbspColor</label>
@@ -520,6 +534,19 @@
         <label for="node-input-nameLightColor" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
         <input type="text" id="node-input-nameLightColor" style="width:200px;margin-left: 5px; text-align: left;">
     </div>
+        <div class="form-row">
+        <label for="node-input-nameLightColorState" style="width:100px;"><i class="fa fa-play-circle-o"></i> Color Status</label>
+
+        <label for="node-input-GALightColorState" style="width:20px;"><span data-i18n="knxUltimateHueLight.node-input-GALightState"></span></label>
+        <input type="text" id="node-input-GALightColorState" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
+       
+        <label for="node-input-dptLightColorState" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
+        <select id="node-input-dptLightColorState" style="width:140px;"></select>
+       
+        <label for="node-input-nameLightColorState" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
+        <input type="text" id="node-input-nameLightColorState" style="width:200px;margin-left: 5px; text-align: left;">
+    </div>
+   <br/>
     </div>
         </div>
         <div class="form-row">
@@ -534,37 +561,7 @@
         <label for="node-input-nameLightBrightness" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
         <input type="text" id="node-input-nameLightBrightness" style="width:200px;margin-left: 5px; text-align: left;">
     </div>
-
-<br/>
-<p>
-<b>PHILIPS HUE LIGHT STATE -> TO KNX</b>
-</p>
-
-    <div class="form-row">
-        <label for="node-input-nameLightState" style="width:100px;"><i class="fa fa-play-circle-o"></i> Switch Status</label>
-
-        <label for="node-input-GALightState" style="width:20px;">GA</label>
-        <input type="text" id="node-input-GALightState" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
-       
-        <label for="node-input-dptLightState" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
-        <select id="node-input-dptLightState" style="width:140px;"></select>
-       
-        <label for="node-input-nameLightState" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
-        <input type="text" id="node-input-nameLightState" style="width:200px;margin-left: 5px; text-align: left;">
-    </div>
-        <div class="form-row">
-        <label for="node-input-nameLightColorState" style="width:100px;"><i class="fa fa-play-circle-o"></i> Color Status</label>
-
-        <label for="node-input-GALightColorState" style="width:20px;"><span data-i18n="knxUltimateHueLight.node-input-GALightState"></span></label>
-        <input type="text" id="node-input-GALightColorState" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
-       
-        <label for="node-input-dptLightColorState" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
-        <select id="node-input-dptLightColorState" style="width:140px;"></select>
-       
-        <label for="node-input-nameLightColorState" style="width:50px; margin-left: 0px; text-align: right;"><span data-i18n="knxUltimateHueLight.node-input-name"></span></label>
-        <input type="text" id="node-input-nameLightColorState" style="width:200px;margin-left: 5px; text-align: left;">
-    </div>
-        </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>
 
@@ -585,7 +582,7 @@
 
 
 <script type="text/markdown" data-help-name="knxUltimateHueLight">
-<p>This node lets you control your Philips HUE light and also get the states of this lights.
+<p>This node lets you control your Philips HUE light and also get the states of this lights, to be sent to the KNX bus.
 
 **General**
 |Property|Description|
@@ -596,28 +593,20 @@
 
 <br/>
 
-**KNX COMMANDS -> TO PHILIPS HUE**
-Here you can choose the KNX addresses to be linked to the avaiable HUE light commands.<br/>
+**KNX LINK**
+
+Here you can choose the KNX addresses to be linked to the avaiable HUE light commands/states.<br/>
 Start typing in the GA field, the name or group address of your KNX device, the avaiable devices start showing up while you're typing.
 
 |Property|Description|
 |--|--|
-| Switch | This command is used to turn on/off the HUE light via a boolean KNX value true/false|
-| Dimming | This command is used to DIM the HUE light via a KNX relative DIM datapoint |
+| Switch | This GA is used to turn on/off the HUE light via a boolean KNX value true/false|
+| Switch Status| Link this to the light's switch status group address|
+| Dimming | Relative DIM the HUE light |
 | Color | This command is used to change the HUE light's color. Accepted datapoint is RGB triplet (r,g,b). The node handles the gamut color correction. As soon as you send a color KNX telegran, the light turns on and sets color and brightness, derived from the brightness human perception. As soon as you send a KNX telegram with r,g,b set to zero, the light turns off |
+| 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 |
-
-<br/>
-
-**PHILIPS HUE LIGHT STATE -> TO KNX**
-Here you can link the state changes of your HUE light, to any KNX group address you want.<br/>
-Start typing in the GA field, the name or group address of your KNX device, the avaiable devices start showing up while you're typing.
-
-|Property|Description|
-|--|--|
-| Switch Status| This state is used to send on/off value to the selected KNX group address |
-| Color Status | This state is used to send changes of the HUE light's color. Accepted datapoint is RGB triplet (r,g,b)|
-| Brightness Status| This state is used to send changes of your absolute HUE light's brightness, to a KNX group address |
+| Brightness Status| Link this to the light's brightness status group address |
 
 <br/>
 

package/nodes/knxUltimateHueLight.js

@@ -103,21 +103,37 @@ module.exports = function (RED) {
             knxMsgPayload.topic = config.GALightState
             knxMsgPayload.dpt = config.dptLightState
             knxMsgPayload.payload = _event.on.on
+            // 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 })
+            // ISE Connect Hue emulation, send brightness
+            knxMsgPayload.topic = config.GALightBrightnessState
+            knxMsgPayload.dpt = config.dptLightBrightnessState
+            _event.on.on === true ? knxMsgPayload.payload = 100 : 0
+            // 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 (_event.hasOwnProperty('color')) {
             knxMsgPayload.topic = config.GALightColorState
             knxMsgPayload.dpt = config.dptLightColorState
             knxMsgPayload.payload = hueColorConverter.ColorConverter.xyBriToRgb(_event.color.xy.x, _event.color.xy.y, node.currentHUEDevice.dimming.brightness)
+            // 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 (_event.hasOwnProperty('dimming')) {
             knxMsgPayload.topic = config.GALightBrightnessState
             knxMsgPayload.dpt = config.dptLightBrightnessState
             knxMsgPayload.payload = _event.dimming.brightness
+            // 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 })
+            // ISE Connect Hue emulation, send true/false to switch state
+            knxMsgPayload.topic = config.GALightState
+            knxMsgPayload.dpt = config.dptLightState
+            _event.dimming.brightness > 0 ? knxMsgPayload.payload = true : false
+            // 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 })
+
           }
-          // 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 })
           node.status({ fill: 'green', shape: 'dot', text: 'HUE->KNX State ' + JSON.stringify(knxMsgPayload.payload) + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
-
         }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'HUE->KNX error ' + error.message + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })

package/nodes/knxUltimateHueLightSensor.html

@@ -117,7 +117,7 @@
             $("#node-input-name").autocomplete({
                 minLength: 1,
                 source: function (request, response) {
-                    $.getJSON("KNXUltimateGetDevicesHUE?rtype=light_level&nodeID=" + oNodeServerHue.id, (data) => {
+                    $.getJSON("KNXUltimateGetResourcesHUE?rtype=light_level&nodeID=" + oNodeServerHue.id, (data) => {
                         response($.map(data.devices, function (value, key) {
                             //alert(JSON.stringify(value) + " "+ key)
                             var sSearch = (value.name);

package/nodes/knxUltimateHueMotion.html

@@ -117,7 +117,7 @@
             $("#node-input-name").autocomplete({
                 minLength: 1,
                 source: function (request, response) {
-                    $.getJSON("KNXUltimateGetDevicesHUE?rtype=motion&nodeID=" + oNodeServerHue.id, (data) => {
+                    $.getJSON("KNXUltimateGetResourcesHUE?rtype=motion&nodeID=" + oNodeServerHue.id, (data) => {
                         response($.map(data.devices, function (value, key) {
                             //alert(JSON.stringify(value) + " "+ key)
                             var sSearch = (value.name);

package/nodes/knxUltimateHueTapDial.html

@@ -119,7 +119,7 @@
             $("#node-input-name").autocomplete({
                 minLength: 1,
                 source: function (request, response) {
-                    $.getJSON("KNXUltimateGetDevicesHUE?rtype=relative_rotary&nodeID=" + oNodeServerHue.id, (data) => {
+                    $.getJSON("KNXUltimateGetResourcesHUE?rtype=relative_rotary&nodeID=" + oNodeServerHue.id, (data) => {
                         response($.map(data.devices, function (value, key) {
                             //alert(JSON.stringify(value) + " "+ key)
                             var sSearch = (value.name);

package/nodes/knxUltimateHueTemperatureSensor.html

@@ -117,7 +117,7 @@
             $("#node-input-name").autocomplete({
                 minLength: 1,
                 source: function (request, response) {
-                    $.getJSON("KNXUltimateGetDevicesHUE?rtype=temperature&nodeID=" + oNodeServerHue.id, (data) => {
+                    $.getJSON("KNXUltimateGetResourcesHUE?rtype=temperature&nodeID=" + oNodeServerHue.id, (data) => {
                         response($.map(data.devices, function (value, key) {
                             //alert(JSON.stringify(value) + " "+ key)
                             var sSearch = (value.name);
@@ -197,7 +197,7 @@
 </p>
 
     <div class="form-row">
-        <label for="node-input-nametemperaturesensor" style="width:100px;"><i class="fa fa-play-circle-o"></i> Lux</span></label>
+        <label for="node-input-nametemperaturesensor" style="width:100px;"><i class="fa fa-play-circle-o"></i> Temp °C</span></label>
 
         <label for="node-input-GAtemperaturesensor" style="width:20px;">GA</label>
         <input type="text" id="node-input-GAtemperaturesensor" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">
@@ -220,9 +220,9 @@
 </script>
 
 <script type="text/markdown" data-help-name="knxUltimateHueTemperatureSensor">
-<p> This node lets you get the events from your HUE motion device.<br/>
+<p> This node lets you get the events from your HUE temperature device.<br/>
 
-Here you can get the HUE Light Sensors light events, that represents a lux value, evetytime the ambient light changes.<br/>
+Here you can get the HUE temperature events, that represents a celsius value, evetytime the ambient temp changes.<br/>
 Start typing in the GA field, the name or group address of your KNX device, the avaiable devices start showing up while you're typing.
 
 **General**
@@ -235,7 +235,7 @@ Start typing in the GA field, the name or group address of your KNX device, the
 **PHILIPS HUE LIGHT EVENTS -> TO KNX**
 |Property|Description|
 |--|--|
-| Lux | Lux value |
+| Temp | temperature value, in Celsius degrees |
 
 ### Outputs
 

package/nodes/knxUltimateHueTemperatureSensor.js

@@ -1,7 +1,7 @@
 module.exports = function (RED) {
 
 
-  function knxUltimateHueLightSensor(config) {
+  function knxUltimateHueTemperatureSensor(config) {
     RED.nodes.createNode(this, config)
     const node = this
     node.server = RED.nodes.getNode(config.server)
@@ -40,18 +40,18 @@ module.exports = function (RED) {
       try {
         if (_event.id === config.hueDevice) {
           const knxMsgPayload = {}
-          knxMsgPayload.topic = config.GAlightsensor
-          knxMsgPayload.dpt = config.dptlightsensor
+          knxMsgPayload.topic = config.GAtemperaturesensor
+          knxMsgPayload.dpt = config.dpttemperaturesensor
 
-          if (_event.hasOwnProperty('light') && _event.light.hasOwnProperty('light_level')) {
-            knxMsgPayload.payload = Math.round(10 ** ((_event.light.light_level - 1) / 10000))
+          if (_event.hasOwnProperty('temperature') && _event.temperature.hasOwnProperty('temperature')) {
+            knxMsgPayload.payload = _event.temperature.temperature
             // 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 })
             node.status({ fill: 'green', shape: 'dot', text: 'HUE->KNX ' + JSON.stringify(knxMsgPayload.payload) + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' })
 
             // Setup the output msg
             knxMsgPayload.name = node.name
-            knxMsgPayload.event = 'light_level'
+            knxMsgPayload.event = 'temperature'
 
             // Send payload
             knxMsgPayload.rawEvent = _event
@@ -84,5 +84,5 @@ module.exports = function (RED) {
       done()
     })
   }
-  RED.nodes.registerType('knxUltimateHueLightSensor', knxUltimateHueLightSensor)
+  RED.nodes.registerType('knxUltimateHueTemperatureSensor', knxUltimateHueTemperatureSensor)
 }

package/nodes/utils/hueUtils.js

@@ -17,7 +17,7 @@ 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, _host, _username) => {
+  getResources = async (_rtype, _host, _username) => {
     try {
       // V2
       const hue = hueApiV2.connect({ host: _host, key: _username })
@@ -51,6 +51,9 @@ class classHUE extends EventEmitter {
         if (_rtype === 'temperature') {
           retArray.push({ name: 'Temp: ' + 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 })
+        }
         
       })
       return { devices: retArray }

package/package.json

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