iobroker.sun2000 0.1.2-alpha.3 → 0.1.3

package/README.md

@@ -26,6 +26,8 @@ The development of this adapter was inspired by discussions from the forum threa
 * HUAWEI Luna2000 Battery
 * HUAWEI Smart Power Sensor DTSU666-H or DDSU666-H
 
+[Huawei product information](https://solar.huawei.com/en/professionals/all-products?residential-smart-pv)
+
 ## Feature list
 
 * Maximum 5 inverters (master/slave) can be processed, each with a battery module (max. 30kWh).
@@ -33,7 +35,6 @@ The development of this adapter was inspired by discussions from the forum threa
 * States are only written for changed data from the inverter. This relieves the burden on the iobroker instance.
 * The states “inputPower” or “activePower” in the “collected” path can be monitored with a “was updated” trigger element. Because these states are always written within the set interval.
 
-
 ## Configure inverters
 
 In order to use the Modbus connection, all Huawei devices must use the latest firmware
@@ -45,8 +46,9 @@ To log into the app as an `installer` you need usually the password:`00000a` or
 You may also need a password to connect to the inverters own WLAN: `Changeme` 
 
 After login on the inverter go to `Settings` (Einstellungen) > `Communication configuration` (Kommunikationskonfiguration) > `Dongle parameter settings` (Dongle‐Parametereinstellungen) > `Modbus TCP` > Activate the `connection without restriction` (Verbindung uneingeschränkt aktivieren). You can also enter the Modbus comm address at the same time read out. 
-If you use two inverters, then connect to the second inverter and read the communication address there too. A maximum of 2 inverters can be connected via Modbus. 
+If you use two inverters, then connect to the second inverter and read the communication address there too. 
 
+[How activate 'Modbus TCP' - from huawei forum](https://forum.huawei.com/enterprise/en/modbus-tcp-guide/thread/789585-100027)
 
 ## Settings
 
@@ -61,19 +63,16 @@ If you use two inverters, then connect to the second inverter and read the commu
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
-### 0.1.2-alpha.3 (2024-01-12)
-* fix: wrong deploying date
+### 0.1.3 (2024-01-17)
+* display the data from PV strings (#27)
+* optimize the timing of interval loop
+* improved handling of read timeouts from more then 2 inverters
 
-### 0.1.2-alpha.2 (2024-01-12)
+### 0.1.2 (2024-01-12)
 * fix: no Data if interval less 20 sec (#24)
-
-### 0.1.2-alpha.1 (2024-01-11)
-* deploy npm package
-
-### 0.1.2-alpha.0 (2024-01-11)
 * prepare collected values more precisely
 * expand up to 5 inverters #18
-* fix problems with multiple inverters
+* fix: problems with multiple inverters
 
 ### 0.1.1 (2024-01-07)
 * fix some collected values

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "sun2000",
-    "version": "0.1.2-alpha.3",
+    "version": "0.1.3",
     "news": {
+      "0.1.3": {
+        "en": "display the data from PV strings (#27)\noptimize the timing of interval loop\nimproved handling of read timeouts from more then 2 inverters",
+        "de": "die Daten von PV-Strings anzeigen (#27)\noptimieren sie das timing der intervallschleife\nverbesserte handhabung von lesezeitausgängen von mehr als 2 wechselrichtern",
+        "ru": "отобразить данные из строк PV (#27)\nоптимизировать время интервального цикла\nулучшенная обработка считываемых таймаутов от более чем 2 инверторов",
+        "pt": "exibir os dados de strings PV (#27)\notimizar o tempo de loop de intervalo\nmelhor manuseio de leitura timeouts de mais, em seguida, 2 inversores",
+        "nl": "weergave van de gegevens van PV strings (#27)\noptimaliseren van de timing van intervallus\nverbeterde behandeling van leestijd-outs van meer dan 2 inverters",
+        "fr": "afficher les données des chaînes PV (#27)\noptimiser le timing de la boucle d'intervalle\namélioration de la gestion des temps de lecture de plus de 2 onduleurs",
+        "it": "visualizzare i dati dalle stringhe PV (#27)\nottimizzare la tempistica del loop di intervallo\nmigliore gestione dei timeout di lettura da più di 2 inverter",
+        "es": "mostrar los datos de cadenas PV (#27)\noptimizar el tiempo del bucle de intervalo\nmejor manejo de tiempo de lectura de más de 2 inversores",
+        "pl": "wyświetla dane z łańcuchów fotowoltaicznych (# 27)\noptymalizacja czasu pętli interwałowej\nulepszona obsługa timeout odczytu z więcej niż 2 inwerterów",
+        "uk": "відображення даних з ПВ-рядок (#27)\nоптимізуйте частимізацію інтервалної петлі\nполіпшена обробка часу читання з більш ніж 2 інверторів",
+        "zh-cn": "显示 PV 字符串中的数据 (# 27)\n优化间隔循环的时间\n改进对超过2个反转器的断读处理"
+      },
+      "0.1.2": {
+        "en": "fix: no Data if interval less 20 sec (#24)\nprepare collected values more precisely\nexpand up to 5 inverters #18\nfix problems with multiple inverters",
+        "de": "fix: keine Daten, wenn Intervall weniger 20 sec (#24)\ndie gesammelten werte genauer\nbis zu 5 wechselrichtern #18 erweitern\nprobleme mit mehreren wechselrichtern beheben",
+        "ru": "исправление: нет данных, если интервал менее 20 секунд (#24)\nготовить собранные значения точнее\n#18\nисправить проблемы с несколькими инверторами",
+        "pt": "correção: não Dados se intervalo menos 20 segundos (#24)\npreparar valores coletados mais precisamente\nexpandir até 5 inversores #18\ncorrigir problemas com vários inversores",
+        "nl": "fix: geen Gegevens indien interval minder 20 sec (#24)\nverzamelde waarden nauwkeuriger voorbereiden\nuit te breiden tot 5 omvormers #18\nproblemen oplossen met meerdere inverters",
+        "fr": "correction : pas de données si l'intervalle est inférieur à 20 secondes (#24)\npréparer plus précisément les valeurs collectées\nétendre jusqu'à 5 onduleurs #18\nrésoudre les problèmes avec plusieurs onduleurs",
+        "it": "correzione: no Dati se intervallo meno 20 sec (#24)\npreparare i valori raccolti più precisamente\nespandere fino a 5 inverter #18\nrisolvere problemi con più inverter",
+        "es": "fijado: no Datos si intervalo menos 20 segundos (#24)\npreparar los valores recogidos con mayor precisión\nampliar hasta 5 inversores #18\nsolucionar problemas con múltiples inversores",
+        "pl": "fix: no Data if interval less 20 sec (# 24)\ndokładniej przygotować zebrane wartości\nrozszerzyć do 5 inwerterów # 18\nrozwiązać problemy z wieloma inwerterami",
+        "uk": "виправити: немає даних, якщо інтервал менше 20 сек (#24)\nпідготовка зібраних значень точно\nрозширити до 5 інверторів #18\nвиправити проблеми з декількома інверторами",
+        "zh-cn": "固定: 如果间隔小于20秒(# 24) 则无数据\n更准确地编制收集的数值\n扩展至5个反转器 # 18\n解决多个反转器的问题"
+      },
       "0.1.2-alpha.3": {
         "en": "fix: wrong deploying date",
         "de": "fix: falsches bereitstellungsdatum",

package/lib/modbus_connect.js

@@ -22,7 +22,6 @@ class ModbusConnect extends DeviceInterface {
 	constructor(adapterInstance,ip,port) {
 		super(ip,port);
 		this.adapter = adapterInstance;
-		this.lastErrno = 0;
 		this._id = 0;
 	}
 
@@ -81,8 +80,9 @@ class ModbusConnect extends DeviceInterface {
 
 	async _checkError(err) {
 		if (err.modbusCode == null) {
+			this.adapter.log.debug('modbusCode == 0!');
+			await this.close();
 			//https://github.com/yaacov/node-modbus-serial/issues/96
-			//this.adapter.log.debug('Client destroy!');
 			//await this._destroy();
 			//this.adapter.log.debug('Client destroy!');
 			await this._create();

package/lib/register.js

@@ -151,6 +151,10 @@ class Registers {
 					state: {id: 'info.ratedPower', name: 'Rated power', type: 'number', unit: 'kW', role: 'value.power'},
 					register: {reg: 30073, type: dataType.int32, gain:1000}
 				},
+				{
+					state: {id: 'info.numberPVStrings', name: 'Number of PV Strings', type: 'number', unit: '', role: 'value'},
+					register: {reg: 30071, type: dataType.uint16}
+				},
 				{
 					state: {id: 'info.numberMPPTrackers', name: 'Number of MPP trackers', type: 'number', unit: '', role: 'value'},
 					register: {reg: 30072, type: dataType.uint16}
@@ -326,7 +330,45 @@ class Registers {
 					{
 						state: {id: 'dailyEnergyYield', name: 'Daily Energy Yield', type: 'number', unit: 'kWh', role: 'value.power.produced'},
 						register: {reg: 32114, type: dataType.uint32, gain: 100}
-					}]
+					}
+				],
+				preHook: (path,reg) => {
+					const noPVString = this.stateCache.get(path+'info.numberPVStrings')?.value;
+					if (noPVString > 0) {
+						if (!stringFieldsTemplate.generated) stringFieldsTemplate.generated = 0;
+						if (stringFieldsTemplate.generated < noPVString) {
+							for (let i = stringFieldsTemplate.generated; i < noPVString; i++) {
+								//clonen
+								//const statePV = Object.assign({},stringFieldsTemplate.states[0]);
+								const statePV = JSON.parse(JSON.stringify(stringFieldsTemplate.states[0]));
+								const stateCu = JSON.parse(JSON.stringify(stringFieldsTemplate.states[1]));
+								const statePo = JSON.parse(JSON.stringify(stringFieldsTemplate.states[2]));
+								statePV.state.id = 'string.PV'+(i+1)+'Voltage';
+								statePV.register.reg = (stringFieldsTemplate.states[0].register?.reg ?? 0)+ (i*2);
+								statePV.register.type = stringFieldsTemplate.states[0].register?.type; //types are not copied?!
+								stateCu.state.id = 'string.PV'+(i+1)+'Current';
+								stateCu.register.reg = (stringFieldsTemplate.states[1].register?.reg ?? 0)+ (i*2);
+								stateCu.register.type = stringFieldsTemplate.states[1].register?.type;
+								statePo.state.id = 'string.PV'+(i+1)+'Power';
+								reg.states.push(statePV);
+								reg.states.push(stateCu);
+								reg.states.push(statePo);
+							}
+						}
+						stringFieldsTemplate.generated = noPVString;
+					}
+				},
+				postHook: (path) => {
+					const noPVString = this.stateCache.get(path+'info.numberPVStrings')?.value;
+					if (noPVString > 0) {
+						for (let i = 1; i <= noPVString; i++) {
+							const voltage = this.stateCache.get(path+'string.PV'+i+'Voltage')?.value;
+							const current = this.stateCache.get(path+'string.PV'+i+'Current')?.value;
+							this.stateCache.set(path+'string.PV'+i+'Power',Math.round(voltage*current),{type: 'number'});
+						}
+					}
+				}
+
 			},
 			{
 				address : 37100,
@@ -457,6 +499,23 @@ class Registers {
 				]
 			}
 		];
+		//Vorlage für die StringsRegiter
+		const stringFieldsTemplate = {
+			states : [
+				{
+					state: {id: 'string.PV1Voltage', name: 'string voltage', type: 'number', unit: 'V', role: 'value.voltage'},
+					register: {reg: 32016, type: dataType.int16, length: 1, gain: 10}
+				},
+				{
+					state: {id: 'string.PV1Current', name: 'string current', type: 'number', unit: 'A', role: 'value.current'},
+					register: {reg: 32017, type: dataType.int16, length: 1, gain: 100}
+				},
+				{
+					state: {id: 'string.PV1Power', name: 'string power', type: 'number', unit: 'W', role: 'value.power'}
+				}
+			]
+		};
+
 		this.postUpdateHooks = [
 			{
 				refresh : dataRefreshRate.low,
@@ -469,7 +528,7 @@ class Registers {
 				}
 			}
 		];
-		this.processHooks = [
+		this.postProcessHooks = [
 			{
 				refresh : dataRefreshRate.high,
 				states : [
@@ -623,6 +682,7 @@ class Registers {
 
 	async processRegister(reg,data) {
 		const path = this.getStatePath(reg.type);
+		if (reg.preHook) reg.preHook(path,reg);
 		if (reg.states) {
 			for(const field of reg.states) {
 				const state = field.state;
@@ -658,7 +718,7 @@ class Registers {
 		let readRegisters = 0;
 		for (const reg of this.registerFields) {
 			if (duration) {
-				if (new Date().getTime() - start > (duration - 3000)) {
+				if (new Date().getTime() - start > (duration - 1000)) {
 					this.adapter.log.debug('Duration: '+Math.round(duration/1000)+' used time: '+ (new Date().getTime() - start)/1000);
 					break;
 				}
@@ -722,7 +782,7 @@ class Registers {
 
 
 	async runProcessHooks(refreshRate) {
-		for (const hook of this.processHooks) {
+		for (const hook of this.postProcessHooks) {
 			if (dataRefreshRate.compare(refreshRate,hook.refresh)) {
 				for (const state of hook.states) {
 					if (!hook['initState'+this.inverterInfo.index]) {
@@ -736,6 +796,21 @@ class Registers {
 		this.storeStates(); //fire and forget
 	}
 
+	/*
+	setStateOfStrings() {
+		jsonPricesTomorrow = jsonPricesToday.map( x =>
+		{
+			//console.log(x);
+			const json = Object.assign({}, x); //Object clonen, flaches Clonen!
+			const date = new Date(json.startsAt);
+			// add a day
+			date.setDate(date.getDate() + 1);
+			json.startsAt = date.toISOString();
+			return json;
+		} );
+	}
+	*/
+
 	async _loadStates() {
 		let value = await this.adapter.getStateAsync('collected.gridExportStart');
 		this.stateCache.set('collected.gridExportStart',value?.val, {type : 'number', stored : true });

package/main.js

@@ -26,7 +26,8 @@ class Sun2000 extends utils.Adapter {
 		});
 
 		this.lastTimeUpdated = 0;
-		this.lastStateUpdated = 0;
+		this.lastStateUpdatedHigh = 0;
+		this.lastStateUpdatedLow = 0;
 		this.isConnected = false;
 		this.inverters = [];
 		this.settings = {
@@ -54,7 +55,7 @@ class Sun2000 extends utils.Adapter {
 		await this.extendObjectAsync('info', {
 			type: 'channel',
 			common: {
-				name: 'info',
+				name: 'channel info',
 				role: 'info'
 			},
 			native: {}
@@ -76,16 +77,14 @@ class Sun2000 extends utils.Adapter {
 		await this.extendObjectAsync('meter', {
 			type: 'device',
 			common: {
-				name: 'meter',
-				role: 'info'
+				name: 'device meter'
 			},
 			native: {}
 		});
 		await this.extendObjectAsync('collected', {
 			type: 'channel',
 			common: {
-				name: 'collected',
-				role: 'info'
+				name: 'channel collected'
 			},
 			native: {}
 		});
@@ -93,21 +92,19 @@ class Sun2000 extends utils.Adapter {
 		await this.extendObjectAsync('inverter', {
 			type: 'device',
 			common: {
-				name: 'meter',
-				role: 'info'
+				name: 'device inverter'
 			},
 			native: {}
 		});
 
-		//ES6 use a for (const [index, item] of array.entries())  of loop
-		//for (const [i, item] of this.conf.entries()) {
+		//ES6 use a for (const [index, item] of array.entries()) of loop
 		for (const [i, item] of this.inverters.entries()) {
 			const path = 'inverter.'+String(i);
 			item.path = path;
 			await this.extendObjectAsync(path, {
 				type: 'channel',
 				common: {
-					name: 'modbus'+i,
+					name: 'channel modbus'+i,
 					role: 'indicator'
 				},
 				native: {}
@@ -116,7 +113,15 @@ class Sun2000 extends utils.Adapter {
 			await this.extendObjectAsync(path+'.grid', {
 				type: 'channel',
 				common: {
-					name: 'grid',
+					name: 'channel grid'
+				},
+				native: {}
+			});
+
+			await this.extendObjectAsync(path+'.info', {
+				type: 'channel',
+				common: {
+					name: 'channel info',
 					role: 'info'
 				},
 				native: {}
@@ -125,8 +130,15 @@ class Sun2000 extends utils.Adapter {
 			await this.extendObjectAsync(path+'.battery', {
 				type: 'channel',
 				common: {
-					name: 'battery',
-					role: 'info'
+					name: 'channel battery'
+				},
+				native: {}
+			});
+
+			await this.extendObjectAsync(path+'.string', {
+				type: 'channel',
+				common: {
+					name: 'channel string'
 				},
 				native: {}
 			});
@@ -134,8 +146,7 @@ class Sun2000 extends utils.Adapter {
 			await this.extendObjectAsync(path+'.derived', {
 				type: 'channel',
 				common: {
-					name: 'derived',
-					role: 'indicator'
+					name: 'channel derived'
 				},
 				native: {}
 			});
@@ -213,18 +224,26 @@ class Sun2000 extends utils.Adapter {
 			if (!this.lastTimeUpdated) this.lastUpdated = 0;
 			if (this.lastTimeUpdated > 0) {
 				const sinceLastUpdate = new Date().getTime() - this.lastTimeUpdated; //ms
-				this.log.debug('Watchdog: time to last update '+sinceLastUpdate/1000+' sec');
+				this.log.debug('Watchdog: time of last update '+sinceLastUpdate/1000+' sec');
 				const lastIsConnected = this.isConnected;
-				this.isConnected = this.lastStateUpdated > 0 && sinceLastUpdate < this.settings.intervall*2;
-				this.log.debug('lastIsConncted '+lastIsConnected+' isConnectetd '+this.isConnected+' lastStateupdated '+this.lastStateUpdated);
+				this.isConnected = this.lastStateUpdatedHigh > 0 && sinceLastUpdate < this.settings.intervall*3;
+				if (this.lastStateUpdatedLow == 0) {
+					if (this.lastStateUpdatedHigh == 0) {
+						this.log.warn('Not data can be read! Please check your settings.');
+					} else {
+						this.log.warn('Not all data can be read! Please reduce the intervall value.');
+					}
+				}
+				if (this.isConnected !== lastIsConnected ) this.setState('info.connection', this.isConnected, true);
+				this.lastStateUpdatedLow = 0;
+				this.lastStateUpdatedHigh = 0;
 
-				if (this.isConnected !== lastIsConnected ) 	this.setState('info.connection', this.isConnected, true);
 				if (sinceLastUpdate > this.settings.intervall*10) {
 					this.log.warn('watchdog: restart Adapter...');
 					this.restart();
 				}
 			}
-		},30000);
+		},60000);
 	}
 
 
@@ -265,46 +284,38 @@ class Sun2000 extends utils.Adapter {
 	}
 
 	async dataPolling() {
-		function timeLeft(target) {
-			const left = target - new Date().getTime();
+
+		function timeLeft(target,factor =1) {
+			const left = Math.round((target - new Date().getTime())*factor);
 			if (left < 0) return 0;
 			return left;
 		}
 
 		const start = new Date().getTime();
-
-		this.log.debug('### DataPolling START <> '+ Math.round((start-this.lastTimeUpdated)/1000)+' sec ###');
+		this.log.debug('### DataPolling START '+ Math.round((start-this.lastTimeUpdated)/1000)+' sec ###');
 		if (this.lastTimeUpdated > 0 && (start-this.lastTimeUpdated)/1000 > this.settings.intervall/1000 + 1) {
 			this.log.warn('time intervall '+(start-this.lastTimeUpdated)/1000+' sec');
 		}
 		this.lastTimeUpdated = start;
-		let stateUpdated = 0;
-
 		const nextLoop = this.settings.intervall - start % (this.settings.intervall) + start;
 
 		//High Loop
 		for (const item of this.inverters) {
 			this.modbusClient.setID(item.modbusId);
-			//this.log.info('### Left Time '+timeLeft/1000);
-			stateUpdated += await this.state.updateStates(item,this.modbusClient,dataRefreshRate.high,timeLeft(nextLoop));
+			this.lastStateUpdatedHigh += await this.state.updateStates(item,this.modbusClient,dataRefreshRate.high,timeLeft(nextLoop));
 		}
 
-		if (timeLeft(nextLoop) > 2000) {
+		if (timeLeft(nextLoop) > 500) {
 			await this.state.runProcessHooks(dataRefreshRate.high);
-
 			//Low Loop
-			for (const item of this.inverters) {
+			for (const [i,item] of this.inverters.entries()) {
 				this.modbusClient.setID(item.modbusId);
-				//this.log.info('### Left Time '+timeLeft/1000);
-				stateUpdated += await this.state.updateStates(item,this.modbusClient,dataRefreshRate.low,timeLeft(nextLoop));
-			}
-			if (timeLeft(nextLoop) > 1000) {
-				await this.state.runProcessHooks(dataRefreshRate.low);
+				//this.log.debug('+++++ Loop: '+i+' Left Time: '+timeLeft(nextLoop,(i+1)/this.inverters.length)+' Faktor '+((i+1)/this.inverters.length));
+				this.lastStateUpdatedLow += await this.state.updateStates(item,this.modbusClient,dataRefreshRate.low,timeLeft(nextLoop,(i+1)/this.inverters.length));
 			}
+			await this.state.runProcessHooks(dataRefreshRate.low);
 		}
 
-		this.lastStateUpdated  = stateUpdated;
-
 		if (this.pollingTimer) this.clearTimeout(this.pollingTimer);
 		this.pollingTimer = this.setTimeout(() => {
 			this.dataPolling(); //recursiv

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sun2000",
-  "version": "0.1.2-alpha.3",
+  "version": "0.1.3",
   "description": "sun2000",
   "author": {
     "name": "bolliy",