From 2665c1a57c567d001770af4c94633b775eae9441 Mon Sep 17 00:00:00 2001 From: grizzelbee Date: Tue, 26 Apr 2022 09:30:02 +0200 Subject: [PATCH 1/2] added unneeded files --- .npmignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.npmignore b/.npmignore index b543fc9..e998b9c 100644 --- a/.npmignore +++ b/.npmignore @@ -24,10 +24,13 @@ iobroker.*.tgz # i18n intermediate files admin/i18n +admin/i18n/ # maintenance scripts maintenance/** - +.github/ +.github +.snyk tsconfig.json *.ts *.cdr \ No newline at end of file From 8e78e3303bbc5067c3ef4bdaed652db967712ea3 Mon Sep 17 00:00:00 2001 From: grizzelbee Date: Thu, 28 Apr 2022 10:51:37 +0200 Subject: [PATCH 2/2] fixes #96 / support for DeltaSol-E, Cosmo-Multi-2 --- README.md | 3 ++ io-package.json | 14 ++++++++- lib/resol-setup/Setup-Resol-Types.js | 10 ++++-- lib/resol-setup/deltasol-e.js | 6 ++++ package-lock.json | 46 ++++++++++++++-------------- package.json | 8 ++--- 6 files changed, 57 insertions(+), 30 deletions(-) create mode 100644 lib/resol-setup/deltasol-e.js diff --git a/README.md b/README.md index 20fe26b..8c39614 100644 --- a/README.md +++ b/README.md @@ -146,6 +146,9 @@ Save the file and restart the adapter, you will find now a new object Rueckkuehl ## Todo ## Changelog +### v1.1.0 (2022-04-28) +* (grizzelbee) New: [#96](https://github.com/Grizzelbee/ioBroker.resol/issues/96) Added support for DeltaSol E and improved support for Cosmo Multi 2 controllers + ### v1.0.0 (2022-04-25) * (grizzelbee) New: [#94](https://github.com/Grizzelbee/ioBroker.resol/issues/94) Added support for Cosmo controllers (No Sensor connected = 888°C) * (grizzelbee) Upd: Pushed version from 0.4.4 to v1.0.0 to be compliant to semver diff --git a/io-package.json b/io-package.json index 0c03d43..849818e 100644 --- a/io-package.json +++ b/io-package.json @@ -1,8 +1,20 @@ { "common": { "name": "resol", - "version": "1.0.0", + "version": "1.1.0", "news": { + "1.1.0": { + "en": "New: Added support for DeltaSol E and improved support for Cosmo Multi 2 controllers", + "de": "Neu: Unterstützung für DeltaSol E und verbesserte Unterstützung für Cosmo Multi 2 Controller hinzugefügt", + "ru": "Новое: добавлена ​​поддержка DeltaSol E и улучшена поддержка контроллеров Cosmo Multi 2.", + "pt": "Novo: Adicionado suporte para DeltaSol E e suporte aprimorado para controladores Cosmo Multi 2", + "nl": "Nieuw: ondersteuning toegevoegd voor DeltaSol E en verbeterde ondersteuning voor Cosmo Multi 2-controllers", + "fr": "Nouveau : Ajout de la prise en charge de DeltaSol E et amélioration de la prise en charge des contrôleurs Cosmo Multi 2", + "it": "Novità: Aggiunto il supporto per DeltaSol E e migliorato il supporto per i controller Cosmo Multi 2", + "es": "Nuevo: soporte agregado para DeltaSol E y soporte mejorado para controladores Cosmo Multi 2", + "pl": "Nowość: Dodano obsługę DeltaSol E i ulepszoną obsługę kontrolerów Cosmo Multi 2", + "zh-cn": "新增内容：增加了对 DeltaSol E 的支持并改进了对 Cosmo Multi 2 控制器的支持" + }, "1.0.0": { "en": "New: Added support for Cosmo controllers (No Sensor connected = 888°C)\nUpd: Pushed version from 0.4.4 to v1.0.0 to be compliant to semver\nDependencies got updated", "de": "Neu: Unterstützung für Cosmo-Controller hinzugefügt (Kein Sensor angeschlossen = 888°C)\nUpd: Version von 0.4.4 auf v1.0.0 gepusht, um semver-konform zu sein\nAbhängigkeiten wurden aktualisiert", diff --git a/lib/resol-setup/Setup-Resol-Types.js b/lib/resol-setup/Setup-Resol-Types.js index 9b7fd43..4a0d4f3 100644 --- a/lib/resol-setup/Setup-Resol-Types.js +++ b/lib/resol-setup/Setup-Resol-Types.js @@ -7,5 +7,11 @@ {"id":21504,"setup":"deltatherm-hc","data":"resol-deltatherm-hc-xxx-data"}, {"id":16914,"setup":"deltasol-c","data":"resol-deltasol-c-104-data"}, {"id":28946,"setup":"deltasol-bx-plus","data":"resol-deltasol-bx-plus-xxx-data"}, -{"id":17019,"setup":"deltasol-bs4v2","data":"resol-deltasol-bs4v2-103-data"} -] \ No newline at end of file +{"id":17019,"setup":"deltasol-bs4v2","data":"resol-deltasol-bs4v2-103-data"}, +{"id":4176,"setup":"deltasol-e-v2","data":"resol-deltasol-e-v2-100-data"}, +{"id":30753,"setup":"deltasol-e-v2","data":"resol-deltasol-e-v2-100-data"} /* Cosmo Multi 2*/ +] + + + + diff --git a/lib/resol-setup/deltasol-e.js b/lib/resol-setup/deltasol-e.js new file mode 100644 index 0000000..1cb6c65 --- /dev/null +++ b/lib/resol-setup/deltasol-e.js @@ -0,0 +1,6 @@ +{"dp": [{"dpName":"AutoRueckkuehl", "name":"Automatic cool down of buffer.","type":"number","min":0,"max":1, "states":{"0":"Off","1":"On"}}, + {"dpName":"THolyCool", "name":"Temp. cooling buffer","type":"number","min":0,"max":800} +], + "fct": [{"name":"AutoRueckkuehl","cmds":[{"cmd":"ORueckkuehlung","val":"val"},{"cmd":"OHolyCool","val":"val"}]}, + {"name":"THolyCool","cmd":"THolyCool","val":"val"} +]} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 85eb292..e825ada 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,17 @@ { "name": "iobroker.resol", - "version": "0.4.4", + "version": "1.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "iobroker.resol", - "version": "0.4.4", + "version": "1.0.0", "license": "MIT", "dependencies": { "@iobroker/adapter-core": "^2.6.0", "@iobroker/plugin-sentry": "^1.2.0", - "@snyk/protect": "^1.912.0", + "@snyk/protect": "^1.914.0", "lodash": "^4.17.21", "resol-vbus": "^0.25.0" }, @@ -21,11 +21,11 @@ "@types/chai-as-promised": "^7.1.5", "@types/gulp": "^4.0.9", "@types/mocha": "^9.1.1", - "@types/node": "^17.0.27", + "@types/node": "^17.0.29", "@types/proxyquire": "^1.3.28", "@types/sinon": "^10.0.11", "@types/sinon-chai": "^3.2.8", - "axios": "^0.27.0", + "axios": "^0.27.2", "chai": "^4.3.6", "chai-as-promised": "^7.1.1", "eslint": "^8.14.0", @@ -399,9 +399,9 @@ "dev": true }, "node_modules/@snyk/protect": { - "version": "1.912.0", - "resolved": "https://registry.npmjs.org/@snyk/protect/-/protect-1.912.0.tgz", - "integrity": "sha512-4FkyYdlORqHrpONMYiJHZ/+7Naem4TcR6FEEPpyE4Syy7B4AxMhDk1dN0ddH5zHgEzylZUTZcXPPsycp4U/ykg==", + "version": "1.914.0", + "resolved": "https://registry.npmjs.org/@snyk/protect/-/protect-1.914.0.tgz", + "integrity": "sha512-UdN6fw2XXRi5O6mAnzRI3juJU1NsmF+VfU86dCeXWozjWq/YFCSIiB+gOk77tKhNb8Z8sWXF2QnPSgDOtzUO5g==", "bin": { "snyk-protect": "bin/snyk-protect" }, @@ -482,9 +482,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "17.0.27", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.27.tgz", - "integrity": "sha512-4/Ke7bbWOasuT3kceBZFGakP1dYN2XFd8v2l9bqF2LNWrmeU07JLpp56aEeG6+Q3olqO5TvXpW0yaiYnZJ5CXg==" + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", + "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==" }, "node_modules/@types/proxyquire": { "version": "1.3.28", @@ -936,9 +936,9 @@ } }, "node_modules/axios": { - "version": "0.27.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.0.tgz", - "integrity": "sha512-XV/WrPxXfzgZ8j4lcB5i6LyaXmi90yetmV/Fem0kmglGx+mpY06CiweL3YxU6wOTNLmqLUePW4G8h45nGZ/+pA==", + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", + "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", "dev": true, "dependencies": { "follow-redirects": "^1.14.9", @@ -7222,9 +7222,9 @@ "dev": true }, "@snyk/protect": { - "version": "1.912.0", - "resolved": "https://registry.npmjs.org/@snyk/protect/-/protect-1.912.0.tgz", - "integrity": "sha512-4FkyYdlORqHrpONMYiJHZ/+7Naem4TcR6FEEPpyE4Syy7B4AxMhDk1dN0ddH5zHgEzylZUTZcXPPsycp4U/ykg==" + "version": "1.914.0", + "resolved": "https://registry.npmjs.org/@snyk/protect/-/protect-1.914.0.tgz", + "integrity": "sha512-UdN6fw2XXRi5O6mAnzRI3juJU1NsmF+VfU86dCeXWozjWq/YFCSIiB+gOk77tKhNb8Z8sWXF2QnPSgDOtzUO5g==" }, "@types/chai": { "version": "4.3.1", @@ -7299,9 +7299,9 @@ "dev": true }, "@types/node": { - "version": "17.0.27", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.27.tgz", - "integrity": "sha512-4/Ke7bbWOasuT3kceBZFGakP1dYN2XFd8v2l9bqF2LNWrmeU07JLpp56aEeG6+Q3olqO5TvXpW0yaiYnZJ5CXg==" + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", + "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==" }, "@types/proxyquire": { "version": "1.3.28", @@ -7658,9 +7658,9 @@ "dev": true }, "axios": { - "version": "0.27.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.0.tgz", - "integrity": "sha512-XV/WrPxXfzgZ8j4lcB5i6LyaXmi90yetmV/Fem0kmglGx+mpY06CiweL3YxU6wOTNLmqLUePW4G8h45nGZ/+pA==", + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", + "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", "dev": true, "requires": { "follow-redirects": "^1.14.9", diff --git a/package.json b/package.json index 0b2a4e4..ac8adae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iobroker.resol", - "version": "1.0.0", + "version": "1.1.0", "description": "Support for Resol VBus devices", "author": { "name": "grizzelbee", @@ -27,7 +27,7 @@ "dependencies": { "@iobroker/adapter-core": "^2.6.0", "@iobroker/plugin-sentry": "^1.2.0", - "@snyk/protect": "^1.912.0", + "@snyk/protect": "^1.914.0", "lodash": "^4.17.21", "resol-vbus": "^0.25.0" }, @@ -37,11 +37,11 @@ "@types/chai-as-promised": "^7.1.5", "@types/gulp": "^4.0.9", "@types/mocha": "^9.1.1", - "@types/node": "^17.0.27", + "@types/node": "^17.0.29", "@types/proxyquire": "^1.3.28", "@types/sinon": "^10.0.11", "@types/sinon-chai": "^3.2.8", - "axios": "^0.27.0", + "axios": "^0.27.2", "chai": "^4.3.6", "chai-as-promised": "^7.1.1", "eslint": "^8.14.0",