iobroker.openknx 0.1.19 → 0.1.22

package/README.md

@@ -305,7 +305,22 @@ Data is sent to Iobroker Sentry server hosted in Germany. If you have allowed io
 - only IPv4 supported
 
 ## Changelog
-### 0.1.19 (2022-02-)
+### 0.1.22 (2022-02-26)
+* bufix: repair reception error
+
+### 0.1.21 (2022-02-25)
+* feature: dont sent ack request in ldata.ind, this is disturbing clients if not filtered out by gateway
+* bugfix: reinit if event received before connection established to avoid deadlock
+* dependency:adapter core must be 2.6.0 or higher
+
+### 0.1.20 (2022-02-19)
+* feature: add more dpts
+* bugfix: corrected some min max values
+* bugfix: some unhandeled dpts could not be received
+* bugfix: fix import
+* bugfix: min max values
+
+### 0.1.19 (2022-02-11)
 * feature: allow usage of same KNX GAs in multiple objects
 * bugfix: less warnings in alias generation
 * bugfix: adapter reset after project import

package/admin/index_m.html

@@ -78,7 +78,7 @@
             if (settings.gwipport === undefined) settings.gwipport = 3671;
             if (settings.minimumDelay === undefined) settings.minimumDelay = 50;
             if (settings.eibadr === undefined) settings.eibadr = "1.1.1";
-            
+
             if (settings.onlyAddNewObjects === undefined) settings.onlyAddNewObjects = false;
             if (settings.localInterface === undefined) settings.localInterface = "";
 
@@ -236,13 +236,11 @@
                                 message = `Extracted ${result.count} states successfully<br/><br/>\n${result.error}`
                             }
                             showMessage(_(message));
-                            sendTo(null, "restart", null);
-                            showToast(null, _("Restarting adapter"), null, 10000);
                         } else {
                             showMessage(_("Extracted %s states successfully", result.count));
-                            sendTo(null, "restart", null);
-                            showToast(null, _("Restarting adapter"), null, 10000);
                         }
+                        sendTo(null, "restart", null);
+                        showToast(null, _("Restarting adapter"), null, 10000);
                         window.isProcessingRequest = false;
                     });
                 });

package/io-package.json

@@ -1,9 +1,9 @@
 {
   "common": {
     "name": "openknx",
-    "version": "0.1.19",
+    "version": "0.1.22",
     "news": {
-      "0.1.19": {
+      "0.1.22": {
         "en": "Bugfixing"
       }
     },

package/lib/knx/src/dptlib/dpt12.js

@@ -1,7 +1,7 @@
 /**
-* knx.js - a KNX protocol stack in pure Javascript
-* (C) 2016-2018 Elias Karakoulakis
-*/
+ * knx.js - a KNX protocol stack in pure Javascript
+ * (C) 2016-2018 Elias Karakoulakis
+ */
 
 //
 // DPT12.*:  4-byte unsigned value
@@ -10,16 +10,42 @@
 
 // DPT12 base type info
 exports.basetype = {
-  bitlength : 32,
+  bitlength: 32,
   signedness: "unsigned",
-  valuetype : "basic",
-  desc : "4-byte unsigned value"
+  valuetype: "basic",
+  desc: "4-byte unsigned value"
 }
 
 // DPT12 subtype info
 exports.subtypes = {
   // 12.001 counter pulses
-  "001" : {
-    "name" : "DPT_Value_4_Ucount", "desc" : "counter pulses"
+  "001": {
+    "name": "DPT_Value_4_Ucount",
+    "desc": "Counter pulses",
+  },
+  "100": {
+    "name": "DPT_LongTimePeriod_Sec",
+    "desc": "Counter timesec (s)",
+    "unit" : "s"
+  },
+  "101": {
+    "name": "DPT_LongTimePeriod_Min",
+    "desc": "Counter timemin (min)",
+    "unit" : "min"
+  },
+  "102": {
+    "name": "DPT_LongTimePeriod_Hrs",
+    "desc": "Counter timehrs (h)",
+    "unit" : "h"
+  },
+  "1200": {
+    "name": "DPT_VolumeLiquid_Litre",
+    "desc": "Volume liquid (l)",
+    "unit" : "l"
+  },
+  "1201": {
+    "name": "DPT_Volume_m3",
+    "desc": "Volume m3",
+    "unit" : "m3"
   }
-}
+}

package/lib/knx/src/dptlib/dpt14.js

@@ -36,130 +36,210 @@ exports.basetype = {
 
 // DPT14 subtypes info
 exports.subtypes = {
-  // TODO
-  '007': {
-    name: 'DPT_Value_AngleDeg°',
-    desc: 'angle, degree',
-    unit: '°',
-  },
-
-  '019': {
-    name: 'DPT_Value_Electric_Current',
-    desc: 'electric current',
-    unit: 'A',
-  },
-
-  '027': {
-    name: 'DPT_Value_Electric_Potential',
-    desc: 'electric potential',
-    unit: 'V',
-  },
-
-  '028': {
-    name: 'DPT_Value_Electric_PotentialDifference',
-    desc: 'electric potential difference',
-    unit: 'V',
-  },
-
-  '031': {
-    name: 'DPT_Value_Energ',
-    desc: 'energy',
-    unit: 'J',
-  },
-
-  '032': {
-    name: 'DPT_Value_Force',
-    desc: 'force',
-    unit: 'N',
-  },
-
-  '033': {
-    name: 'DPT_Value_Frequency',
-    desc: 'frequency',
-    unit: 'Hz',
-  },
-
-  '036': {
-    name: 'DPT_Value_Heat_FlowRate',
-    desc: 'heat flow rate',
-    unit: 'W',
-  },
-
-  '037': {
-    name: 'DPT_Value_Heat_Quantity',
-    desc: 'heat, quantity of',
-    unit: 'J',
-  },
-
-  '038': {
-    name: 'DPT_Value_Impedance',
-    desc: 'impedance',
-    unit: 'Ω',
-  },
-
-  '039': {
-    name: 'DPT_Value_Length',
-    desc: 'length',
-    unit: 'm',
-  },
-
-  '051': {
-    name: 'DPT_Value_Mass',
-    desc: 'mass',
-    unit: 'kg',
-  },
-
-  '056': {
-    name: 'DPT_Value_Power',
-    desc: 'power',
-    unit: 'W',
-  },
-
-  '065': {
-    name: 'DPT_Value_Speed',
-    desc: 'speed',
-    unit: 'm/s',
-  },
-
-  '066': {
-    name: 'DPT_Value_Stress',
-    desc: 'stress',
-    unit: 'Pa',
-  },
-
-  '067': {
-    name: 'DPT_Value_Surface_Tension',
-    desc: 'surface tension',
-    unit: '1/Nm',
-  },
-
-  '068': {
-    name: 'DPT_Value_Common_Temperature',
-    desc: 'temperature, common',
-    unit: '°C',
-  },
-
-  '069': {
-    name: 'DPT_Value_Absolute_Temperature',
-    desc: 'temperature (absolute)',
-    unit: 'K',
-  },
-
-  '070': {
-    name: 'DPT_Value_TemperatureDifference',
-    desc: 'temperature difference',
-    unit: 'K',
-  },
-
-  '078': {
-    name: 'DPT_Value_Weight',
-    desc: 'weight',
-    unit: 'N',
-  },
-
-  '079': {
-    name: 'DPT_Value_Work',
-    desc: 'work',
-    unit: 'J',
-  },
+  "007": {
+    "desc": "DPT_Value_AngleDeg°",
+    "name": "Angle, degree",
+    "unit": "°"
+  },
+  "019": {
+    "desc": "DPT_Value_Electric_Current",
+    "name": "Electric current",
+    "unit": "A"
+  },
+  "027": {
+    "desc": "DPT_Value_Electric_Potential",
+    "name": "Electric potential",
+    "unit": "V"
+  },
+  "028": {
+    "desc": "DPT_Value_Electric_PotentialDifference",
+    "name": "Electric potential difference",
+    "unit": "V"
+  },
+  "031": {
+    "desc": "DPT_Value_Energ",
+    "name": "Energy",
+    "unit": "J"
+  },
+  "032": {
+    "desc": "DPT_Value_Force",
+    "name": "Force",
+    "unit": "N"
+  },
+  "033": {
+    "desc": "DPT_Value_Frequency",
+    "name": "Frequency",
+    "unit": "Hz"
+  },
+  "036": {
+    "desc": "DPT_Value_Heat_FlowRate",
+    "name": "Heat flow rate",
+    "unit": "W"
+  },
+  "037": {
+    "desc": "DPT_Value_Heat_Quantity",
+    "name": "Heat, quantity of",
+    "unit": "J"
+  },
+  "038": {
+    "desc": "DPT_Value_Impedance",
+    "name": "Impedance",
+    "unit": "Ω"
+  },
+  "039": {
+    "desc": "DPT_Value_Length",
+    "name": "Length",
+    "unit": "m"
+  },
+  "051": {
+    "desc": "DPT_Value_Mass",
+    "name": "Mass",
+    "unit": "kg"
+  },
+  "056": {
+    "desc": "DPT_Value_Power",
+    "name": "Power",
+    "unit": "W"
+  },
+  "057": {
+    "desc": "DPT_Value_Power_Factor",
+    "name": "Power factor",
+    "unit": "cos Φ"
+  },
+  "058": {
+    "desc": "DPT_Value_Pressure",
+    "name": "Pressure (Pa)",
+    "unit": "Pa"
+  },
+  "065": {
+    "desc": "DPT_Value_Speed",
+    "name": "Speed",
+    "unit": "m/s"
+  },
+  "066": {
+    "desc": "DPT_Value_Stress",
+    "name": "Stress",
+    "unit": "Pa"
+  },
+  "067": {
+    "desc": "DPT_Value_Surface_Tension",
+    "name": "Surface tension",
+    "unit": "1/Nm"
+  },
+  "068": {
+    "desc": "DPT_Value_Common_Temperature",
+    "name": "Temperature, common",
+    "unit": "°C"
+  },
+  "069": {
+    "desc": "DPT_Value_Absolute_Temperature",
+    "name": "Temperature (absolute)",
+    "unit": "K"
+  },
+  "070": {
+    "desc": "DPT_Value_TemperatureDifference",
+    "name": "Temperature difference",
+    "unit": "K"
+  },
+  "074": {
+    "desc": "DDPT_Value_Time",
+    "name": "Time",
+    "unit": "s"
+  },
+  "076": {
+    "desc": "DPT_Value_Volume",
+    "name": "Volume",
+    "unit": "m3"
+  },
+  "078": {
+    "desc": "DPT_Value_Weight",
+    "name": "Weight",
+    "unit": "N"
+  },
+  "079": {
+    "desc": "DPT_Value_Work",
+    "name": "Work",
+    "unit": "J"
+  }
 };
+
+/*
+todo
+14.000 F32 DPT_Value_Acceleration
+14.001 F32 DPT_Value_Acceleration_Angular
+14.002 F32 DPT_Value_Activation_Energy
+14.003 F32 DPT_Value_Activity
+14.004 F32 DPT_Value_Mol
+14.005 F32 DPT_Value_Amplitude
+14.006 F32 DPT_Value_AngleRad
+14.007 F32 DPT_Value_AngleDeg
+14.008 F32 DPT_Value_Angular_Momentum
+14.009 F32 DPT_Value_Angular_Velocity
+14.010 F32 DPT_Value_Area
+14.011 F32 DPT_Value_Capacitance
+14.012 F32 DPT_Value_Charge_DensitySurface
+14.013 F32 DPT_Value_Charge_DensityVolume
+14.014 F32 DPT_Value_Compressibility
+14.015 F32 DPT_Value_Conductance
+14.016 F32 DPT_Value_Electrical_Conductivity
+14.017 F32 DPT_Value_Density
+14.018 F32 DPT_Value_Electric_Charge
+14.019 F32 DPT_Value_Electric_Current
+14.020 F32 DPT_Value_Electric_CurrentDensity
+14.021 F32 DPT_Value_Electric_DipoleMoment
+14.022 F32 DPT_Value_Electric_Displacement
+14.023 F32 DPT_Value_Electric_FieldStrength
+14.024 F32 DPT_Value_Electric_Flux
+14.025 F32 DPT_Value_Electric_FluxDensity
+14.026 F32 DPT_Value_Electric_Polarization
+14.027 F32 DPT_Value_Electric_Potential
+14.028 F32 DPT_Value_Electric_PotentialDifference
+14.029 F32 DPT_Value_ElectromagneticMoment
+14.030 F32 DPT_Value_Electromotive_Force
+14.031 F32 DPT_Value_Energy
+14.032 F32 DPT_Value_Force
+14.033 F32 DPT_Value_Frequency
+14.034 F32 DPT_Value_Angular_Frequency
+14.035 F32 DPT_Value_Heat_Capacity
+14.036 F32 DPT_Value_Heat_FlowRate
+14.037 F32 DPT_Value_Heat_Quantity
+14.038 F32 DPT_Value_Impedance
+14.039 F32 DPT_Value_Length
+14.040 F32 DPT_Value_Light_Quantity
+14.041 F32 DPT_Value_Luminance
+14.042 F32 DPT_Value_Luminous_Flux
+14.043 F32 DPT_Value_Luminous_Intensity
+14.044 F32 DPT_Value_Magnetic_FieldStrength
+14.045 F32 DPT_Value_Magnetic_Flux
+14.046 F32 DPT_Value_Magnetic_FluxDensity
+14.047 F32 DPT_Value_Magnetic_Moment
+14.048 F32 DPT_Value_Magnetic_Polarization
+14.049 F32 DPT_Value_Magnetization
+14.050 F32 DPT_Value_MagnetomotiveForce
+14.051 F32 DPT_Value_Mass
+14.052 F32 DPT_Value_MassFlux
+14.053 F32 DPT_Value_Momentum
+14.054 F32 DPT_Value_Phase_AngleRad
+14.055 F32 DPT_Value_Phase_AngleDeg
+14.056 F32 DPT_Value_Power
+14.057 F32 DPT_Value_Power_Factor
+14.058 F32 DPT_Value_Pressure
+14.059 F32 DPT_Value_Reactance
+14.060 F32 DPT_Value_Resistance
+14.061 F32 DPT_Value_Resistivity
+14.062 F32 DPT_Value_SelfInductance
+14.063 F32 DPT_Value_SolidAngle
+14.064 F32 DPT_Value_Sound_Intensity
+14.065 F32 DPT_Value_Speed
+14.066 F32 DPT_Value_Stress
+14.067 F32 DPT_Value_Surface_Tension
+14.068 F32 DPT_Value_Common_Temperature
+14.069 F32 DPT_Value_Absolute_Temperature
+14.070 F32 DPT_Value_TemperatureDifference
+14.071 F32 DPT_Value_Thermal_Capacity
+14.072 F32 DPT_Value_Thermal_Conductivity
+14.073 F32 DPT_Value_ThermoelectricPower
+14.074 F32 DPT_Value_Time
+14.075 F32 DPT_Value_Torque
+14.076 F32 DPT_Value_Volume
+*/

package/lib/knx/src/dptlib/dpt3.js

@@ -18,7 +18,7 @@ exports.formatAPDU = (value) => {
   )
     return Buffer.from([(value.decr_incr << 3) + (value.data & 0b00000111)]);
 
-  log.error('Must supply a value object of {decr_incr, data}');
+  log.error('DPT3: Must supply a value object of {decr_incr, data}');
   // FIXME: should this return zero buffer when error? Or nothing?
   return Buffer.from([0]);
 };

package/lib/knx/src/dptlib/dpt8.js

@@ -50,21 +50,21 @@ exports.subtypes = {
   "005" : {
       "name" : "DPT_DeltaTimeSec",
       "desc" : "time lag(s)",
-      "unit" : "seconds"
+      "unit" : "s"
   },
 
   // 8.006 time lag (min)
   "006" : {
       "name" : "DPT_DeltaTimeMin",
       "desc" : "time lag(min)",
-      "unit" : "minutes"
+      "unit" : "min"
   },
 
   // 8.007 time lag (hour)
   "007" : {
       "name" : "DPT_DeltaTimeHrs",
       "desc" : "time lag(hrs)",
-      "unit" : "hours"
+      "unit" : "h"
   },
 
   // 8.010 percentage difference (%)

package/lib/knx/src/dptlib/index.js

@@ -181,8 +181,8 @@ dpts.fromBuffer = (buf, dpt) => {
 
   // log.trace(' ../knx/src/index.js : DPT : ' + JSON.stringify(dpt));   // for exploring dpt and implementing description
   if (
-    dpt.hasOwnProperty('subtype') &&
-    dpt.subtype.hasOwnProperty('scalar_range')
+    dpt.subtype != undefined &&
+    dpt.subtype.scalar_range != undefined
   ) {
     const [r_min, r_max] = dpt.basetype.hasOwnProperty('range') ?
       dpt.basetype.range :

package/lib/projectImport.js

@@ -82,7 +82,7 @@ module.exports = {
                     range,
                     type,
                     role
-                } = identifyRageRoleType(dptObj, range, dpt, type, role));
+                } = identifyRangeRoleType(dptObj, range, dpt, type, role));
 
                 //if dpt is for sure not a status, remove from autoread
                 autoread = !tools.isTriggerDPT(dpt);
@@ -97,8 +97,8 @@ module.exports = {
                                 "raw value" :
                                 dptObj.basetype.desc +
                                 (Object.prototype.hasOwnProperty.call(dptObj, "subtype") && Object.prototype.hasOwnProperty.call(dptObj, "desc") ? ", Subtype: " + dptObj.subtype.desc : "")),
-                        min: range[0],
-                        max: range[1],
+                        ...(range[0] != null && { min: range[0] }),
+                        ...(range[1] != null && { max: range[1] }),
                         name: gaName,
                         read: true,
                         role: role, //description: https://github.com/ioBroker/ioBroker/blob/master/doc/STATE_ROLES.md#state-roles
@@ -115,17 +115,17 @@ module.exports = {
                         dpt: dpt,
                         encoding:
                             !!dptObj && Object.prototype.hasOwnProperty.call(dptObj, "subtype") ?
-                                Object.prototype.hasOwnProperty.call(dptObj, "enc") ?
-                                    dptObj.subtype.enc :
-                                    dptObj.basetype.enc : undefined, //informative
+                            Object.prototype.hasOwnProperty.call(dptObj, "enc") ?
+                            dptObj.subtype.enc :
+                            dptObj.basetype.enc : undefined, //informative
                         force_encoding:
                             !!dptObj && Object.prototype.hasOwnProperty.call(dptObj, "subtype") && Object.prototype.hasOwnProperty.call(dptObj, "subtype") && dptObj.subtype ?
-                                dptObj.subtype.force_encoding : undefined, //DPT16
+                            dptObj.subtype.force_encoding : undefined, //DPT16
                         signedness:
                             !!dptObj && !tools.isEmptyObject(dptObj) ?
-                                Object.prototype.hasOwnProperty.call(dptObj, "signedness") && dptObj.basetype ?
-                                    dptObj.basetype.signedness :
-                                    undefined : undefined, //signed or unsigned or empty
+                            Object.prototype.hasOwnProperty.call(dptObj, "signedness") && dptObj.basetype ?
+                            dptObj.basetype.signedness :
+                            undefined : undefined, //signed or unsigned or empty
                         valuetype: !dptObj || tools.isEmptyObject(dptObj) ? undefined : dptObj.basetype.valuetype, //informative: composite or basic
                     },
                 };
@@ -154,7 +154,7 @@ module.exports = {
             return fullPath;
         }
 
-        function identifyRageRoleType(dptObj, range, dpt, type, role) {
+        function identifyRangeRoleType(dptObj, range, dpt, type, role) {
             // is there a scalar range? eg. DPT5.003 angle degrees (0=0, ff=360)
             if (!!dptObj && dptObj.subtype && dptObj.subtype.scalar_range) {
                 range = dptObj.subtype.scalar_range;
@@ -171,9 +171,11 @@ module.exports = {
                 range = [0, Math.pow(2, dptObj.basetype.bitlength) - 1];
             } else {
                 //unknown dpt, range unknown
+                range = [];
             }
 
             //correct range, set type and role based on dpt
+            //obj.common.min is only allowed on obj.common.type "number" or "mixed"
             if (tools.isDateDPT(dpt)) {
                 // we convert knx date types in javascript Date with different size
                 range[0] = undefined;
@@ -181,14 +183,12 @@ module.exports = {
                 type = "number";
                 role = "date";
             } else if (!!dptObj && !tools.isEmptyObject(dptObj) && dptObj.basetype && dptObj.basetype.valuetype == "composite") {
-                range[0] = undefined;
-                range[1] = undefined;
                 type = "object";
             } else if (!!dptObj && !tools.isEmptyObject(dptObj) && dptObj.basetype && dptObj.basetype.bitlength == 1) {
                 type = "boolean";
                 role = "switch";
-                range[0] = undefined;
-                range[1] = undefined;
+                range[0] = false;
+                range[1] = true;
             } else if (tools.isStringDPT(dpt)) {
                 range[0] = undefined;
                 range[1] = undefined;
@@ -253,7 +253,7 @@ module.exports = {
                     const statusDpt = gaList.getDataById(statusElement).native.dpt;
                     const nonStatusDpt = gaList.getDataById(nonStatusElement).native.dpt;
 
-                    if ((statusDpt != nonStatusDpt) &&  (nonStatusDpt.split(".")[0] != "DPT1" || statusDpt.split(".")[0] != "DPT1" )) {
+                    if ((statusDpt != nonStatusDpt) && (nonStatusDpt.split(".")[0] != "DPT1" || statusDpt.split(".")[0] != "DPT1")) {
                         //if both are dpt1 treat as equal
                         const text = "create aliases: " + gaList.getDataById(statusElement).native.dpt + " does not match " + gaList.getDataById(nonStatusElement).native.dpt + ", consider defining a conversion function in the alias object if needed";
                         adapter.log.info(text);