iobroker.e3oncan 0.6.9 → 0.6.11

package/README.md

@@ -40,14 +40,14 @@ A scan for datapoints of each device is also available and should be done during
 All services provided by this adapter are based on device list of your specific Viessmann E3 setup. Therefore you have to follow following steps for first setup:
 
 **Configuration**
-* When installation od adapter has finished a confuration dialog will show up to configure up to two CAN bus adapters (tab "CAN ADAPTER")
+* When installation of adapter has finished a confuration dialog will show up to configure up to two CAN bus adapters (tab "CAN ADAPTER")
 * Edit name of adapter and check the "Connect to adapter" checkbox at least the external adapter
-* When you're done, press "SAVE" button to apply the changes. This step is **mandatory**. The instance will restart, connect to the CAN adapter and do a scan for devices available on bus. **Please be patient** - this may take up to 20 seconds. You may watch the activities in a 2nd browser tab by looking on the logging info of the adapter.
-* When scan was successful new tabs will get visible in adapter confuration: "LIST OF UDS DEVICES", "LIST OF DATAPOINTS" and "ASSIGNMENTS TO EXTERNAL CAN ADAPTER".
-* Go to the "LIST OF UDS DEVICES" and check the list of devices. You may change the naming on 2nd column. Those names will be used to store all collected data in ioBoker's object tree. Again press "SAVE" button when you did your changes. Again this step is **mandatory**.
-* Instance will restart again and after a few seconds you are ready to a scan for available datapoints. Go to tab "LIST OF DATAPOINTS", press button "Start scan ..." and confirm with "OK" to start the scan. Again, **please be patient** - this may take **up to 5 minutes**. You may watch the progress in a 2nd browser tab by looking on the logging info of the adapter.
+* When you're done, press "SAVE" button to apply the changes. This step is **mandatory**. The instance will restart and connect to the CAN adapter.
+* Go to tab "LIST OF UDS DEVICES" and do a scan for devices available on bus by pressing the scan button. **This will take a few seconds.** You may watch the activities in a 2nd browser tab by looking on the logging info of the adapter.
+* You may change the naming of the devices at 2nd column. Those names will be used to store all collected data in ioBoker's object tree. Again press "SAVE" button when you did your changes.
+* Instance will restart again and after a few seconds you are ready to do a scan for available datapoints. Go to tab "LIST OF DATAPOINTS", press button "Start scan ..." and confirm with "OK". **Please be patient** - this may take **up to 5 minutes**. You may watch the progress in a 2nd browser tab by looking on the logging info of the adapter.
 This step is not mandatory but strongly recomended. If you would like to write to datapoints you need to do a datapoint scan first.
-* When datapoint scan was completed successfully, the datapoints are available in object tree for each device. You may view the datapoints in configuration by selecting a device and pressing button "Update list of datapoints". Press filter symbol and type search pattern to filter for name and/or codec. This is for your information only. Please deactivate filtering before selecting another device to avoid error messages.
+* When datapoint scan was completed successfully, the datapoints are available in the object tree for each device. You may view the datapoints in configuration by selecting a device and pressing button "Update list of datapoints". Press filter symbol and type search pattern to filter for name and/or codec. This is for your information only. Please deactivate filtering before selecting another device to avoid error messages.
 * Last step is to configure schedules for collecting data on tab "ASSIGNMENTS TO EXTERNAL CAN ADAPTER".
 * For **energy meter E380** (if available in your setup) you just can activate or not. Please notice the value "Min. update time (s)". Updates to single datapoints are done no faster than the given value (default is 5 seconds). By choosing zero every received data will be stored. Since E380 is sending data very fast (more than 20 values per second), it's recommended not to use zero here. This would put a high load on the ioBroker system.
 * If you have connected E3 devices via CAN bus, e.g. Vitocal and VX3, you can collect data exchanged between those devices in realtime by listening. Press "+" to add a line, check "active" chackbox, select a device and edit "Min. update time (s)". It's feasable to use 0s here, however, I recommend to keep to the 5s.
@@ -84,12 +84,11 @@ You may use datapoints informations on tab "LIST OF DATAPOINTS" for reference (o
 * At present, the communication protocol is known only for Vitocal (listener on CAN id 0x693) and Vitocharge VX3 (listener on CAN id 0x451).
 
 ## What is different to open3e project?
-* Obviously, the main differece is the direct integration to ioBroker. Configuration can be done via dialogs, data get's directly listed in object tree.
-* **WriteByDid is supported for all data types** but restricted to datapoints on device specific white list, see info section of device. You need to do a datapoint scan to enable writing. Writing of data is triggered by storing the datapoint with ack=false - yes, it's that simple! The datapoint will be read again from device two seconds after writing. If datapoint not get's acknowledged, please take a look to the logs.
-* A scan for datapoints per device (as depict tool of open3e is doing) is available now. After a successful scan, device specific datapoints are listed in object tree.
-* In addation to open3e real time collecting of data via listening is supported.
+* Obviously, the main differece is the direct integration to ioBroker. Configuration can be done via dialogs, data get's directly listed in object trees.
+* **WriteByDid is supported for all data types** but restricted to datapoints on device specific white list, see info section of devices. You need to do a datapoint scan to enable writing. Writing of data is triggered by storing the datapoint with ack=false - yes, it's that simple! The datapoint will be read again from device two seconds after writing. If datapoint not get's acknowledged, please take a look to the logs.
+* In addition to open3e real time collecting of data via listening is supported.
 
-## May open3 be used in parallel?
+## May open3e be used in parallel?
 Yes, that is possible under certain conditions:
 * If you only use data collecting here, you can use open3e with no limitiations.
 * If you use UDSonCAN here, it's important not to do this for the same devices as open3e does. If you would do so, you will have sporadic communications errors.
@@ -99,6 +98,12 @@ Yes, that is possible under certain conditions:
     Placeholder for the next version (at the beginning of the line):
     ### **WORK IN PROGRESS**
 -->
+### 0.6.11 (2024-01-17)
+* (MyHomeMyData) Improved layout of configuration dialog for device scan
+
+### 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/admin/i18n/de/translations.json

@@ -56,5 +56,6 @@
     "Separate by comma! All given datapoints will be requested with specified schedule and ECU address.": "Durch Komma trennen! Alle angegebenen Datenpunkte werden mit der angegebenen Wiederholungszeit von der ECU-Adresse angefordert.",
     "Assignments to Internal CAN Adapter": "Zuordnungen zum internen CAN-Adapter",
     "Collecting Data on Internal CAN Adapter": "Sammeln von Daten auf dem internen CAN-Adapter",
-    "Update list of datapoints": "Liste der Datenpunkte aktualisieren"
+    "Update list of datapoints": "Liste der Datenpunkte aktualisieren",
+    "Start scan to update list of devices": "Scan starten, um die Liste der UDS-Geräte zu aktualisieren"
 }

package/admin/i18n/en/translations.json

@@ -56,5 +56,6 @@
     "Separate by comma! All given datapoints will be requested with specified schedule and ECU address.":"Separate by comma! All given datapoints will be requested with specified schedule and ECU address.",
     "Assignments to Internal CAN Adapter":"Assignments to Internal CAN Adapter",
     "Collecting Data on Internal CAN Adapter":"Collecting Data on Internal CAN Adapter",
-    "Update list of datapoints":"Update list of datapoints"
+    "Update list of datapoints":"Update list of datapoints",
+    "Start scan to update list of devices":"Start scan to update list of devices"
 }

package/admin/i18n/es/translations.json

@@ -58,5 +58,6 @@
     "Collecting Data on Internal CAN Adapter": "Recopilación de datos en el adaptador CAN interno",
     "Listen for data on addresses given in this table. No writing to CAN bus.": "Escuche los datos sobre las direcciones que figuran en esta tabla. No se puede escribir en el bus CAN.",
     "Devices for collecting data. No writing to CAN bus. Press '+' to add device.": "Dispositivos para la recogida de datos. No se puede escribir en el bus CAN. Presione '+' para agregar el dispositivo.",
-    "Update list of datapoints": "Actualizar lista de puntos de datos"
+    "Update list of datapoints": "Actualizar lista de puntos de datos",
+    "Start scan to update list of devices": "Iniciar escaneo para actualizar la lista de dispositivos"
 }

package/admin/i18n/fr/translations.json

@@ -58,5 +58,6 @@
     "Collecting Data on Internal CAN Adapter": "Collecte de données sur l'adaptateur CAN interne",
     "Listen for data on addresses given in this table. No writing to CAN bus.": "Écoutez les données sur les adresses indiquées dans ce tableau. Pas d'écriture sur le bus CAN.",
     "Devices for collecting data. No writing to CAN bus. Press '+' to add device.": "Appareils de collecte de données. Pas d'écriture sur le bus CAN. Appuyez sur « + » pour ajouter un appareil.",
-    "Update list of datapoints": "Mettre à jour la liste des points de données"
+    "Update list of datapoints": "Mettre à jour la liste des points de données",
+    "Start scan to update list of devices": "Démarrer l'analyse pour mettre à jour la liste des appareils"
 }

package/admin/i18n/it/translations.json

@@ -58,5 +58,6 @@
     "Collecting Data on Internal CAN Adapter": "Raccolta dati sull'adattatore CAN interno",
     "Listen for data on addresses given in this table. No writing to CAN bus.": "Ascoltare i dati sugli indirizzi forniti in questa tabella. Nessuna scrittura sul bus CAN.",
     "Devices for collecting data. No writing to CAN bus. Press '+' to add device.": "Dispositivi per la raccolta dei dati. Nessuna scrittura sul bus CAN. Premi \"+\" per aggiungere il dispositivo.",
-    "Update list of datapoints": "Aggiorna l'elenco dei punti dati"
+    "Update list of datapoints": "Aggiorna l'elenco dei punti dati",
+    "Start scan to update list of devices": "Avvia la scansione per aggiornare l'elenco dei dispositivi"
 }

package/admin/i18n/nl/translations.json

@@ -58,5 +58,6 @@
     "Collecting Data on Internal CAN Adapter": "Gegevens verzamelen over de interne CAN-adapter",
     "Listen for data on addresses given in this table. No writing to CAN bus.": "Luister naar gegevens over adressen in deze tabel. Geen schrijven naar CAN-bus.",
     "Devices for collecting data. No writing to CAN bus. Press '+' to add device.": "Apparaten voor het verzamelen van gegevens. Geen schrijven naar CAN-bus. Druk op '+' om apparaat toe te voegen.",
-    "Update list of datapoints": "Lijst met datapunten bijwerken"
+    "Update list of datapoints": "Lijst met datapunten bijwerken",
+    "Start scan to update list of devices": "Start de scan om de lijst met apparaten bij te werken"
 }

package/admin/i18n/pl/translations.json

@@ -58,5 +58,6 @@
     "Collecting Data on Internal CAN Adapter": "Zbieranie danych na wewnętrznym adapterze CAN",
     "Listen for data on addresses given in this table. No writing to CAN bus.": "Posłuchaj danych o adresach podanych w tej tabeli. Brak zapisu do magistrali CAN.",
     "Devices for collecting data. No writing to CAN bus. Press '+' to add device.": "Urządzenia do gromadzenia danych. Brak zapisu do magistrali CAN. Naciśnij „+”, aby dodać urządzenie.",
-    "Update list of datapoints": "Zaktualizuj listę punktów danych"
+    "Update list of datapoints": "Zaktualizuj listę punktów danych",
+    "Start scan to update list of devices": "Rozpocznij skanowanie, aby zaktualizować listę urządzeń"
 }

package/admin/i18n/pt/translations.json

@@ -58,5 +58,6 @@
     "Collecting Data on Internal CAN Adapter": "Coletando dados no adaptador CAN interno",
     "Listen for data on addresses given in this table. No writing to CAN bus.": "Ouça os dados sobre os endereços fornecidos nesta tabela. Não há gravação no barramento CAN.",
     "Devices for collecting data. No writing to CAN bus. Press '+' to add device.": "Dispositivos para coleta de dados. Não há gravação no barramento CAN. Pressione '+' para adicionar dispositivo.",
-    "Update list of datapoints": "Atualizar lista de pontos de dados"
+    "Update list of datapoints": "Atualizar lista de pontos de dados",
+    "Start scan to update list of devices": "Inicie a verificação para atualizar a lista de dispositivos"
 }

package/admin/i18n/ru/translations.json

@@ -58,5 +58,6 @@
     "Collecting Data on Internal CAN Adapter": "Сбор данных о внутреннем CAN-адаптере",
     "Listen for data on addresses given in this table. No writing to CAN bus.": "Прослушайте данные по адресам, указанным в этой таблице. Нет записи в CAN-шину.",
     "Devices for collecting data. No writing to CAN bus. Press '+' to add device.": "Устройства для сбора данных. Нет записи в CAN-шину. Нажмите «+», чтобы добавить устройство.",
-    "Update list of datapoints": "Обновить список точек данных"
+    "Update list of datapoints": "Обновить список точек данных",
+    "Start scan to update list of devices": "Запустите сканирование, чтобы обновить список устройств."
 }

package/admin/i18n/uk/translations.json

@@ -58,5 +58,6 @@
     "Collecting Data on Internal CAN Adapter": "Збір даних про внутрішній адаптер CAN",
     "Listen for data on addresses given in this table. No writing to CAN bus.": "Прослухайте дані за адресами, наведені в цій таблиці. Немає запису на шину CAN.",
     "Devices for collecting data. No writing to CAN bus. Press '+' to add device.": "Пристрої для збору даних. Немає запису на шину CAN. Натисніть «+», щоб додати пристрій.",
-    "Update list of datapoints": "Оновити список точок даних"
+    "Update list of datapoints": "Оновити список точок даних",
+    "Start scan to update list of devices": "Почніть сканування, щоб оновити список пристроїв"
 }

package/admin/i18n/zh-cn/translations.json

@@ -58,5 +58,6 @@
     "Collecting Data on Internal CAN Adapter": "收集内部 CAN 适配器的数据",
     "Listen for data on addresses given in this table. No writing to CAN bus.": "侦听此表中给出的地址上的数据。不写入 CAN 总线。",
     "Devices for collecting data. No writing to CAN bus. Press '+' to add device.": "用于收集数据的设备。不写入 CAN 总线。按“+”添加设备。",
-    "Update list of datapoints": "更新数据点列表"
+    "Update list of datapoints": "更新数据点列表",
+    "Start scan to update list of devices": "开始扫描以更新设备列表"
 }

package/admin/jsonConfig.json

@@ -99,15 +99,6 @@
                     "hidden": "if ((data.tableUdsDevices) && (data.tableUdsDevices.length > 0)) { return true; } else {return false; }",
                     "newLine": true
                 },
-                "introTableScanIsActiveTxt": {
-                    "type": "staticText",
-                    "text": "UDS device scan is ongoing. This may take up to 20 seconds.",
-                    "newLine": true,
-                    "hidden": "if ((data.tableUdsDevices) && (data.tableUdsDevices.length > 0)) { return true; } else {return false; }",
-                    "style": {
-                        "color": "red"
-                    }
-                },
                 "introTableNoEmptyDevNameTxt": {
                     "type": "staticText",
                     "text": "'Device state name' must not be blank!",
@@ -126,11 +117,23 @@
                         "color": "red"
                     }
                 },
+                "tableUdsDevicesButton": {
+                    "type": "sendTo",
+                    "label": "Start scan to update list of devices",
+                    "variant": "outlined",
+                    "showProcess": true,
+                    "command": "getUdsDevices",
+                    "jsonData": "{}",
+                    "useNative": true,
+                    "hidden": "!_alive",
+                    "newLine": true,
+                    "sm": 12,
+                    "md": 12,
+                    "lg": 12
+                },
 
                 "tableUdsDevices": {
                     "type": "table",
-                    "defaultSendTo": "getUdsDevices",
-                    "jsonData": "${JSON.stringify(data.tableUdsDevices)}",
                     "uniqueColumns": ["devStateName"],
                     "newLine": true,
                     "sm": 12,
@@ -206,9 +209,6 @@
                     "label": "Start scan for datapoints of all devices",
                     "variant": "outlined",
                     "showProcess": true,
-                    "style": {
-                        "align": "right"
-                    },
                     "jsonData": "{}",
                     "command": "startDidScan",
                     "confirm": {

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "e3oncan",
-    "version": "0.6.9",
+    "version": "0.6.11",
     "news": {
+      "0.6.11": {
+        "en": "Improved layout of configuration dialog for device scan",
+        "de": "Verbessertes Layout des Konfigurationsdialogs für den Gerätescan",
+        "ru": "Улучшен диалог настройки для сканирования устройства",
+        "pt": "Melhor layout da caixa de diálogo de configuração para verificação do dispositivo",
+        "nl": "Verbeterde lay-out van configuratiedialoog voor apparaatscans",
+        "fr": "Mise en page améliorée de la boîte de dialogue de configuration pour l'analyse des périphériques",
+        "it": "Miglioramento del layout della finestra di dialogo di configurazione per la scansione del dispositivo",
+        "es": "Diseño mejorado del diálogo de configuración para el análisis del dispositivo",
+        "pl": "Ulepszony układ okna konfiguracji skanowania urządzenia",
+        "uk": "Покращений макет діалогу конфігурації для сканування пристроїв",
+        "zh-cn": "设备扫描配置对话框的改进版式"
+      },
+      "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');
@@ -47,7 +46,6 @@ class E3oncan extends utils.Adapter {
         this.udsDidForScan       = 256;    // Busidentification is in this id
         this.udsScanWorker       = new udsScan.udsScan();
         this.udsScanDevices      = [];     // UDS devices found during scan
-        this.doUdsDevScan        = false;
         this.udsDevAddrs         = [];
         this.udsDevStateNames    = [];
         this.udsDidsMaxNmbr      = 3000;    // Max. number of dids per device for scan
@@ -81,12 +79,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.');
-
         // Setup external CAN bus if required
         // ==================================
 
@@ -329,25 +321,18 @@ class E3oncan extends utils.Adapter {
             if (obj.command === 'getUdsDevices') {
                 if (obj.callback) {
                     if (!this.udsDevScanIsRunning) {
-                        if (this.doUdsDevScan) {
-                            let success = false;
-                            this.udsDevScanIsRunning = true;
-                            await this.log.silly(`Received data - ${JSON.stringify(obj)}`);
-                            //this.udsScanDevices = obj.message.udsDevices;
-                            success = await this.udsScanWorker.scanUdsDevices(this);
-                            await this.sendTo(obj.from, obj.command, this.udsDevices, obj.callback);
-                            if (success) this.doUdsDevScan = false;
-                            this.udsDevScanIsRunning = false;
-                        } else {
-                            // Scan not required. Do nothing
-                            this.sendTo(obj.from, obj.command, obj.message, obj.callback);
-                        }
+                        this.udsDevScanIsRunning = true;
+                        await this.log.silly(`Received data - ${JSON.stringify(obj)}`);
+                        await this.udsScanWorker.scanUdsDevices(this);
+                        await this.log.silly(`Data to send - ${JSON.stringify({native: {tableUdsDevices: this.udsDevices}})}`);
+                        await this.sendTo(obj.from, obj.command, {native: {tableUdsDevices: this.udsDevices}}, obj.callback);
+                        this.udsDevScanIsRunning = false;
                     } else {
                         await this.log.debug('Request "getUdsDevice" during running UDS scan!');
-                        this.sendTo(obj.from, obj.command, obj.message, obj.callback);
+                        this.sendTo(obj.from, obj.command, {native: {tableUdsDevices: this.udsDevices}}, obj.callback);
                     }
                 } else {
-                    this.sendTo(obj.from, obj.command, [], obj.callback);
+                    this.sendTo(obj.from, obj.command, {native: {tableUdsDevices: []}}, obj.callback);
                 }
             }
 

package/package.json

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