node-red-contrib-knx-ultimate 1.4.14 → 1.4.16

package/CHANGELOG.md

@@ -6,6 +6,15 @@
 
 # CHANGELOG
 
+<p>
+<b>Version 1.4.16</b> - Mai 2023<br/>
+- FIX: fixed an issue when you have more than one Global Cariable node.<br/>
+</p>
+<p>
+<b>Version 1.4.15</b> - March 2023<br/>
+- FIX: fidex an issue with unicode chars in the ESF imported file.<br/>
+- NEW: Added Datapoint 235.001 Tariff. Please see the sample in the node window, appearing after you select the datapoint.<br/>
+</p>
 <p>
 <b>Version 1.4.14</b> - March 2023<br/>
 - NEW: Added Datapoint 29.xxx. Please see the sample in the node window, appearing after you select the datapoint.<br/>

package/KNXEngine/dptlib/dpt235.js

@@ -0,0 +1,140 @@
+/**
+* KNXEngine - a KNX protocol stack in Javascript
+* (C) 2020 Supergiovane
+*/
+
+const knxLog = require('./../KnxLog')
+
+//
+// DPT235: DPT_Tariff_ActiveEnergy
+//
+
+const util = require('util')
+
+function hex2bin(hex) {
+  return (parseInt(hex, 16).toString(2)).padStart(8, '0')
+}
+
+function ldexp(mantissa, exponent) {
+  return exponent > 1023 // avoid multiplying by infinity
+    ? mantissa * Math.pow(2, 1023) * Math.pow(2, exponent - 1023)
+    : exponent < -1074 // avoid multiplying by zero
+      ? mantissa * Math.pow(2, -1074) * Math.pow(2, exponent + 1074)
+      : mantissa * Math.pow(2, exponent)
+}
+
+function frexp(value) {
+  try {
+    if (value === 0) return [value, 0]
+    const data = new DataView(new ArrayBuffer(8))
+    data.setFloat64(0, value)
+    let bits = (data.getUint32(0) >>> 20) & 0x7FF
+    if (bits === 0) {
+      data.setFloat64(0, value * Math.pow(2, 64))
+      bits = ((data.getUint32(0) >>> 20) & 0x7FF) - 64
+    }
+    const exponent = bits - 1022; const mantissa = ldexp(value, -exponent)
+    return [mantissa, exponent]
+  } catch (error) {
+
+  }
+}
+
+function GetHex(_value) {
+  try {
+    const arr = frexp(_value)
+    const mantissa = arr[0]; const exponent = arr[1]
+    // find the minimum exponent that will upsize the normalized mantissa (0,5 to 1 range)
+    // in order to fit in 11 bits ([-2048, 2047])
+    let max_mantissa = 0
+    for (e = exponent; e >= -15; e--) {
+      max_mantissa = ldexp(100 * mantissa, e)
+      if (max_mantissa > -2048 && max_mantissa < 2047) break
+    }
+    const sign = (mantissa < 0) ? 1 : 0
+    const mant = (mantissa < 0) ? ~(max_mantissa ^ 2047) : max_mantissa
+    const exp = exponent - e
+    return [((sign << 7) + (exp << 3) + (mant >> 8)), (mant % 256)]
+  } catch (error) {
+
+  }
+}
+
+
+// 08/09/2020 Supergiovane
+// Send to BUS
+exports.formatAPDU = function (value) {
+  try {
+    const apdu_data = Buffer.alloc(6) // 3 x 2 bytes
+
+    if (typeof value === 'object' &&
+      value.hasOwnProperty('activeElectricalEnergy') &&
+      value.hasOwnProperty('tariff') &&
+      value.hasOwnProperty('validityTariff') &&
+      value.hasOwnProperty('validityEnergy')) {
+
+      // activeElectricalEnergy
+      let nbuff = Buffer.alloc(4)
+      nbuff.writeInt32BE(value.activeElectricalEnergy)
+      apdu_data[0] = nbuff[0]
+      apdu_data[1] = nbuff[1]
+      apdu_data[2] = nbuff[2]
+      apdu_data[3] = nbuff[3]
+
+      // tariff
+      const tariff = parseInt(value.tariff)
+      apdu_data[4] = tariff
+
+      // Validity
+      const validity = parseInt('000000' + (value.validityTariff ? "1" : "0") + (value.validityEnergy ? "1" : "0"), 2)
+      apdu_data[5] = validity
+      return apdu_data
+    } else {
+      knxLog.get().error('DPT235: Must supply a payload like, for example: {activeElectricalEnergy:1540, tariff:20, validityTariff:true, validityEnergy:true}')
+    }
+  } catch (error) {
+    knxLog.get().error('DPT235: exports.formatAPDU error ' + error.message)
+  }
+
+}
+
+// RX from BUS
+exports.fromBuffer = function (buf) {
+  try {
+    // Preparo per l'avvento di Gozer il gozeriano.
+    const activeElectricalEnergy = buf.slice(0, 4).readInt32BE() // First 4x8 bits signed integer
+    const tariff = parseInt(buf.slice(4, 5)[0]) // next 8 bit unsigned value
+    const validity = hex2bin(buf.slice(5, 6)[0].toString(16)) // Next 8 bit, only the latest 2 bits are used.
+    const validityTariff = validity.substring(6, 7) === '1'
+    const validityEnergy = validity.substring(7, 8) === '1'
+    return { activeElectricalEnergy: activeElectricalEnergy, tariff: tariff, validityTariff: validityTariff, validityEnergy: validityEnergy }
+  } catch (error) {
+    knxLog.get().error('DPT235: exports.fromBuffer error ' + error.message)
+  }
+}
+
+// DPT basetype info
+exports.basetype = {
+  bitlength: 48,
+  valuetype: 'basic',
+  desc: '6 octect Tariff_ActiveEnergy',
+  help:
+    `// Set the ActiveElectricalEnergy, Tariff and Validity of Tariff and Validity of Energy
+msg.payload = {
+  activeElectricalEnergy:1540, 
+  tariff:20,
+  validityTariff:true,
+  validityEnergy:true 
+  };
+return msg;`,
+  helplink: ''
+}
+
+// DPT subtypes
+exports.subtypes = {
+  "001": {
+    desc: 'DPT_Tariff_ActiveEnergy',
+    name: 'Tariff of active Energy (Energy+Tariff+Validity)',
+    unit: 'Tariff'
+  }
+}

package/nodes/knxUltimate-config.js

@@ -1524,7 +1524,7 @@ return msg;`,
           let element = fileGA[index]
           element = element.replace(/\"/g, '') // Rimuovo evetuali virgolette
           element = element.replace(/\#/g, '') // Rimuovo evetuali #
-          element = element.replace(/[^\x00-\x7F]/g, '') // Remove non ascii chars
+          //element = element.replace(/[^\x00-\x7F]/g, '') // Remove non ascii chars
 
           if (element !== '') {
             sFirstGroupName = element.split('\t')[0].split('.')[0] || ''

package/nodes/knxUltimateGlobalContext.js

@@ -78,7 +78,7 @@ module.exports = function (RED) {
 
     // exposeAsVariableREADWRITE
     // #region "WRITE TO BUS"
-    goTimerGo = () => {
+    node.goTimerGo = function () {
       if (node.timerExposedGAs !== null) clearTimeout(node.timerExposedGAs) // 21/03/2021
       node.timerExposedGAs = setTimeout(() => {
         let oContext = node.context().global.get(node.name + '_WRITE') || []
@@ -89,14 +89,14 @@ module.exports = function (RED) {
             node.setNodeStatus({ fill: 'RED', shape: 'dot', text: 'NO Group Address set', payload: '', GA: '', dpt: '', devicename: '' })
             RED.log.error('knxUltimateGlobalContext: No group address set in node ' + node.id)
             oContext = null // 21/03/2022
-            goTimerGo()
+            node.goTimerGo()
             return
           }
           if (!element.hasOwnProperty('payload')) {
             node.setNodeStatus({ fill: 'RED', shape: 'dot', text: 'NO payload set', payload: '', GA: '', dpt: '', devicename: '' })
             RED.log.error('knxUltimateGlobalContext: No payload set for address ' + element.address + ' in node ' + node.id)
             oContext = null // 21/03/2022
-            goTimerGo()
+            node.goTimerGo()
             return
           }
 
@@ -109,7 +109,7 @@ module.exports = function (RED) {
               node.setNodeStatus({ fill: 'RED', shape: 'dot', text: 'Datapoint not found in CSV for ' + element.address, payload: '', GA: '', dpt: '', devicename: '' })
               RED.log.error('knxUltimateGlobalContext: Datapoint not found in CSV for address ' + element.address + ' in node ' + node.id)
               oContext = null // 21/03/2022
-              goTimerGo()
+              node.goTimerGo()
               return
             }
           }
@@ -118,12 +118,12 @@ module.exports = function (RED) {
           node.server.writeQueueAdd({ grpaddr: element.address, payload: element.payload, dpt: element.dpt || '', outputtype: 'write', nodecallerid: node.id })
         }
         oContext = null // 21/03/2022
-        goTimerGo()
+        node.goTimerGo()
       }, node.writeExecutionInterval)
     }
     // 21/02/2021 timer for write to BUS
     if (node.exposeAsVariable === 'exposeAsVariableREADWRITE') {
-      goTimerGo()
+      node.goTimerGo()
       node.setNodeStatus({ fill: 'green', shape: 'dot', text: 'Start Writing', payload: '', GA: '', dpt: '', devicename: '' })
     } else {
       if (node.timerExposedGAs !== null) clearTimeout(node.timerExposedGAs)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-knx-ultimate",
-  "version": "1.4.14",
+  "version": "1.4.16",
   "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.",
   "dependencies": {
     "mkdirp": "1.0.4",
@@ -11,7 +11,7 @@
     "lodash": "4.17.21",
     "path": "0.12.7",
     "crypto-js": "4.1.1",
-    "xml2js": "0.4.23",
+    "xml2js": "0.5.0",
     "dns-sync":"0.2.1"
   },
   "node-red": {