iobroker.ebus 3.2.0 → 3.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -0
- package/admin/words.js +2 -2
- package/io-package.json +14 -1
- package/main.js +7 -7
- package/package.json +6 -6
package/README.md
CHANGED
|
@@ -55,6 +55,9 @@ Attention: command in datapoint ebus.0.cmd is deleted after executing of command
|
|
|
55
55
|
|
|
56
56
|
## Changelog
|
|
57
57
|
|
|
58
|
+
### 3.2.1 (2023-04-07)
|
|
59
|
+
* (René) dependencies updated
|
|
60
|
+
|
|
58
61
|
### 3.2.0 (2023-02-11)
|
|
59
62
|
* (René) **Attention** polled variables must be set as active in admin now
|
|
60
63
|
* (René) search available variables per circuit added in admin
|
package/admin/words.js
CHANGED
|
@@ -8,6 +8,8 @@
|
|
|
8
8
|
'use strict';
|
|
9
9
|
|
|
10
10
|
systemDictionary = {
|
|
11
|
+
"Circuit4Find": { "en": "Circuit in which parameters are searched ", "de": "Schaltung, in der nach Parametern gesucht wird", "ru": "Цепь, в которой ищутся параметры", "pt": "Circuito no qual se pesquisam parâmetros", "nl": "Circuit waarin parameters worden gezocht", "fr": "Circuit dans lequel les paramètres sont recherchés", "it": "Circuito in cui vengono cercati i parametri", "es": "Circuito en el que se buscan parámetros", "pl": "Obwód, w którym szukane są parametry", "uk": "Схема, в якій здійснюється пошук параметрів", "zh-cn": "搜索参数的电路"},
|
|
12
|
+
"active": { "en": "active", "de": "aktiv", "ru": "активный", "pt": "ativo", "nl": "actief", "fr": "actif", "it": "attivo", "es": "activo", "pl": "aktywny", "uk": "активний", "zh-cn": "积极的"},
|
|
11
13
|
"addParameter": { "en": "additional parameter", "de": "zusätzliche Parameter", "ru": "дополнительный параметр", "pt": "parâmetro adicional", "nl": "extra parameter", "fr": "paramètre supplémentaire", "it": "parametro aggiuntivo", "es": "parámetro adicional", "pl": "dodatkowy parametr", "uk": "додатковий параметр", "zh-cn": "附加参数"},
|
|
12
14
|
"circuit": { "en": "circuit", "de": "Schaltkreis", "ru": "схема", "pt": "o circuito", "nl": "stroomkring", "fr": "circuit", "it": "circuito", "es": "circuito", "pl": "okrążenie", "uk": "схема", "zh-cn": "电路"},
|
|
13
15
|
"ebus_adapter_settings": { "en": "ebus adapter settings", "de": "ebus Adaptereinstellungen", "ru": "настройки адаптера ebus", "pt": "Configurações do adaptador ebus", "nl": "ebus-adapterinstellingen", "fr": "Paramètres de l'adaptateur ebus", "it": "impostazioni dell'adattatore ebus", "es": "configuración del adaptador ebus", "pl": "ustawienia adaptera ebus", "uk": "налаштування адаптера ebus", "zh-cn": "ebus适配器设置"},
|
|
@@ -24,6 +26,4 @@ systemDictionary = {
|
|
|
24
26
|
"target_IP": { "en": "target IP", "de": "Ziel-IP", "ru": "целевой IP-адрес", "pt": "IP alvo", "nl": "doel-IP", "fr": "cible IP", "it": "IP di destinazione", "es": "IP objetivo", "pl": "docelowy adres IP", "uk": "цільовий IP", "zh-cn": "目标IP"},
|
|
25
27
|
"target_TelnetPort": { "en": "target telnet Port to write data", "de": "target telnet Port zum Schreiben von Daten", "ru": "целевой порт telnet для записи данных", "pt": "destino telnet porta para escrever dados", "nl": "doel telnet-poort om gegevens te schrijven", "fr": "Port telnet cible pour écrire des données", "it": "Porta telnet target per scrivere dati", "es": "target telnet Port para escribir datos", "pl": "docelowy port telnet do zapisu danych", "uk": "target telnet Порт для запису даних", "zh-cn": "目标telnet用于写入数据的端口"},
|
|
26
28
|
"useBoolean4Onoff": { "en": "use boolean instead string for datapoints with on/off values ", "de": "Verwenden Sie Boolean anstelle von Strings für Datenpunkte mit Ein-/Aus-Werten", "ru": "используйте логическое значение вместо строки для точек данных со значениями включения / выключения", "pt": "use booleano em vez de string para pontos de dados com valores on / off", "nl": "gebruik in plaats daarvan booleaanse string voor datapunten met aan/uit-waarden", "fr": "utiliser une chaîne booléenne à la place pour les points de données avec des valeurs activées/désactivées", "it": "usa la stringa booleana invece per i punti dati con valori on/off", "es": "use booleano en lugar de cadena para puntos de datos con valores de encendido / apagado", "pl": "użyj wartości logicznej zamiast ciągu dla punktów danych z wartościami włączonymi / wyłączonymi", "uk": "використовуйте логічне значення замість рядка для точок даних зі значеннями on/off", "zh-cn": "对具有开/关值的数据点使用布尔值代替字符串"},
|
|
27
|
-
"Circuit4Find": { "en": "Circuit in which parameters are searched ", "de": "Schaltung, in der nach Parametern gesucht wird", "ru": "Цепь, в которой ищутся параметры", "pt": "Circuito no qual se pesquisam parâmetros", "nl": "Circuit waarin parameters worden gezocht", "fr": "Circuit dans lequel les paramètres sont recherchés", "it": "Circuito in cui vengono cercati i parametri", "es": "Circuito en el que se buscan parámetros", "pl": "Obwód, w którym szukane są parametry", "uk": "Схема, в якій здійснюється пошук параметрів", "zh-cn": "搜索参数的电路"},
|
|
28
|
-
"active": { "en": "active", "de": "aktiv", "ru": "активный", "pt": "ativo", "nl": "actief", "fr": "actif", "it": "attivo", "es": "activo", "pl": "aktywny", "uk": "активний", "zh-cn": "积极的"},
|
|
29
29
|
};
|
package/io-package.json
CHANGED
|
@@ -1,8 +1,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "ebus",
|
|
4
|
-
"version": "3.2.
|
|
4
|
+
"version": "3.2.1",
|
|
5
5
|
"news": {
|
|
6
|
+
"3.2.1": {
|
|
7
|
+
"en": "dependencies updated",
|
|
8
|
+
"de": "Abhängigkeiten aktualisiert",
|
|
9
|
+
"ru": "зависимости обновлены",
|
|
10
|
+
"pt": "dependências atualizadas",
|
|
11
|
+
"nl": "afhankelijkheden bijgewerkt",
|
|
12
|
+
"fr": "dépendances mises à jour",
|
|
13
|
+
"it": "dipendenze aggiornate",
|
|
14
|
+
"es": "dependencias actualizadas",
|
|
15
|
+
"pl": "zaktualizowane zależności",
|
|
16
|
+
"uk": "залежності оновлено",
|
|
17
|
+
"zh-cn": "依赖更新"
|
|
18
|
+
},
|
|
6
19
|
"3.2.0": {
|
|
7
20
|
"en": "Attention: polled variables must be set to active \n\r search for available variables added",
|
|
8
21
|
"de": "Achtung: Gepollte Variablen müssen auf aktiv gesetzt werden\n\r Suche nach verfügbaren Variablen hinzugefügt",
|
package/main.js
CHANGED
|
@@ -193,7 +193,7 @@ async function DataRequest() {
|
|
|
193
193
|
let oPolledVars = [];
|
|
194
194
|
function FillPolledVars() {
|
|
195
195
|
|
|
196
|
-
if (
|
|
196
|
+
if ( adapter.config.PolledDPs !== undefined && adapter.config.PolledDPs != null && adapter.config.PolledDPs.length > 0) {
|
|
197
197
|
adapter.log.debug("use new object list for polled vars");
|
|
198
198
|
|
|
199
199
|
//2023-02-10 only active vars
|
|
@@ -232,7 +232,7 @@ function FillPolledVars() {
|
|
|
232
232
|
let oHistoryVars = [];
|
|
233
233
|
function FillHistoryVars() {
|
|
234
234
|
|
|
235
|
-
if (
|
|
235
|
+
if (adapter.config.HistoryDPs !== undefined && adapter.config.HistoryDPs != null && adapter.config.HistoryDPs.length > 0) {
|
|
236
236
|
adapter.log.debug("use new object list for history vars");
|
|
237
237
|
oHistoryVars = adapter.config.HistoryDPs;
|
|
238
238
|
}
|
|
@@ -268,7 +268,7 @@ function FillHistoryVars() {
|
|
|
268
268
|
async function ebusd_Command() {
|
|
269
269
|
const obj = await adapter.getStateAsync("cmd");
|
|
270
270
|
|
|
271
|
-
if (
|
|
271
|
+
if (obj !== undefined && obj != null) {
|
|
272
272
|
const cmds = obj.val;
|
|
273
273
|
if (cmds !== "") {
|
|
274
274
|
adapter.log.debug("got command(s): " + cmds);
|
|
@@ -712,7 +712,7 @@ async function ebusd_ReceiveData() {
|
|
|
712
712
|
|
|
713
713
|
let value = newData[org_key];
|
|
714
714
|
|
|
715
|
-
if (value == null || value
|
|
715
|
+
if (value == null || value === undefined) {
|
|
716
716
|
adapter.log.debug('Key : ' + key + ', Value : ' + newData[org_key] + " name " + name);
|
|
717
717
|
}
|
|
718
718
|
|
|
@@ -867,7 +867,7 @@ async function UpdateHistory(values, dates) {
|
|
|
867
867
|
|
|
868
868
|
const obj = await adapter.getStateAsync("history.date");
|
|
869
869
|
|
|
870
|
-
if (
|
|
870
|
+
if (obj !== undefined && obj != null) {
|
|
871
871
|
try {
|
|
872
872
|
let oEbusDates = [];
|
|
873
873
|
//adapter.log.debug("before " + obj.val);
|
|
@@ -935,7 +935,7 @@ async function UpdateHistoryValues(values, ctr, curDateCtr) {
|
|
|
935
935
|
|
|
936
936
|
const obj = await adapter.getStateAsync("history.value" + ctr);
|
|
937
937
|
|
|
938
|
-
if (
|
|
938
|
+
if (obj !== undefined && obj != null) {
|
|
939
939
|
try {
|
|
940
940
|
let oEbusValues = [];
|
|
941
941
|
if (obj !== null) {
|
|
@@ -1043,7 +1043,7 @@ async function AddObject(key, type) {
|
|
|
1043
1043
|
|
|
1044
1044
|
async function UpdateObject(key, value) {
|
|
1045
1045
|
try {
|
|
1046
|
-
if (
|
|
1046
|
+
if (value === undefined) {
|
|
1047
1047
|
adapter.log.warn("updateObject: not updated " + key + " value: " + value + " " + typeof value);
|
|
1048
1048
|
}
|
|
1049
1049
|
else if (value == null ) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "iobroker.ebus",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.1",
|
|
4
4
|
"description": "ioBroker ebus Adapter",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "René G.",
|
|
@@ -20,11 +20,11 @@
|
|
|
20
20
|
"url": "https://github.com/rg-engineering/ioBroker.ebus"
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@iobroker/adapter-core": "2.6.
|
|
23
|
+
"@iobroker/adapter-core": "2.6.8",
|
|
24
24
|
"flat": "5.0.2",
|
|
25
25
|
"net": "1.0.2",
|
|
26
26
|
"promise-socket": "7.0.0",
|
|
27
|
-
"cron": "2.
|
|
27
|
+
"cron": "2.3.0",
|
|
28
28
|
"axios": "0.27.2"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"@types/chai-as-promised": "7.1.5",
|
|
35
35
|
"@types/gulp": "4.0.10",
|
|
36
36
|
"@types/mocha": "10.0.1",
|
|
37
|
-
"@types/node": "18.11
|
|
37
|
+
"@types/node": "18.15.11",
|
|
38
38
|
"@types/proxyquire": "1.3.28",
|
|
39
39
|
"@types/request-promise-native": "1.0.18",
|
|
40
40
|
"@types/sinon": "10.0.13",
|
|
@@ -42,11 +42,11 @@
|
|
|
42
42
|
"axios": "0.27.2",
|
|
43
43
|
"chai": "4.3.7",
|
|
44
44
|
"chai-as-promised": "7.1.1",
|
|
45
|
-
"eslint": "8.
|
|
45
|
+
"eslint": "8.37.0",
|
|
46
46
|
"gulp": "4.0.2",
|
|
47
47
|
"mocha": "10.2.0",
|
|
48
48
|
"proxyquire": "2.1.3",
|
|
49
|
-
"sinon": "15.0.
|
|
49
|
+
"sinon": "15.0.3",
|
|
50
50
|
"sinon-chai": "3.7.0"
|
|
51
51
|
},
|
|
52
52
|
"main": "main.js",
|