iobroker.sun2000 0.17.0 → 0.17.1

package/README.md

@@ -65,6 +65,10 @@ browse in the [wiki](https://github.com/bolliy/ioBroker.sun2000/wiki)
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 0.17.1 (2024-11-21)
+* during the device status "Standby: detecting irradiation" (0x0002) register data is now also read from the inverter
+* The reading order of the battery data has been adjusted
+
 ### 0.17.0 (2024-11-05)
 * adjust for Responsive Design #134
 * migrate to ESLint 9.x

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "sun2000",
-    "version": "0.17.0",
+    "version": "0.17.1",
     "news": {
+      "0.17.1": {
+        "en": "during the device status \"Standby: detecting irradiation\" (0x0002) register data is now also read from the inverter\nThe reading order of the battery data has been adjusted",
+        "de": "während des Gerätestatus \"Standby: Detektion von Bestrahlung\" (0x0002) werden nun auch Registerdaten aus dem Wechselrichter gelesen\nDie Lesereihenfolge der Batteriedaten wurde angepasst",
+        "ru": "во время состояния устройства «Стандби: обнаружение облучения» (0x0002) данные регистров теперь также читаются из инвертора\nПорядок чтения данных батареи был скорректирован",
+        "pt": "durante o status do dispositivo \"Standby: detecção de irradiação\" (0x0002) dados de registro agora também é lido a partir do inversor\nA ordem de leitura dos dados da bateria foi ajustada",
+        "nl": "tijdens de apparaatstatus \"Standby: detectie van bestraling\" (0x0002) worden nu ook gegevens van de omvormer gelezen\nDe leesvolgorde van de batterijgegevens is aangepast",
+        "fr": "pendant l'état de l'appareil \"Standby: détecter l'irradiation\" (0x0002) les données du registre sont maintenant également lues à partir de l'onduleur\nL'ordre de lecture des données de la batterie a été ajusté",
+        "it": "durante lo stato del dispositivo \"Standby: rilevamento dell'irradiazione\" (0x0002) i dati di registro sono ora letti anche dall'inverter\nL'ordine di lettura dei dati della batteria è stato regolato",
+        "es": "durante el estado del dispositivo \"Standby: detecting irradiation\" (0x0002) datos del registro ahora también se lee desde el inversor\nEl orden de lectura de los datos de la batería se ha ajustado",
+        "pl": "podczas statusu urządzenia \"Standby: detection irradiation\" (0x0002) dane rejestru są teraz również odczytywane z inwertera\nKolejność odczytu danych baterii została dostosowana",
+        "uk": "при статусі пристрою \"Стандарт: виявлення опромінення\" (0x0002) реєстраційні дані тепер також читайте з інвертора\nВиправлено порядок читання даних акумулятора",
+        "zh-cn": "在设备状态“ Standby: 检测辐照” (0x0002) 注册数据现在也从反转器读取\n电池数据的读取顺序已调整"
+      },
       "0.17.0": {
         "en": "adjust for Responsive Design #134\nmigrate to ESLint 9.x\nnode >= v18.18.0\nmodbus-proxy: enabled reading data via input register",
         "de": "anpassung für Responsive Design #134\nmigration auf ESLint 9.x\nknoten >= v18.18.0\nmodbus-proxy: lesedaten über eingaberegister aktiviert",
@@ -80,19 +93,6 @@
         "pl": "dostosowanie do projektu Responsive Design # 121\nblokada asynchronicznego kodu modbusa\nzapisywanie danych za pośrednictwem modbus- proxy # 119\nprzeczytaj dodatkowe dane rejestru Huawei Emma",
         "uk": "регульований для відповідального дизайну #121\nблокування на коді asynchronous modbus\nнаписання даних через modbus-proxy #119\nчитати додаткові реєстраційні дані Huawei Emma",
         "zh-cn": "适应设计 # 121\n锁定同步调制解码\n通过modbus- 代理 119 写入数据\n读取 Huawei Emma 的额外注册数据"
-      },
-      "0.13.0": {
-        "en": "improve Modbus reconnection #116\nconfiguration update\nsimple Integration of Huawei Emma (Huawei Energy Management Assistant) #63",
-        "de": "modbus-Reconnection #116 verbessern\nkonfigurationsupdate\neinfache Integration von Huawei Emma (Huawei Energy Management Assistant) #63",
-        "ru": "#116\nобновление\nпростая интеграция Huawei Эмма (Huawei Energy Management Assistant) #63",
-        "pt": "melhorar a reconexão Modbus #116\natualização de configuração\nsimples integração de Huawei Emma (Huawei Energy Management Assistant) #63",
-        "nl": "modbus reconnectie #116 verbeteren\nconfiguratie-update\neenvoudige integratie van Huawei Emma (Huawei Energie Management Assistent) #63",
-        "fr": "améliorer la connexion Modbus #116\nmise à jour de configuration\nsimple intégration de Huawei Emma (Huawei Energy Management Assistant) #63",
-        "it": "migliorare la riconnessione Modbus #116\naggiornamento configurazione\nintegrazione semplice di Huawei Emma (Huawei Energy Management Assistant) #63",
-        "es": "mejorar la reconexión Modbus #116\nactualización de configuración\nsimple integración de Huawei Emma (Auxiliador de Gestión de Energía de Huawei) #63",
-        "pl": "poprawić ponowne połączenie Modbus # 116\naktualizacja konfiguracji\nprosta integracja Huawei Emma (Huawei Energy Management Assistant) # 63",
-        "uk": "поліпшення відключення Modbus #116\nоновлення конфігурації\nпроста інтеграція Huawei Emma (Huawei Energy Management Assistant) #63",
-        "zh-cn": "改进 Modbus 重联 # 116\n配置更新\n简单整合Huawei Emma(Huawei能源管理助理)#63"
       }
     },
     "titleLang": {

package/lib/drivers/driver_inverter.js

@@ -200,6 +200,7 @@ class InverterSun2000 extends DriverBase{
 				length : 2,
 				info : 'meter activePower',
 				refresh : dataRefreshRate.high,
+				//standby : true,
 				type : deviceType.meter,
 				states: [{
 					state: {id: 'meter.activePower', name: 'ActivePower', type: 'number', unit: 'kW', role: 'value.power.active', desc: 'reg:37113, len:2 (>0: feed-in to grid. <0: supply from grid.)' },
@@ -452,6 +453,53 @@ class InverterSun2000 extends DriverBase{
 				],
 				checkIfActive: () => this._batteryExists()
 			},
+			{
+				address : 37758,
+				length : 30,
+				info : 'battery information',
+				refresh : dataRefreshRate.low,
+				type : deviceType.battery,
+				states: [
+					{
+						state: {id: 'battery.ratedCapacity', name: 'Rated Capacity', type: 'number', unit: 'Wh', role: 'value.capacity', desc: 'reg:37758, len:2'},
+						register: {reg: 37758, type: dataType.uint32}
+					},
+					{
+						state: {id: 'battery.SOC', name: 'State of capacity', type: 'number', unit: '%', role: 'value.battery', desc: 'reg:37760, len:1'},
+						register: {reg: 37760, type: dataType.uint16, gain: 10}
+					},
+					{
+						state: {id: 'battery.runningStatus', name: 'Running status', type: 'string', role: 'value', desc: 'reg:37762, len:1'},
+						register: {reg: 37762, type: dataType.uint16, length: 1},
+						mapper: value => Promise.resolve(batteryStatus[value])
+					},
+					{
+						state: {id: 'battery.busVoltage', name: 'Bus Voltage', type: 'number', unit: 'V', role: 'value.voltage', desc: 'reg:37763, len:1'},
+						register: {reg: 37763, type: dataType.uint16, gain: 10},
+					},
+					{
+						state: {id: 'battery.busCurrent', name: 'Bus Current', type: 'number', unit: 'A', role: 'value.current', desc: 'reg:37764, len:1'},
+						register: {reg: 37764, type: dataType.int16, gain: 10},
+					},
+					{
+						state: {id: 'battery.totalCharge', name: 'Total Charge', type: 'number', unit: 'kWh', role: 'value.power.consumption', desc: 'reg:37780, len:2'},
+						register: {reg: 37780, type: dataType.uint32, gain: 100}
+					},
+					{
+						state: {id: 'battery.totalDischarge', name: 'Total Discharge', type: 'number', unit: 'kWh', role: 'value.power.consumption', desc: 'reg:37782, len:2'},
+						register: {reg: 37782, type: dataType.uint32, gain: 100}
+					},
+					{
+						state: {id: 'battery.currentDayChargeCapacity', name: 'Current Day Charge Capacity', type: 'number', unit: 'kWh', role: 'value.power.consumption', desc: 'reg:37784, len:2' },
+						register: { reg: 37784, type: dataType.uint32,  gain: 100 }
+					},
+					{
+						state: {id: 'battery.currentDayDischargeCapacity', name: 'Current Day Discharge Capacity', type: 'number', unit: 'kWh', role: 'value.power.consumption',  desc: 'reg:37786, len:2' },
+						register: { reg: 37786, type: dataType.uint32,  gain: 100 }
+					}
+				],
+				checkIfActive: () => this._batteryExists()
+			},
 			{   //for NRGKick
 				address : 47000,
 				length : 1,
@@ -503,7 +551,6 @@ class InverterSun2000 extends DriverBase{
 				address : 47101,
 				length : 6,
 				info : 'additional battery information',
-				//refresh : dataRefreshRate.low,
 				type : deviceType.battery,
 				states: [
 					{
@@ -826,53 +873,6 @@ class InverterSun2000 extends DriverBase{
 				}
 				]
 			},
-			{
-				address : 37758,
-				length : 30,
-				info : 'battery information',
-				refresh : dataRefreshRate.low,
-				type : deviceType.battery,
-				states: [
-					{
-						state: {id: 'battery.ratedCapacity', name: 'Rated Capacity', type: 'number', unit: 'Wh', role: 'value.capacity', desc: 'reg:37758, len:2'},
-						register: {reg: 37758, type: dataType.uint32}
-					},
-					{
-						state: {id: 'battery.SOC', name: 'State of capacity', type: 'number', unit: '%', role: 'value.battery', desc: 'reg:37760, len:1'},
-						register: {reg: 37760, type: dataType.uint16, gain: 10}
-					},
-					{
-						state: {id: 'battery.runningStatus', name: 'Running status', type: 'string', role: 'value', desc: 'reg:37762, len:1'},
-						register: {reg: 37762, type: dataType.uint16, length: 1},
-						mapper: value => Promise.resolve(batteryStatus[value])
-					},
-					{
-						state: {id: 'battery.busVoltage', name: 'Bus Voltage', type: 'number', unit: 'V', role: 'value.voltage', desc: 'reg:37763, len:1'},
-						register: {reg: 37763, type: dataType.uint16, gain: 10},
-					},
-					{
-						state: {id: 'battery.busCurrent', name: 'Bus Current', type: 'number', unit: 'A', role: 'value.current', desc: 'reg:37764, len:1'},
-						register: {reg: 37764, type: dataType.int16, gain: 10},
-					},
-					{
-						state: {id: 'battery.totalCharge', name: 'Total Charge', type: 'number', unit: 'kWh', role: 'value.power.consumption', desc: 'reg:37780, len:2'},
-						register: {reg: 37780, type: dataType.uint32, gain: 100}
-					},
-					{
-						state: {id: 'battery.totalDischarge', name: 'Total Discharge', type: 'number', unit: 'kWh', role: 'value.power.consumption', desc: 'reg:37782, len:2'},
-						register: {reg: 37782, type: dataType.uint32, gain: 100}
-					},
-					{
-						state: {id: 'battery.currentDayChargeCapacity', name: 'Current Day Charge Capacity', type: 'number', unit: 'kWh', role: 'value.power.consumption', desc: 'reg:37784, len:2' },
-						register: { reg: 37784, type: dataType.uint32,  gain: 100 }
-					},
-					{
-						state: {id: 'battery.currentDayDischargeCapacity', name: 'Current Day Discharge Capacity', type: 'number', unit: 'kWh', role: 'value.power.consumption',  desc: 'reg:37786, len:2' },
-						register: { reg: 37786, type: dataType.uint32,  gain: 100 }
-					}
-				],
-				checkIfActive: () => this._batteryExists()
-			},
 			{
 				//https://photomate.zendesk.com/hc/en-gb/articles/5701625507485-Export-limitation-for-SUN2000-inverters-via-FusionSolar-App
 				address : 47415,
@@ -957,12 +957,6 @@ class InverterSun2000 extends DriverBase{
 	_batteryExists(unit=0,pack=0) {
 		if (unit === 0) {
 			return this.numberBatteryUnits() > 0;
-			/*
-			//if (!this.adapter.settings.ds.batteryUnits) return false;
-			const state1 = this.stateCache.get(this.deviceInfo.path+'.battery.unit.1.SN');
-			const state2 = this.stateCache.get(this.deviceInfo.path+'.battery.unit.2.SN');
-			return (state1 && state1.value) || (state2 && state2.value);
-			*/
 		} else {
 			if (pack === 0) {
 				const state = this.stateCache.get(`${this.deviceInfo.path}.battery.unit.${unit}.SN`);
@@ -996,7 +990,7 @@ class InverterSun2000 extends DriverBase{
 		}
 		if (modbusAllowed) {
 			//430 = SUN2000-8KTL-M2
-			if (this.deviceStatus === 0x0002 && this._modelId < 430) modbusAllowed = false;
+			//if (this.deviceStatus === 0x0002 && this._modelId < 430) modbusAllowed = false;
 			if (this.deviceStatus >= 0x0300 && this.deviceStatus <= 0x0307 ) modbusAllowed = false; //shutdown
 			//if (this._modelId < 430) modbusAllowed = this.deviceStatus !== 0x0002;
 			if (this._errorCount > 3) modbusAllowed = false;
@@ -1009,7 +1003,7 @@ class InverterSun2000 extends DriverBase{
 		if (modbusAllowed && this.log.quiet) {
 			this.log.beQuiet(false);
 			this.log.info(`The inverter with modbus ID ${this._modbusId} is accessible again.`);
-			this._errorCount = 0;
+			//this._errorCount = 0;
 		}
 		this._modbusAllowed = modbusAllowed;
 		return this._modbusAllowed;

package/lib/register.js

@@ -219,10 +219,10 @@ class Registers {
 				for (const [i, reg] of device.instance.registerFields.entries()) {
 					if (!device.instance.modbusAllowed) continue; //standby
 					if (reg.type == deviceType.meter && !device?.meter) continue; //not meter
+					if (reg.type == deviceType.gridPowerControl && !device?.meter) continue; //power control v0.8.x
 
 					if (reg.checkIfActive && !reg.checkIfActive()) continue; //NEW, PATH
 
-					if (reg.type == deviceType.gridPowerControl && !device?.meter) continue; //power control v0.8.x
 					if (reg.states && reg.refresh) {
 						const lastread = reg.lastread;
 						const ret = {

package/main.js

@@ -468,34 +468,36 @@ class Sun2000 extends utils.Adapter {
 			const sinceLastUpdate = new Date().getTime() - this.lastTimeUpdated; //ms
 			this.logger.debug('### Watchdog: time since last update '+sinceLastUpdate/1000+' sec');
 			const lastIsConnected = this.isConnected;
-			this.isConnected = this.lastStateUpdatedHigh > 0 && sinceLastUpdate < this.settings.highInterval*3;
+			//this.isConnected = this.lastStateUpdatedHigh > 0 && sinceLastUpdate < this.settings.highInterval*3;
+			this.isConnected = this.lastStateUpdatedHigh > 0 || this.lastStateUpdatedLow > 0;
+
 			if (this.isConnected !== lastIsConnected ) this.setState('info.connection', this.isConnected, true);
 			if (!this.settings.modbusAdjust) {
 				if (!this.isConnected) {
 					this.setState('info.JSONhealth', {val: '{errno:1, message: "Can\'t connect to inverter"}', ack: true});
 				}
 				const ret = this.state.CheckReadError(this.settings.lowInterval*2);
-				const obj = {...ret,modbus: {...this.modbusClient.info}};
 				this.logger.debug(JSON.stringify(this.modbusClient.info));
 				//v0.8.x
 				if (!this.isReady) this.isReady = this.isConnected && !ret.errno;
 				// after 2 Minutes
-				if (this.alreadyRunWatchDog) {
+				if (this.toggleRunWatchDog) {
 					if (ret.errno) this.logger.warn(ret.message);
+					const obj = {...ret,modbus: {...this.modbusClient.info}};
 					this.setState('info.JSONhealth', {val: JSON.stringify(obj), ack: true});
-					if (this.modbusServer) {
-						!this.modbusServer.isConnected && this.modbusServer.connect();
-						if (this.settings.ms.log) {
-							//const stat = this.modbusServer.info?.stat;
-							//object is not empty
-							//if (Object.keys(stat).length > 0) this.log.info('Modbus tcp server: '+JSON.stringify(this.modbusServer.info));
-							this.logger.info('Modbus tcp server: '+JSON.stringify(this.modbusServer.info));
-						}
+				}
+				if (this.modbusServer) {
+					!this.modbusServer.isConnected && this.modbusServer.connect();
+					if (this.settings.ms.log) {
+						//const stat = this.modbusServer.info?.stat;
+						//object is not empty
+						//if (Object.keys(stat).length > 0) this.log.info('Modbus tcp server: '+JSON.stringify(this.modbusServer.info));
+						this.logger.info('Modbus tcp server: '+JSON.stringify(this.modbusServer.info));
 					}
 				}
 			}
 
-			if (!this.alreadyRunWatchDog) this.alreadyRunWatchDog = true;
+			this.toggleRunWatchDog = !this.toggleRunWatchDog;
 			this.lastStateUpdatedLow = 0;
 			this.lastStateUpdatedHigh = 0;
 

package/package.json

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