iobroker.openknx 0.4.0 → 0.4.2

package/README.md

@@ -153,10 +153,11 @@ The whole name including path is used to check for similarity.
 
 ## migrate Influx
 
--   login to your IOBroker server with command influx
+-   login via SSH to your IOBroker and run command influx
 -   use iobroker (or your specific database listed via command show databases)
 -   list entries with: show measurements
 -   copy tables with command: select \* into "entry_new" from "entry_old";
+    where entry_new points to the old adapter object path and entry_new the openknx adapter instance
 -   set influx enabled for new object entry_new
 
 # howto use the adapter & basic concept
@@ -375,6 +376,15 @@ Data is sent to Iobroker Sentry server hosted in Germany. If you have allowed io
   * .... -> this is used by script to generate a new entry, copy after a new release
   * npm run release major/minor/patch major.minor.patch
 -->
+### 0.4.2 (2022-12-18)
+
+-   bugfix: swap value for dpt 1 for enums
+
+### 0.4.1 (2022-12-17)
+
+-   bugfix: fix statup issue
+-   feature: add support for more datatypes
+
 ### 0.4.0 (2022-12-15)
 
 -   feature: support for Free and Two Level Group Address Style in addition to the existing Three Level support #320

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "openknx",
-    "version": "0.4.0",
+    "version": "0.4.2",
     "news": {
+      "0.4.2": {
+        "en": "bugfix: swap value for dpt 1 for enums",
+        "de": "bugfix: swap-wert für dpt 1 für enums",
+        "ru": "bugfix: swap значение для dpt 1 для enums",
+        "pt": "bugfix: valor de swap para dpt 1 para enums",
+        "nl": "verwisselingswaarde voor dup 1",
+        "fr": "bugfix: valeur de swap pour dpt 1 pour enums",
+        "it": "bugfix: valore swap per dpt 1 per enums",
+        "es": "bugfix: cambio de valor para dpt 1 para enums",
+        "pl": "trąbka: zmienna dla dpt 1 dla enum",
+        "uk": "виправлення помилок: значення swap для dpt 1 для enums",
+        "zh-cn": "b ugfix:配量1"
+      },
+      "0.4.1": {
+        "en": "bugfix: fix statup issue\nfeature: add support for more datatypes",
+        "de": "bugfix: statup problem beheben\nfeature: unterstützung für weitere datentypen hinzufügen",
+        "ru": "bugfix: исправить проблему статупа\nфункция: добавить поддержку для больше типов данных",
+        "pt": "bugfix: corrigir problema legal\nrecurso: adicionar suporte para mais tipos de dados",
+        "nl": "vertaling:\nvertaling:",
+        "fr": "bugfix: fix statup issue\nfonction: ajouter le support pour plus de types de données",
+        "it": "bugfix: risolvere problema di statup\nfunzione: aggiungere supporto per più tipi di dati",
+        "es": "bugfix: solucionar el problema de statup\nfunción: añadir soporte para más tipos de datos",
+        "pl": "trąbka\nfunkcja: dodanie wsparcia dla większej liczby typów danych",
+        "uk": "виправлення помилок\nфункція: додавати підтримку більше типів даних",
+        "zh-cn": "bugfix:固定统计问题\n特点:增加对更多的数据类型的支持"
+      },
       "0.4.0": {
         "en": "feature: support for Free and Two Level Group Address Style in addition to the existing Three Level support #320\nfeature: map knx datapoint type enconding to object common.states #313\ndebug message for send queue size",
         "de": "feature: Unterstützung für Free und Two Level Group Address Style zusätzlich zur vorhandenen Three Level Unterstützung #320\nmerkmal: map knx datapoint type enconding to object common. staaten #313\ndebug-nachricht zum senden von warteschlangengröße",

package/lib/knx/src/FSM.js

@@ -481,7 +481,7 @@ module.exports = machina.Fsm.extend({
             if (this.useTunneling)
               this.sentTunnRequests[datagram.cemi.dest_addr] = datagram;
             this.lastSentTime = Date.now();
-            this.log.warn( //test was debug
+            this.log.debug(
               '(%s):\t>>>>>>> successfully sent seqnum: %d',
               this.compositeState(),
               this.seqnum
@@ -542,7 +542,7 @@ module.exports = machina.Fsm.extend({
         clearTimeout(this.tunnelingAckTimer);
       },
       inbound_TUNNELING_ACK(datagram) {
-        this.log.warn( //todo was debug
+        this.log.debug(
           util.format(
             '===== datagram %d acknowledged by the Gateway',
             datagram.tunnstate.seqnum

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

@@ -7,9 +7,9 @@ const log = require('log-driver').logger;
 
 const custom_truthiness = (value) => {
   const f = parseFloat(value);
-  return !isNaN(f) && isFinite(f) ? // numeric values (in native and string form) are truthy if NOT zero
-    f !== 1.0 : // non-numeric value truthiness is Boolean true or the string 'true'.
-    value === true || value === 'true';
+  return !isNaN(f) && isFinite(f) ? 
+    f == 1.0 :                        // numeric values (in native and string form) are truthy if NOT zero 
+    value === true || value === 'true';// non-numeric value truthiness is Boolean true or the string 'true'.
 };
 
 exports.formatAPDU = (value) => Buffer.from([custom_truthiness(value)]);
@@ -32,7 +32,6 @@ exports.basetype = {
 
 //  DPT subtypes info hash
 exports.subtypes = {
-  //  1.001 on/off
   '001': {
     use: 'G',
     name: 'DPT_Switch',
@@ -40,7 +39,6 @@ exports.subtypes = {
     enc: { 0: 'Off', 1: 'On' },
   },
 
-  //  1.002 boolean
   '002': {
     use: 'G',
     name: 'DPT_Bool',
@@ -48,7 +46,6 @@ exports.subtypes = {
     enc: { 0: 'False', 1: 'True' },
   },
 
-  //  1.003 enable
   '003': {
     use: 'G',
     name: 'DPT_Enable',
@@ -56,7 +53,6 @@ exports.subtypes = {
     enc: { 0: 'Disable', 1: 'Enable' },
   },
 
-  //  1.004 ramp
   '004': {
     use: 'FB',
     name: 'DPT_Ramp',
@@ -64,7 +60,6 @@ exports.subtypes = {
     enc: { 0: 'No ramp', 1: 'Ramp' },
   },
 
-  //  1.005 alarm
   '005': {
     use: 'FB',
     name: 'DPT_Alarm',
@@ -72,7 +67,6 @@ exports.subtypes = {
     enc: { 0: 'No alarm', 1: 'Alarm' },
   },
 
-  //  1.006 binary value
   '006': {
     use: 'FB',
     name: 'DPT_BinaryValue',
@@ -80,7 +74,6 @@ exports.subtypes = {
     enc: { 0: 'Low', 1: 'High' },
   },
 
-  //  1.007 step
   '007': {
     use: 'FB',
     name: 'DPT_Step',
@@ -88,7 +81,6 @@ exports.subtypes = {
     enc: { 0: 'Decrease', 1: 'Increase' },
   },
 
-  //  1.008 up/down
   '008': {
     use: 'G',
     name: 'DPT_UpDown',
@@ -96,7 +88,6 @@ exports.subtypes = {
     enc: { 0: 'Up', 1: 'Down' },
   },
 
-  //  1.009 open/close
   '009': {
     use: 'G',
     name: 'DPT_OpenClose',
@@ -104,7 +95,6 @@ exports.subtypes = {
     enc: { 0: 'Open', 1: 'Close' },
   },
 
-  //  1.010 start/stop
   '010': {
     use: 'G',
     name: 'DPT_Start',
@@ -112,7 +102,6 @@ exports.subtypes = {
     enc: { 0: 'Stop', 1: 'Start' },
   },
 
-  //  1.011 state
   '011': {
     use: 'FB',
     name: 'DPT_State',
@@ -120,7 +109,6 @@ exports.subtypes = {
     enc: { 0: 'Inactive', 1: 'Active' },
   },
 
-  //  1.012 invert
   '012': {
     use: 'FB',
     name: 'DPT_Invert',
@@ -128,7 +116,6 @@ exports.subtypes = {
     enc: { 0: 'Not inverted', 1: 'Inverted' },
   },
 
-  //  1.013 dim send style
   '013': {
     use: 'FB',
     name: 'DPT_DimSendStyle',
@@ -136,7 +123,6 @@ exports.subtypes = {
     enc: { 0: 'Start/stop', 1: 'Cyclically' },
   },
 
-  //  1.014 input source
   '014': {
     use: 'FB',
     name: 'DPT_InputSource',
@@ -144,7 +130,6 @@ exports.subtypes = {
     enc: { 0: 'Fixed', 1: 'Calculated' },
   },
 
-  //  1.015 reset
   '015': {
     use: 'G',
     name: 'DPT_Reset',
@@ -152,7 +137,6 @@ exports.subtypes = {
     enc: { 0: 'no action(dummy)', 1: 'reset command(trigger)' },
   },
 
-  //  1.016 acknowledge
   '016': {
     use: 'G',
     name: 'DPT_Ack',
@@ -160,7 +144,6 @@ exports.subtypes = {
     enc: { 0: 'no action(dummy)', 1: 'acknowledge command(trigger)' },
   },
 
-  //  1.017 trigger
   '017': {
     use: 'G',
     name: 'DPT_Trigger',
@@ -168,7 +151,6 @@ exports.subtypes = {
     enc: { 0: 'trigger', 1: 'trigger' },
   },
 
-  //  1.018 occupied
   '018': {
     use: 'G',
     name: 'DPT_Occupancy',
@@ -176,7 +158,6 @@ exports.subtypes = {
     enc: { 0: 'not occupied', 1: 'occupied' },
   },
 
-  //  1.019 open window or door
   '019': {
     use: 'G',
     name: 'DPT_WindowDoor',
@@ -184,7 +165,6 @@ exports.subtypes = {
     enc: { 0: 'closed', 1: 'open' },
   },
 
-  //  1.021 and/or
   '021': {
     use: 'FB',
     name: 'DPT_LogicalFunction',
@@ -192,7 +172,6 @@ exports.subtypes = {
     enc: { 0: 'logical function OR', 1: 'logical function AND' },
   },
 
-  //  1.022 scene A/B
   '022': {
     use: 'FB',
     name: 'DPT_Scene_AB',
@@ -200,7 +179,6 @@ exports.subtypes = {
     enc: { 0: 'scene A', 1: 'scene B' },
   },
 
-  //  1.023 shutter/blinds mode
   '023': {
     use: 'FB',
     name: 'DPT_ShutterBlinds_Mode',
@@ -211,7 +189,6 @@ exports.subtypes = {
     },
   },
 
-  //  1.024 DPT_DayNight
   '024': {
     use: 'G',
     name: 'DPT_DayNight',

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

@@ -36,235 +36,570 @@ exports.basetype = {
 
 // DPT14 subtypes info
 exports.subtypes = {
-  // TODO
-  '007': {
-    name: 'DPT_Value_AngleDeg°',
-    desc: 'angle, degree',
+  '000': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Acceleration',  //Name
+    desc: 'acceleration', //Encoding field1
+    unit: 'ms-2',
+  },
+
+  '001': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Acceleration_Angular',  //Name
+    desc: 'acceleration, angular', //Encoding field1
+    unit: 'rad s^-2',
+  },
+  
+  '002': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Activation_Energy',  //Name
+    desc: 'activation energy', //Encoding field1
+    unit: 'J mol^-1',
+  },
+
+  '003': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Activity',  //Name
+    desc: 'activity (radioactive)', //Encoding field1
+    unit: 's^-1',
+  },
+
+  '004': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Mol',  //Name
+    desc: 'amount of substance', //Encoding field1
+    unit: 'mol',
+  },
+
+  '005': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Amplitude',  //Name
+    desc: 'amplitude (unit as appropriate)', //Encoding field1
+    unit: '',
+  },
+
+  '006': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_AngleRad',  //Name
+    desc: 'angle, radiant', //Encoding field1
+    unit: 'rad',
+  },
+
+  '007': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_AngleDeg',  //Name
+    desc: 'angle, degree', //Encoding field1
     unit: '°',
   },
 
-  '019': {
-    name: 'DPT_Value_Electric_Current',
-    desc: 'electric current',
+  '008': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Angular_Momentum',  //Name
+    desc: 'angular momentum', //Encoding field1
+    unit: 'J s',
+  },
+
+  '009': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Angular_Velocity',  //Name
+    desc: 'angular velocity', //Encoding field1
+    unit: 'rad s-1',
+  },
+
+  '010': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Area',  //Name
+    desc: 'acceleration', //Encoding field1
+    unit: 'm^2',
+  },
+
+  '011': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Capacitance',  //Name
+    desc: 'capacitance', //Encoding field1
+    unit: 'F',
+  },
+
+  '0012': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Charge_DensitySurface',  //Name
+    desc: 'charge density (surface)', //Encoding field1
+    unit: 'C m^-2',
+  },
+
+  '013': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Charge_DensityVolume',  //Name
+    desc: 'charge density (volume)', //Encoding field1
+    unit: 'C m^-3',
+  },
+
+  '014': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Compressibility',  //Name
+    desc: 'compressibility', //Encoding field1
+    unit: 'm2 N^-1',
+  },
+
+  '015': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Conductance',  //Name
+    desc: 'conductance', //Encoding field1
+    unit: 'S = Ω^-1',
+  },
+
+  '016': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Electrical_Conductivity',  //Name
+    desc: 'conductivity, electrical', //Encoding field1
+    unit: 'S m^-1',
+  },
+
+  '017': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Density',  //Name
+    desc: 'density', //Encoding field1
+    unit: 'kg m^-3',
+  },
+
+  '018': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Electric_Charge',  //Name
+    desc: 'electric charge', //Encoding field1
+    unit: 'C',
+  },
+  
+  '019': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Electric_Current',  //Name
+    desc: 'electric current', //Encoding field1
     unit: 'A',
   },
+  
+  '020': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Electric_CurrentDensity',  //Name
+    desc: 'electric current density', //Encoding field1
+    unit: 'A m^-2',
+  },
+
+  '021': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Electric_DipoleMoment',  //Name
+    desc: 'electric dipole moment', //Encoding field1
+    unit: 'C m',
+  },
+  
+  '022': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Electric_Displacement',  //Name
+    desc: '2 electric displacement', //Encoding field1
+    unit: 'C m^-2',
+  },
+
+  '023': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Electric_FieldStrength',  //Name
+    desc: 'electric field strength', //Encoding field1
+    unit: 'V m^-1',
+  },
+
+  '024': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Electric_Flux',  //Name
+    desc: 'electric flux', //Encoding field1
+    unit: 'c',
+  },
+
+  '025': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Electric_FluxDensity',  //Name
+    desc: 'electric flux density', //Encoding field1
+    unit: 'C m^-2',
+  },
+
+  '026': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Electric_Polarization',  //Name
+    desc: 'electric polarization', //Encoding field1
+    unit: 'C m^-2',
+  },
 
-  '027': {
-    name: 'DPT_Value_Electric_Potential',
-    desc: 'electric potential',
+  '027': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Electric_Potential',  //Name
+    desc: 'electric potential', //Encoding field1
     unit: 'V',
   },
 
-  '028': {
-    name: 'DPT_Value_Electric_PotentialDifference',
-    desc: 'electric potential difference',
+  '028': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Electric_PotentialDifference',  //Name
+    desc: 'electric potential difference', //Encoding field1
     unit: 'V',
   },
 
-  '031': {
-    name: 'DPT_Value_Energ',
-    desc: 'energy',
+  '029': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_ElectromagneticMoment',  //Name
+    desc: 'electromagnetic moment', //Encoding field1
+    unit: 'A m^2',
+  },
+
+  '030': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Electromotive_Force',  //Name
+    desc: 'electromotive force', //Encoding field1
+    unit: 'V',
+  },
+
+  '031': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Energy',  //Name
+    desc: 'energy', //Encoding field1
     unit: 'J',
   },
 
-  '032': {
-    name: 'DPT_Value_Force',
-    desc: 'force',
+  '032': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Force',  //Name
+    desc: 'force', //Encoding field1
     unit: 'N',
   },
 
-  '033': {
-    name: 'DPT_Value_Frequency',
-    desc: 'frequency',
-    unit: 'Hz',
+  '033': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Frequency',  //Name
+    desc: 'frequency', //Encoding field1
+    unit: 'Hz = s^-1',
+  },
+
+  '034': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Angular_Frequency',  //Name
+    desc: 'frequency, angular (pulsatance)', //Encoding field1
+    unit: 'rad s^-1',
+  },
+
+  '035': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Heat_Capacity',  //Name
+    desc: 'heat capacity', //Encoding field1
+    unit: 'J K^-1',
   },
 
-  '036': {
-    name: 'DPT_Value_Heat_FlowRate',
-    desc: 'heat flow rate',
+  '036': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Heat_FlowRate',  //Name
+    desc: 'heat flow rate', //Encoding field1
     unit: 'W',
   },
 
-  '037': {
-    name: 'DPT_Value_Heat_Quantity',
-    desc: 'heat, quantity of',
+  '037': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Heat_Quantity',  //Name
+    desc: 'heat, quantity of', //Encoding field1
     unit: 'J',
   },
 
-  '038': {
-    name: 'DPT_Value_Impedance',
-    desc: 'impedance',
+  '038': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Impedance',  //Name
+    desc: 'impedance', //Encoding field1
     unit: 'Ω',
   },
 
-  '039': {
-    name: 'DPT_Value_Length',
-    desc: 'length',
+  '039': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Length',  //Name
+    desc: 'length', //Encoding field1
     unit: 'm',
   },
 
-  '051': {
-    name: 'DPT_Value_Mass',
-    desc: 'mass',
+  '040': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Light_Quantity',  //Name
+    desc: 'light, quantity of', //Encoding field1
+    unit: 'J or lm s',
+  },
+
+  '041': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Luminance',  //Name
+    desc: 'luminance', //Encoding field1
+    unit: 'cd m^-2',
+  },
+
+  '042': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Luminous_Flux',  //Name
+    desc: 'luminous flux', //Encoding field1
+    unit: 'lm',
+  },
+
+  '043': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Luminous_Intensity',  //Name
+    desc: 'luminous intensity', //Encoding field1
+    unit: 'cd',
+  },
+
+  '044': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Magnetic_FieldStrength',  //Name
+    desc: 'magnetic field strength', //Encoding field1
+    unit: 'A m^-1',
+  },
+
+  '045': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Magnetic_Flux',  //Name
+    desc: 'magnetic flux', //Encoding field1
+    unit: 'Wb',
+  },
+
+  '046': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Magnetic_FluxDensity',  //Name
+    desc: 'magnetic flux density', //Encoding field1
+    unit: 'T',
+  },
+
+  '047': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Magnetic_Moment',  //Name
+    desc: 'magnetic moment', //Encoding field1
+    unit: 'A m^2',
+  },
+
+  '048': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Magnetic_Polarization',  //Name
+    desc: 'magnetic polarization', //Encoding field1
+    unit: 'T',
+  },
+
+  '049': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Magnetization',  //Name
+    desc: 'magnetization', //Encoding field1
+    unit: 'A m^-1',
+  },
+
+  '050': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_MagnetomotiveForce',  //Name
+    desc: 'magneto motive force', //Encoding field1
+    unit: 'A',
+  },
+
+  '051': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Mass',  //Name
+    desc: 'mass', //Encoding field1
     unit: 'kg',
   },
 
-  '056': {
-    name: 'DPT_Value_Power',
-    desc: 'power',
+  '052': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_MassFlux',  //Name
+    desc: 'mass flux', //Encoding field1
+    unit: 'kg s^-1',
+  },
+
+  '053': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Momentum',  //Name
+    desc: 'momentum', //Encoding field1
+    unit: 'N s^-1',
+  },
+
+  '054': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Phase_AngleRad',  //Name
+    desc: 'phase angle, radiant', //Encoding field1
+    unit: 'rad',
+  },
+
+  '055': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Phase_AngleDeg',  //Name
+    desc: 'phase angle, degrees', //Encoding field1
+    unit: '°',
+  },
+
+  '056': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Power',  //Name
+    desc: 'power', //Encoding field1
     unit: 'W',
   },
-  
-  "057": {
-    "desc": "DPT_Value_Power_Factor",
-    "name": "Power factor",
-    "unit": "cos Φ"
+
+  '057': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Power_Factor',  //Name
+    desc: 'power factor', //Encoding field1
+    unit: '',
   },
-  
-  "058": {
-    "desc": "DPT_Value_Pressure",
-    "name": "Pressure (Pa)",
-    "unit": "Pa"
+
+  '058': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Pressure',  //Name
+    desc: 'pressure', //Encoding field1
+    unit: 'Pa = N m^-2',
   },
-  
-  '065': {
-    name: 'DPT_Value_Speed',
-    desc: 'speed',
-    unit: 'm/s',
+
+  '059': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Reactance',  //Name
+    desc: 'reactance', //Encoding field1
+    unit: 'Ω',
+  },
+
+  '060': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Resistance',  //Name
+    desc: 'resistance', //Encoding field1
+    unit: 'Ω',
   },
 
-  '066': {
-    name: 'DPT_Value_Stress',
-    desc: 'stress',
-    unit: 'Pa',
+  '061': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Resistivity',  //Name
+    desc: 'resistivity', //Encoding field1
+    unit: 'Ωm',
   },
 
-  '067': {
-    name: 'DPT_Value_Surface_Tension',
-    desc: 'surface tension',
-    unit: '1/Nm',
+  '062': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_SelfInductance',  //Name
+    desc: 'self inductance', //Encoding field1
+    unit: 'H',
   },
 
-  '068': {
-    name: 'DPT_Value_Common_Temperature',
-    desc: 'temperature, common',
+  '063': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_SolidAngle',  //Name
+    desc: 'solid angle', //Encoding field1
+    unit: 'sr',
+  },
+
+  '064': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Sound_Intensity',  //Name
+    desc: 'sound intensity', //Encoding field1
+    unit: 'W m^-2',
+  },
+
+  '065': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Speed',  //Name
+    desc: 'speed', //Encoding field1
+    unit: 'm s^-1',
+  },
+
+  '066': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Stress',  //Name
+    desc: 'stress', //Encoding field1
+    unit: 'Pa = N m^-2',
+  },
+
+  '067': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Surface_Tension',  //Name
+    desc: 'surface tension', //Encoding field1
+    unit: 'Nm^-1',
+  },
+
+  '068': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Common_Temperature',  //Name
+    desc: 'emperature, common', //Encoding field1
     unit: '°C',
   },
 
-  '069': {
-    name: 'DPT_Value_Absolute_Temperature',
-    desc: 'temperature (absolute)',
+  '069': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Absolute_Temperature',  //Name
+    desc: 'temperature (absolute)', //Encoding field1
     unit: 'K',
   },
 
-  '070': {
-    name: 'DPT_Value_TemperatureDifference',
-    desc: 'temperature difference',
+  '070': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_TemperatureDifference',  //Name
+    desc: 'temperature difference', //Encoding field1
     unit: 'K',
   },
 
-  '078': {
-    name: 'DPT_Value_Weight',
-    desc: 'weight',
-    unit: 'N',
+  '071': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Thermal_Capacity',  //Name
+    desc: 'thermal capacity', //Encoding field1
+    unit: 'JK^-1',
   },
-  
-  '076': {
-    'desc': 'DPT_Value_Volume',
-    'name': 'Volume',
-    'unit': 'm3'
+
+  '072': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Thermal_Conductivity',  //Name
+    desc: 'thermal conductivity', //Encoding field1
+    unit: 'W m^-1 K^-1',
   },
-  
-  '078': {
-    'desc': 'DPT_Value_Weight',
-    'name': 'Weight',
-    'unit': 'N'
+
+  '073': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_ThermoelectricPower',  //Name
+    desc: 'thermoelectric power', //Encoding field1
+    unit: 'V K^-1',
   },
-  
-  '079': {
-    name: 'DPT_Value_Work',
-    desc: 'work',
+
+  '074': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Time',  //Name
+    desc: 'time', //Encoding field1
+    unit: 's',
+  },
+
+  '075': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Torque',  //Name
+    desc: 'torque', //Encoding field1
+    unit: 'Nm',
+  },
+
+  '076': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Volume',  //Name
+    desc: 'volume', //Encoding field1
+    unit: 'm^3',
+  },
+
+  '077': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Volume_Flux',  //Name
+    desc: 'volume flux', //Encoding field1
+    unit: 'm3 s^-1',
+  },
+
+  '078': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Weight',  //Name
+    desc: 'weight', //Encoding field1
+    unit: 'N',
+  },
+
+  '079': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_Work',  //Name
+    desc: 'work', //Encoding field1
     unit: 'J',
+  },
+
+  '080': { //ID
+    use: 'G', //Use
+    name: 'DPT_Value_ApparentPower',  //Name
+    desc: 'Apparent power', //Encoding field1
+    unit: 'VA',
   }
 };
-
-/*
-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/dpt2.js

@@ -36,7 +36,7 @@ exports.fromBuffer = (buf) => {
 // DPT basetype info hash
 exports.basetype = {
   bitlength: 2,
-  valuetype: 'composite',
+  valuetype: 'basic',
   desc: '1-bit value with priority',
 };
 
@@ -113,26 +113,26 @@ exports.subtypes = {
   },
 
   // 2.010 start control
-  '001': {
+  '010': {
     use: 'FB',
     name: 'DPT_Start_Control',
     desc: 'start with priority',
-    enc: { 0: 'No control', 1: 'No control', 2: 'Off', 3: 'On' },
+    enc: { 0: 'Off', 1: 'On' },
   },
 
   // 2.011 state control
-  '001': {
+  '011': {
     use: 'FB',
-    name: 'DPT_Switch_Control',
+    name: 'DPT_State_Control',
     desc: 'switch',
-    enc: { 0: 'No control', 1: 'No control', 2: 'Off', 3: 'On' },
+    enc: { 0: 'Off', 1: 'On' },
   },
 
   // 2.012 invert control
-  '001': {
+  '012': {
     use: 'FB',
-    name: 'DPT_Switch_Control',
+    name: 'DPT_Invert_Control',
     desc: 'switch',
-    enc: { 0: 'No control', 1: 'No control', 2: 'Off', 3: 'On' },
+    enc: { 0: 'Off', 1: 'On' },
   },
 };

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

@@ -51,28 +51,3 @@ exports.subtypes = {
     desc: 'blinds control',
   },
 };
-
-/*
-        2.6.3.5 Behavior
-Status
-off     dimming actuator switched off
-on      dimming actuator switched on, constant brightness, at least
-        minimal brightness dimming
-dimming actuator switched on, moving from actual value in direction of
-        set value
-Events
-    position = 0        off command
-    position = 1        on command
-    control = up dX     command, dX more bright dimming
-    control = down dX   command, dX less bright dimming
-    control = stop      stop command
-    value = 0           dimming value = off
-    value = x%          dimming value = x% (not zero)
-    value_reached       actual value reached set value
-
-The step size dX for up and down dimming may be 1/1, 1/2, 1/4, 1/8, 1/16, 1/32 and 1/64 of
-the full dimming range (0 - FFh).
-
-3.007 dimming control
-3.008 blind control
-*/

package/lib/projectImport.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const DPTLib = require(__dirname + "/knx/src/dptlib"); //todo copy for the moment
+const DPTLib = require(__dirname + "/knx/src/dptlib");
 const select = require("xpath");
 const dom = require("xmldom").DOMParser;
 const tools = require("./tools.js");
@@ -167,14 +167,14 @@ module.exports = {
 
         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) {
+            if (dptObj?.subtype?.scalar_range) {
                 range = dptObj.subtype.scalar_range;
-            } else if (!!dptObj && dptObj.scalar_range) {
+            } else if (dptObj?.scalar_range) {
                 range = dptObj.scalar_range;
-            } else if (!!dptObj && dptObj.subtype && dptObj.subtype.range) {
+            } else if (dptObj?.subtype?.range) {
                 // just a plain numeric value, only check if within bounds
                 range = dptObj.subtype.range;
-            } else if (!!dptObj && dptObj.basetype && dptObj.basetype.range) {
+            } else if (dptObj?.basetype?.range) {
                 // just a plain numeric value, only check if within bounds
                 range = dptObj.basetype.range;
             } else if (!!dptObj && !tools.isEmptyObject(dptObj)) {
@@ -184,6 +184,7 @@ module.exports = {
                 //unknown dpt, range unknown
                 range = [];
             }
+            if (dptObj?.subtype?.enc) type = "enum";
 
             //correct range, set type and role based on dpt
             //obj.common.min is only allowed on obj.common.type "number" or "mixed"
@@ -191,6 +192,7 @@ module.exports = {
                 // we convert knx date types in javascript Date with different size
                 range[0] = undefined;
                 range[1] = undefined;
+                console.assert(type == "", "number  " + type);
                 type = "number";
                 role = "date";
             } else if (
@@ -199,15 +201,17 @@ module.exports = {
                 dptObj.basetype &&
                 dptObj.basetype.valuetype == "composite"
             ) {
+                console.assert(type == "", "object " + type);
                 type = "object";
             } else if (!!dptObj && !tools.isEmptyObject(dptObj) && dptObj.basetype && dptObj.basetype.bitlength == 1) {
-                type = "boolean";
+                if (type != "enum") type = "boolean";
                 role = "switch";
                 range[0] = false;
                 range[1] = true;
             } else if (tools.isStringDPT(dpt)) {
                 range[0] = undefined;
                 range[1] = undefined;
+                console.assert(type == "", "string " + type);
                 type = "string";
                 role = "text";
             } else if (tools.isFloatDPT(dpt)) {

package/main.js

@@ -79,7 +79,7 @@ class openknx extends utils.Adapter {
     async onReady() {
         // adapter initialization
 
-        this.getSentry()?.Sentry.init({
+        this.getSentry()?.Sentry?.init({
             //"development" or "production"
             //environment: "production",
         });
@@ -383,14 +383,15 @@ class openknx extends utils.Adapter {
         //plausibilize against configured datatype
         if (this.gaList.getDataById(id).common && this.gaList.getDataById(id).common.type == "boolean") {
             knxVal = knxVal ? true : false;
-        } else if (this.gaList.getDataById(id).common && this.gaList.getDataById(id).common.type == "number") {
+        } else if (
+            this.gaList?.getDataById(id)?.common?.type == "number" ||
+            this.gaList?.getDataById(id)?.common?.type == "enum"
+        ) {
             if (isNaN(Number(knxVal))) {
                 this.log.warn("Value " + knxVal + " for " + id + " is not a number");
             }
             // else take plain value
-        }
-        //convert val into object for certain dpts
-        else if (tools.isDateDPT(dpt)) {
+        } else if (tools.isDateDPT(dpt)) {
             //before composite check, date is possibly composite
             knxVal = new Date(knxVal);
         } else if (this.gaList.getDataById(id).native.valuetype == "composite") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.openknx",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "ioBroker knx Adapter",
   "author": "boellner",
   "homepage": "https://github.com/iobroker-community-adapters/ioBroker.openknx.git",