iobroker.e3oncan 0.6.9 → 0.6.10

package/README.md

@@ -99,6 +99,9 @@ Yes, that is possible under certain conditions:
     Placeholder for the next version (at the beginning of the line):
     ### **WORK IN PROGRESS**
 -->
+### 0.6.10 (2024-01-15)
+* (MyHomeMyData) Removed code for Rawmode because it's never activated
+
 ### 0.6.9 (2024-01-13)
 * (MyHomeMyData) Bugfix: Only Linux is supported
 

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "e3oncan",
-    "version": "0.6.9",
+    "version": "0.6.10",
     "news": {
+      "0.6.10": {
+        "en": "Removed code for Rawmode because it's never activated",
+        "de": "Entfernter Code für Rawmode, weil es nie aktiviert ist",
+        "ru": "Удаленный код для Rawmode, потому что он никогда не активирован",
+        "pt": "Código removido para Rawmode porque nunca foi ativado",
+        "nl": "Verwijderde code voor Rawmode omdat het nooit is geactiveerd",
+        "fr": "Code supprimé pour Rawmode car il n'est jamais activé",
+        "it": "Codice rimosso per Rawmode perché non è mai attivato",
+        "es": "Código eliminado para Rawmode porque nunca se activa",
+        "pl": "Usunięto kod dla Rawmode ponieważ nigdy nie jest aktywowany",
+        "uk": "Видалити код для Rawmode, тому що він ніколи не активований",
+        "zh-cn": "删除了Rawmode的代码,因为它从未被激活"
+      },
       "0.6.9": {
         "en": "Bugfix: Only Linux is supported",
         "de": "Bugfix: Nur Linux wird unterstützt",

package/lib/canUds.js

@@ -43,7 +43,6 @@ class uds {
         this.config.worker = 'uds';
         this.storage = new storage.storage(this.config);
         this.states = ['standby','waitForFFrbd','waitForCFrbd','waitForFFSFwbd','waitForFFMFwbd'];
-        this.frameFC = [0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00];
         this.readByDidProt = {
             'idTx'  : this.config.canID,
             'idRx'  : Number(this.config.canID) + 0x10,
@@ -576,7 +575,7 @@ class uds {
                         ctx.log.silly('UDS worker on '+this.config.stateBase+': FF received. candata: '+this.storage.arr2Hex(candata));
                         this.data.databytes = candata.slice(5);
                         this.data.D0 = 0x21;
-                        this.sendFrame(ctx, this.frameFC); // Send request for Consecutive Frames
+                        this.sendFrame(ctx, this.readByDidProt.FC); // Send request for Consecutive Frames
                         await this.setComState(2);   // 'waitForCFrbd'
                         break;
                     } else {

package/lib/codecs.js

@@ -1,17 +1,3 @@
-class codecOpMode {
-    constructor(raw=true) {
-        this.raw = raw;
-    }
-
-    setOpMode(raw) {
-        this.raw = raw;
-    }
-    getOpMode() {
-        return this.raw;
-    }
-}
-
-const rawmode = new codecOpMode(true);
 
 const enums = require('./enums');
 
@@ -124,20 +110,13 @@ class O3EInt {
         this.signed = _args.signed;
     }
     encode(data) {
-        if (rawmode.getOpMode()) {
-            return RawEncode(data, this.string_len);
-        } else {
-            if (this.offset != 0) {
-                throw new Error('O3EInt.encode(): offset!=0 not implemented yet');
-            }
-            return val2byteArr(data, this.byte_width, this.scale, this.signed);
+        if (this.offset != 0) {
+            throw new Error('O3EInt.encode(): offset!=0 not implemented yet');
         }
+        return val2byteArr(data, this.byte_width, this.scale, this.signed);
     }
 
     decode(data) {
-        if (rawmode.getOpMode()) {
-            return RawDecode(data);
-        }
         return int2val(data.slice(this.offset,this.offset+this.byte_width), 0, this.signed) / this.scale;
     }
 
@@ -174,20 +153,13 @@ class O3EByteVal {
         this.offset = _args.offset;
     }
     encode(data) {
-        if (rawmode.getOpMode()) {
-            return RawEncode(data, this.string_len);
-        } else {
-            if (this.offset != 0) {
-                throw new Error('O3EByteVal.encode(): offset!=0 not implemented yet');
-            }
-            return val2byteArr(data, this.string_len, 1, false);
+        if (this.offset != 0) {
+            throw new Error('O3EByteVal.encode(): offset!=0 not implemented yet');
         }
+        return val2byteArr(data, this.string_len, 1, false);
     }
 
     decode(string_bin) {
-        if (rawmode.getOpMode()) {
-            return RawDecode(string_bin);
-        }
         let val = 0;
         for (let i = 0; i < this.string_len; i++) {
             val += string_bin[i + this.offset] << (i * 8);
@@ -207,17 +179,10 @@ class  O3EBool {
         this.offset = _args.offset;
     }
     encode(data) {
-        if (rawmode.getOpMode()) {
-            return RawEncode(data, this.string_len);
-        }
         return (data == 'off' ? 0 : 1);
-        //throw new Error('O3EBool.encode(): not implemented yet');
     }
 
     decode(string_bin) {
-        if (rawmode.getOpMode()) {
-            return RawDecode(string_bin);
-        }
         const val = string_bin[this.offset];
         return (val == 0 ? 'off' : 'on' );
     }
@@ -234,9 +199,6 @@ class O3EUtf8 {
         this.offset = _args.offset;
     }
     encode(data) {
-        if (rawmode.getOpMode()) {
-            return RawEncode(data, this.string_len);
-        }
         const encoder = new TextEncoder();
         const result = Object.values(encoder.encode(data));
         if (result.length > this.string_len) throw new Error('O3EUtf8.encode() result too long: '+this.id+' - '+String(result.length)+' > '+String(this.string_len));
@@ -244,9 +206,6 @@ class O3EUtf8 {
 
     }
     decode(string_bin) {
-        if (rawmode.getOpMode()) {
-            return RawDecode(string_bin);
-        }
         let mystr = '';
         for (let i=this.offset; i<this.offset+this.string_len;i++) { mystr += String.fromCharCode(string_bin[i]); }
         // eslint-disable-next-line no-control-regex
@@ -264,9 +223,6 @@ class O3ESoftVers {
         this.id = idStr;
     }
     encode(data) {
-        if (rawmode.getOpMode()) {
-            return RawEncode(data, this.string_len);
-        }
         let result = [];
         const arr = data.split('.');
         for (const v of Object.values(arr)) result = result.concat(val2byteArr(v,2,1,false));
@@ -274,9 +230,6 @@ class O3ESoftVers {
         return result.concat(Array.from(Array(this.string_len-result.length), () => 0));
     }
     decode(string_bin) {
-        if (rawmode.getOpMode()) {
-            return RawDecode(string_bin);
-        }
         const lstv = [];
         for (let i = 0; i < this.string_len; i += 2) {
             lstv.push(string_bin[i] + (string_bin[i+1] << 8));
@@ -294,16 +247,9 @@ class O3EMacAddr {
         this.id = idStr;
     }
     encode(data) {
-        if (rawmode.getOpMode()) {
-            return RawEncode(data, this.string_len);
-        }
         return(data.split('-').map(function(str) {return parseInt('0x'+str);}));
-
     }
     decode(string_bin) {
-        if (rawmode.getOpMode()) {
-            return RawDecode(string_bin);
-        }
         const lstv = [];
         for (let i = 0; i < this.string_len; i++) {
             lstv.push(toHex(string_bin[i],2).toUpperCase());
@@ -321,16 +267,9 @@ class O3EIp4Addr {
         this.id = idStr;
     }
     encode(data) {
-        if (rawmode.getOpMode()) {
-            return RawEncode(data, this.string_len);
-        }
         return(data.split('.').map(function(str) {return parseInt(str);}));
-
     }
     decode(string_bin) {
-        if (rawmode.getOpMode()) {
-            return RawDecode(string_bin);
-        }
         const lstv = [];
         for (let i = 0; i < this.string_len; i++) {
             lstv.push(string_bin[i].toString().padStart(3,'0'));
@@ -348,18 +287,12 @@ class O3ESdate {
         this.id = idStr;
     }
     encode(data) {
-        if (rawmode.getOpMode()) {
-            return RawEncode(data, this.string_len);
-        }
         const dt = new Date(data);
         if (!dt.valueOf()) throw new Error('could not convert date value');
         return [dt.getDate(),dt.getMonth()+1,dt.getFullYear()%100];
 
     }
     decode(string_bin) {
-        if (rawmode.getOpMode()) {
-            return RawDecode(string_bin);
-        }
         const dt = new Date(
             string_bin[2]+2000,     // year
             string_bin[1]-1,        // month
@@ -378,9 +311,6 @@ class O3EStime {
         this.id = idStr;
     }
     encode(data) {
-        if (rawmode.getOpMode()) {
-            return RawEncode(data, this.string_len);
-        }
         if (this.string_len == 1) data += ':00';        // Date() needs at least hour:minute
         const now = new Date();
         const dt = new Date(now.toDateString()+' '+data);
@@ -390,9 +320,6 @@ class O3EStime {
 
     }
     decode(string_bin) {
-        if (rawmode.getOpMode()) {
-            return RawDecode(string_bin);
-        }
         const now = new Date();
         const dt = new Date(now.getFullYear(), now.getMonth(), now.getDate(),
             string_bin[0],                                     // hour
@@ -413,9 +340,6 @@ class O3EDateTime {
         this.timeformat = _args.timeformat;
     }
     encode(data) {
-        if (rawmode.getOpMode()) {
-            return RawEncode(data, this.string_len);
-        }
         if (this.timeformat == 'VM') {
             const dt = new Date(data.Timestamp);
             if (!dt.valueOf()) throw new Error('could not convert datetime value');
@@ -428,9 +352,6 @@ class O3EDateTime {
 
     }
     decode(string_bin) {
-        if (rawmode.getOpMode()) {
-            return RawDecode(string_bin);
-        }
         let dt = new Date();
         if (this.timeformat == 'VM') {
             dt = new Date(
@@ -460,18 +381,12 @@ class O3EUtc {
         this.id = idStr;
     }
     encode(data) {
-        if (rawmode.getOpMode()) {
-            return RawEncode(data, this.string_len);
-        }
         const dt = new Date(data);
         if (!dt) throw new Error('could not convert Utc date value');
         return val2byteArr(dt.getTime(),this.string_len,0.001,false);
 
     }
     decode(string_bin) {
-        if (rawmode.getOpMode()) {
-            return RawDecode(string_bin);
-        }
         const dt = new Date(uint32toVal(string_bin.slice(0,4),0)*1000);
         return dt.toUTCString();
     }
@@ -487,16 +402,9 @@ class O3EEnum {
         this.listStr = _args.listStr;
     }
     encode(data) {
-        if (rawmode.getOpMode()) {
-            return RawEncode(data, this.string_len);
-        }
         return val2byteArr(data.ID, this.string_len, 1, false);
-
     }
     decode(string_bin) {
-        if (rawmode.getOpMode()) {
-            return RawDecode(string_bin);
-        }
         const val = int2val(string_bin);
         let txt = '';
         if ( (this.listStr in enums.enums) && (String(val) in enums.enums[this.listStr]) ) {
@@ -519,9 +427,6 @@ class O3EList {
         this.subTypes = _args.subTypes;
     }
     encode(data) {
-        if (rawmode.getOpMode()) {
-            return RawEncode(data, this.string_len);
-        }
         let result = [];
         for (const cdi of Object.values(this.subTypes)) {
             const subT = new O3Ecodecs[cdi.codec](cdi.len, cdi.id, cdi.args);
@@ -539,9 +444,6 @@ class O3EList {
         return result.concat(Array.from(Array(this.string_len-result.length), () => 0));
     }
     decode(string_bin) {
-        if (rawmode.getOpMode()) {
-            return RawDecode(string_bin);
-        }
         const result = {};
         let index = 0;
         let count = 0;
@@ -583,16 +485,10 @@ class O3EArray {
         this.subTypes = _args.subTypes;
         this.len = _args.arrayLength;
     }
-    encode(data) {
-        if (rawmode.getOpMode()) {
-            return RawEncode(data, this.string_len);
-        }
+    encode(_data) {
         throw new Error('not implemented yet');
     }
     decode(string_bin) {
-        if (rawmode.getOpMode()) {
-            return RawDecode(string_bin);
-        }
         const result = {};
         let index = 0;
         const count = this.len;
@@ -618,10 +514,6 @@ class O3EComplexType {
         this.subTypes = _args.subTypes;
     }
     encode(data) {
-        if (rawmode.getOpMode()) {
-            return RawEncode(data, this.string_len);
-        }
-
         let result = [];
         for (const cdi of Object.values(this.subTypes)) {
             const subT = new O3Ecodecs[cdi.codec](cdi.len, cdi.id, cdi.args);
@@ -631,9 +523,6 @@ class O3EComplexType {
         return result.concat(Array.from(Array(this.string_len-result.length), () => 0));
     }
     decode(string_bin) {
-        if (rawmode.getOpMode()) {
-            return RawDecode(string_bin);
-        }
         const result = {};
         let index = 0;
         for (const cdi of Object.values(this.subTypes)) {
@@ -655,18 +544,11 @@ class O3EcosPhi {
         this.offset = _args.offset;
         this.scale = _args.scale;
     }
-    encode(data) {
-        if (rawmode.getOpMode()) {
-            return RawEncode(data, this.string_len);
-        } else {
-            throw new Error('not implemented yet');
-        }
+    encode(_data) {
+        throw new Error('not implemented yet');
     }
 
     decode(string_bin) {
-        if (rawmode.getOpMode()) {
-            return RawDecode(string_bin);
-        }
         let val = string_bin[1+this.offset];
         if (string_bin[this.offset] == 0x04) {
             val = -1.0*val;
@@ -704,6 +586,5 @@ const O3Ecodecs = {
 module.exports = {
     O3Ecodecs,
     arr2Hex,
-    toByteArray,
-    rawmode
+    toByteArray
 };

package/main.js

@@ -12,7 +12,6 @@ const utils = require('@iobroker/adapter-core');
 // const fs = require("fs");
 
 const can = require('socketcan');
-const codecs = require('./lib/codecs');
 const storage = require('./lib/storage');
 const collect = require('./lib/canCollect');
 const uds = require('./lib/canUds');
@@ -81,8 +80,6 @@ class E3oncan extends utils.Adapter {
             this.udsDevStateNames.push(dev.devStateName);
         }
 
-        codecs.rawmode.setOpMode(false);
-
         // Check for required scan for UDS devices
         this.doUdsDevScan = (this.config.tableUdsDevices.length == 0);
         if (this.doUdsDevScan) await this.log.info('UDS device scan is required.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.e3oncan",
-  "version": "0.6.9",
+  "version": "0.6.10",
   "description": "Collect data on CAN bus for Viessmann E3 devices, e.g. Vitocal, Vitocharge, Energy Meter E380",
   "author": {
     "name": "Juergen",