Merge pull request #104 from Grizzelbee/Development

v1.1.6 (2022-05-04)
Grizzelbee · May 4, 2022 · b109e87 · b109e87
2 parents 57586d1 + 26d87ef
commit b109e87
Show file tree

Hide file tree

Showing 5 changed files with 430 additions and 90 deletions.
diff --git 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.6 (2022-05-04)
+* (grizzelbee) Fix: [#103](https://github.com/Grizzelbee/ioBroker.resol/issues/103) Fixed support for Serial-to-LAN-Gateway connections (Disabled credentials handshake - which is not necessary over serial ports.)
+
 ### v1.1.5 (2022-04-29)
 * (grizzelbee) New: [#96](https://github.com/Grizzelbee/ioBroker.resol/issues/96) Fixed Cosmo-Multi-2 support (Faking a DeltaSol-E now)
 

diff --git a/io-package.json b/io-package.json
@@ -1,7 +1,7 @@
 {
     "common": {
         "name": "resol",
-        "version": "1.1.5",
+        "version": "1.1.6",
         "news": {
             "1.1.5": {
                 "en": "Fixed support for Cosmo Multi 2 controllers",
@@ -218,7 +218,6 @@
         "connectionPort": 7053,
         "vbusPassword": "",
         "vbusChannel": 7,
-        "vbusDataOnly": false,
         "vbusViaTag": "",
         "vbusInterval": 30
     },

diff --git a/main.js b/main.js
@@ -435,11 +435,15 @@ class resol extends utils.Adapter {
                 if (config.connectionDevice === 'serial') {
                     testSerialformat(config);
                     resolve('Config seems to be valid for USB/Serial.');
-                } else if (config.connectionDevice === 'lan' || config.connectionDevice === 'langw') {
+                } else if (config.connectionDevice === 'lan') {
                     testIP_and_FQDN_Format(config);
                     testPassword(config);
                     testPort(config);
-                    resolve('Config seems to be valid for LAN or LAN-Gateway.');
+                    resolve('Config seems to be valid for LAN.');
+                } else if (config.connectionDevice === 'langw') {
+                    testIP_and_FQDN_Format(config);
+                    testPort(config);
+                    resolve('Config seems to be valid for Serial-to-LAN-Gateway.');
                 } else if (config.connectionDevice === 'dl2' || config.connectionDevice === 'dl3') {
                     testIP_and_FQDN_Format(config);
                     testPort(config);
@@ -509,7 +513,7 @@ class resol extends utils.Adapter {
                     ctx.connection = new vbus.TcpConnection({
                         host: this.config.connectionIdentifier,
                         port: this.config.connectionPort,
-                        rawVBusDataOnly: this.config.vbusDataOnly
+                        rawVBusDataOnly: true
                     });
                     this.log.info('TCP Connection via LAN-gw to [' + this.config.connectionIdentifier + ':' + this.config.connectionPort + '] selected');
                     break;