Merge pull request #97 from Grizzelbee/Development

Development

.npmignore

@@ -24,10 +24,13 @@ iobroker.*.tgz
 
 # i18n intermediate files
 admin/i18n
+admin/i18n/
 
 # maintenance scripts
 maintenance/**
-
+.github/
+.github
+.snyk
 tsconfig.json
 *.ts
 *.cdr

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

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",

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"}
-]
+{"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*/
+]
+
+
+
+

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"}
+]}

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",