iobroker.sun2000 0.3.0 → 0.3.1

package/README.md

@@ -72,6 +72,9 @@ The development of this adapter was inspired by discussions from the forum threa
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 0.3.1 (2024-02-12)
+* state `sun2000.0.collected.chargeDischargePowercharge` is not always refreshed #47
+
 ### 0.3.0 (2024-02-10)
 * add battery unit information for example temperature #40
 * modbus timeout, connect delay and delay can be configured #34

package/admin/jsonConfig.json

@@ -68,8 +68,8 @@
                 "connectDelay": {
                     "type": "number",
                     "label": "connect delay (ms)",
-                    "min" : 1000,
-                    "max" : 15000,
+                    "min" : 2000,
+                    "max" : 10000,
                     "newLine": true,
                     "tooltip": "delay after modbus connected"
                 },

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "sun2000",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "news": {
+      "0.3.1": {
+        "en": "state `sun2000.0.collected.chargeDischargePowercharge` is not always refreshed #47",
+        "de": "state `sun2000.0.collected.chargeDischargePowercharge` ist nicht immer erfrischt #47",
+        "ru": "состояние `sun2000.0.collected.chargeDischargePowercharge' не всегда обновляется #47",
+        "pt": "estado `sun2000.0.collected.chargeDischargePowercharge` nem sempre é atualizado #47",
+        "nl": "staat ",
+        "fr": "état `sun2000.0.collected.chargeDéchargePowercharge` n'est pas toujours rafraîchi #47",
+        "it": "stato `sun2000.0.colletto.chargeDischargePowercharge` non è sempre aggiornato #47",
+        "es": "estado `sun2000.0.collected.chargeDischargePowercharge` no siempre se actualiza #47",
+        "pl": "state 'sun2000.0.0 collected.chargeDischargePowercharge' nie zawsze jest odświeżona # 47",
+        "uk": "#47",
+        "zh-cn": "state `sun 2000.00.colled. 充电电源 ' 并不总是刷新47"
+      },
       "0.3.0": {
         "en": "add battery unit information for example temperature #40\nmodbus timeout, connect delay and delay can be configured #34\ndevice status as plain text `sun2000.0.inverter.x.derived.deviceStatus`\nIntroduction of a driver model. A separate driver can be created for each device #41",
         "de": "batterieeinheitsinformationen hinzufügen, zum beispiel temperatur #40\nmodbus timeout, verbinden verzögerung und verzögerung kann #34 konfiguriert werden\ngerätestatus als Klartext `sun2000.0.inverter.x.derived.deviceStatus `\nEinführung eines Fahrermodells. Ein separater Treiber kann für jedes Gerät #41 erstellt werden",

package/lib/drivers.js

@@ -223,7 +223,8 @@ class DriverSun2000 extends DriverBase{
 				type : deviceType.battery,
 				states : [{
 					state: {id: 'battery.chargeDischargePower', name: 'Charge/Discharge power', desc: '(>0 charging, <0 discharging)', type: 'number', unit: 'kW', role: 'value.power'},
-					register: {reg: 37765, type: dataType.int32, gain:1000},
+					register: {reg: 37765, type: dataType.int32, gain:1000}
+					//store : storeType.always
 				}]
 			},
 			{

package/lib/modbus_connect.js

@@ -79,18 +79,26 @@ class ModbusConnect extends DeviceInterface {
 
 	close() {
 		return new Promise((resolve) => {
-			this.client.close(() => {
+			if (this.client) {
+				this.client.close(() => {
+					resolve({});
+				});
+			} else {
 				resolve({});
-			} );
+			}
 		});
 	}
 
 	//https://github.com/yaacov/node-modbus-serial/issues/96
 	_destroy() {
 		return new Promise((resolve) => {
-			this.client.destroy(() => {
+			if (this.client) {
+				this.client.destroy(() => {
+					resolve({});
+				});
+			} else {
 				resolve({});
-			});
+			}
 		});
 	}
 
@@ -202,7 +210,7 @@ class ModbusConnect extends DeviceInterface {
 
 		//### Test ###
 		if (testMode) {
-			if (this._options.delay  < 1500 && successful) successful = false;
+			if (this._options.delay  < 5000 && successful) successful = false;
 		}
 		//### Test ###
 		if (successful) {
@@ -235,11 +243,12 @@ class ModbusConnect extends DeviceInterface {
 						//Bleibende Regelabweichnung beseitigen
 						if (this._options.delay-50 < this._options.min ) this._options.delay = this._options.min;
 
-						if (this._options.timeout > 15000 && this._options.delay*3 < this._options.timeout ) {
-							this._options.timeout = 15000;
+						if (this._options.delay*5 < this._options.timeout ) {
+							this._options.timeout = this._options.delay*5;
+							if (this._options.timeout < 10000) this._options.timeout = 10000;
 						}
 
-						if (this._options.connectDelay > 5000 && this._options.Delay*1.5 < this._options.connectDelay) {
+						if (this._options.Delay*1.5 < this._options.connectDelay) {
 							this._options.connectDelay = this._options.Delay*1.5;
 							if (this._options.connectDelay < 2000) this._options.connectDelay = 2000;
 						}
@@ -264,8 +273,8 @@ class ModbusConnect extends DeviceInterface {
 					//increase
 					this._options.delay += getGradient(this.info);
 				}
-				if (this._options.delay*3 > this._options.timeout) {
-					this._options.timeout = this._options.delay*3;
+				if (this._options.delay*5 > this._options.timeout) {
+					this._options.timeout = this._options.delay*5;
 				}
 				if (this._options.delay*1.5 > this._options.connectDelay) {
 					this._options.connectDelay = this._options.delay*1.5;

package/lib/register.js

@@ -30,10 +30,10 @@ class Registers {
 					let inPowerEff = 0;
 					let chargeDischarge = 0;
 					for (const inverter of inverters) {
-						sum  += this.stateCache.get(inverter.path+'.activePower')?.value;
-						inPower += this.stateCache.get(inverter.path+'.inputPower')?.value;
+						sum  += this.stateCache.get(inverter.path+'.activePower')?.value ?? 0;
+						inPower += this.stateCache.get(inverter.path+'.inputPower')?.value ?? 0;
 						inPowerEff += this.stateCache.get(inverter.path+'.derived.inputPowerWithEfficiencyLoss')?.value;
-						chargeDischarge += this.stateCache.get(inverter.path+'.battery.chargeDischargePower')?.value;
+						chargeDischarge += this.stateCache.get(inverter.path+'.battery.chargeDischargePower')?.value ?? 0;
 					}
 					//this.adapter.log.debug('++++ collected.inputPower '+inPower);
 					this.stateCache.set('collected.inputPower',inPower,{type: 'number', renew : true});
@@ -82,11 +82,11 @@ class Registers {
 						inYield += this.stateCache.get(inverter.path+'.derived.dailyInputYield')?.value; //deprecated
 						solarYield += this.stateCache.get(inverter.path+'.derived.dailySolarYield')?.value;
 						enYield += this.stateCache.get(inverter.path+'.accumulatedEnergyYield')?.value;
-						charge += this.stateCache.get(inverter.path+'.battery.currentDayChargeCapacity')?.value;
-						disCharge += this.stateCache.get(inverter.path+'.battery.currentDayDischargeCapacity')?.value;
-						totalCharge += this.stateCache.get(inverter.path+'.battery.totalCharge')?.value;
-						totalDisCharge += this.stateCache.get(inverter.path+'.battery.totalDischarge')?.value;
 						if (this.stateCache.get(inverter.path+'.battery.ratedCapacity')?.value > 0) {
+							charge += this.stateCache.get(inverter.path+'.battery.currentDayChargeCapacity')?.value;
+							disCharge += this.stateCache.get(inverter.path+'.battery.currentDayDischargeCapacity')?.value;
+							totalCharge += this.stateCache.get(inverter.path+'.battery.totalCharge')?.value;
+							totalDisCharge += this.stateCache.get(inverter.path+'.battery.totalDischarge')?.value;
 							load += this.stateCache.get(inverter.path+'.battery.ratedCapacity')?.value * this.stateCache.get(inverter.path+'.battery.SOC')?.value;
 							ratedCap += this.stateCache.get(inverter.path+'.battery.ratedCapacity')?.value;
 						}
@@ -171,7 +171,7 @@ class Registers {
 			const detectedModelId = inverter.device.info?.detectedModelId;
 			if ( detectedModelId > 0) {
 				this.createInverterInstance(inverter,detectedModelId);
-				this.adapter.log.debug(JSON.stringify(inverter.device.info));
+				this.adapter.log.debug('DeviceInfo: '+inverter.index+' '+JSON.stringify(inverter.device.info));
 				if (inverter.device.info?.modelId !== detectedModelId) {
 					this.adapter.log.error('No Huawei device could be assigned for model id '+detectedModelId);
 					this.adapter.log.info('Please create an issue: https://github.com/bolliy/ioBroker.sun2000/issues');
@@ -193,9 +193,9 @@ class Registers {
 					if (!hook.initState) {
 						await this.initState('',state);
 					}
-					hook.fn(this.adapter.inverters);
 				}
 				hook.initState = true;
+				hook.fn(this.adapter.inverters);
 			}
 		}
 		this.storeStates(); //fire and forget

package/main.js

@@ -224,13 +224,13 @@ class Sun2000 extends utils.Adapter {
 			this.settings.modbusAdjust = info.modbusAdjust;
 			this.settings.modbusDelay = Math.round(info.delay);
 			//siehe jsonConfig.json
-			if (this.settings.modbusDelay > 6000) this.settings.modbusDelay = 6000; //siehe jsonConfig.json
-			this.settings.modbusTimeout = info.timeout;
+			if (this.settings.modbusDelay > 6000) this.settings.modbusDelay = 6000;
+			this.settings.modbusTimeout = Math.round(info.timeout);
 			if (this.settings.modbusTimeout > 30000) this.settings.modbusTimeout = 30000;
 			if (this.settings.modbusTimeout < 5000) this.settings.modbusTimeout = 5000;
-			this.settings.modbusConnectDelay = info.connectDelay;
-			if (this.settings.modbusConnectDelay > 15000) this.settings.modbusConnectDelay = 15000;
-			if (this.settings.modbusConnectDelay < 1000) this.settings.modbusConnectDelay = 1000;
+			this.settings.modbusConnectDelay = Math.round(info.connectDelay);
+			if (this.settings.modbusConnectDelay > 10000) this.settings.modbusConnectDelay = 10000;
+			if (this.settings.modbusConnectDelay < 2000) this.settings.modbusConnectDelay = 2000;
 			//orignal Interval
 			this.settings.highIntervall = this.config.updateInterval*1000;
 			await this.adjustInverval();
@@ -329,6 +329,7 @@ class Sun2000 extends utils.Adapter {
 			if (left < 0) return 0;
 			return left;
 		}
+
 		const start = new Date().getTime();
 		this.log.debug('### DataPolling START '+ Math.round((start-this.lastTimeUpdated)/1000)+' sec ###');
 		if (this.lastTimeUpdated > 0 && (start-this.lastTimeUpdated)/1000 > this.settings.highIntervall/1000 + 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sun2000",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "sun2000",
   "author": {
     "name": "bolliy",