Merge branch 'main' of github.com:raschy/ioBroker.deyeidc

raschy · Jan 2, 2024 · b46b16f · b46b16f
2 parents 029e7c4 + 84ea2b7
commit b46b16f
Show file tree

Hide file tree

Showing 4 changed files with 218 additions and 511 deletions.
diff --git a/admin/jsonConfig.json b/admin/jsonConfig.json
@@ -113,16 +113,15 @@
 						},
 						{
 							"type": "number",
-							"trim": false,
 							"attr": "rules",
 							"width": "15%",
 							"title": "rule",
 							"default": ""
 						},
 						{
 							"type": "text",
-							"trim": false,
 							"attr": "key",
+							"trim": true,
 							"width": "20%",
 							"title": "key",
 							"default": "",
@@ -131,7 +130,7 @@
 						},
 						{
 							"type": "text",
-							"trim": false,
+							"trim": true,
 							"attr": "name",
 							"width": "30%",
 							"title": "name",
@@ -141,23 +140,21 @@
 						},
 						{
 							"type": "text",
-							"trim": false,
+							"trim": true,
 							"attr": "unit",
 							"width": "15%",
 							"title": "unit",
 							"default": ""
 						},
 						{
 							"type": "number",
-							"trim": false,
 							"attr": "factor",
 							"width": "15%",
 							"title": "factor",
 							"default": 0
 						},
 						{
 							"type": "checkbox",
-							"trim": false,
 							"attr": "nullable",
 							"width": "15%",
 							"title": "nullable",
@@ -205,23 +202,22 @@
 						},
 						{
 							"type": "text",
-							"trim": false,
+							"trim": true,
 							"attr": "name",
 							"width": "30%",
 							"title": "name",
 							"default": ""
 						},
 						{
 							"type": "text",
-							"trim": false,
+							"trim": true,
 							"attr": "unit",
 							"width": "15%",
 							"title": "unit",
 							"default": ""
 						},
 						{
 							"type": "number",
-							"trim": false,
 							"attr": "factor",
 							"width": "15%",
 							"title": "factor",
@@ -240,4 +236,4 @@
 			}
 		}
 	}
-}
+}
diff --git a/main.js b/main.js
@@ -139,7 +139,7 @@ class Deyeidc extends utils.Adapter {
 				//this.log.debug('Connection error');
 				this.connectionActive = false;
 				this.setState('info.connection', { val: this.connectionActive, ack: true });
-				if (error.message.indexOf('EHOSTUNREACH') > 1 || error.message.indexOf('ECONRESET')) {
+				if (error.message.indexOf('EHOSTUNREACH') > 1 || error.message.indexOf('ECONRESET') > 1) {
 					this.log.debug(`No connection to inverter: '${error.message}'`);
 					this.offlineReset();
 				} else {
@@ -243,7 +243,7 @@ class Deyeidc extends utils.Adapter {
 		const req = 0;
 		const powerControlRegister = 40;
 		const data = [];
-		if (state.val > 100) {
+		if (state.val < 1 || state.val > 100) {
 			data[0] = 100;
 		} else {
 			data[0] = state.val;