iobroker.sun2000 0.18.0 → 0.18.1

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 bolliy <stephan@mante.info>
+Copyright (c) 2025 bolliy <stephan@mante.info>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -57,14 +57,18 @@ browse in the [wiki](https://github.com/bolliy/ioBroker.sun2000/wiki)
 * [`Export Control`](https://github.com/bolliy/ioBroker.sun2000/wiki/Begrenzung-Netzeinspeisung-(Export-Control)): The excess PV energy is fed into the power grid, but not all countries allow users to sell electricity. Some countries have introduced regulations to restrict the sale of electricity to the grid. 
 * [`modbus-proxy`](https://github.com/bolliy/ioBroker.sun2000/wiki/Modbus-Proxy): Third party device such as wallbox, energy manager etc. can receive data even if the modbus interface of inverter is already in use. In addition you can mirror the sun2000 data to another IoBroker instance.
 * Huawei [`SmartLogger`](https://github.com/bolliy/ioBroker.sun2000/wiki/SmartLogger) integration: Monitors and manages the PV power system. The adapter saves the collected data in the same way as it does when read out the inverter directly.
-* Huawei [`Emma`]() integration: The Modbus access, network connectivity (WiFi and Ethernet) and the DDSU/DTSU-666H smart meter functions are integrated in one unit - the use of the Sdongle becomes redundant. In addition Huawei EV chargers and load shedding/control (via selected Shelly devices) are supported and "intelligent" controlled.
+* Huawei [`Emma`](https://github.com/bolliy/ioBroker.sun2000/wiki/Emma) integration: The Modbus access, network connectivity (WiFi and Ethernet) and the DDSU/DTSU-666H smart meter functions are integrated in one unit - the use of the Sdongle becomes redundant. In addition Huawei EV chargers and load shedding/control (via selected Shelly devices) are supported and "intelligent" controlled.
 
 ## Changelog
-
 <!--
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 0.18.1 (2025-01-08) 
+* dependency and configuration updates
+* control: if the battery is not running, events related to the battery are discarded
+* modbus-proxy: adjusted advanced logging
+
 ### 0.18.0 (2024-12-11)
 * dependency and configuration updates
 * modbus-proxy: the modbus ID 250 is mapped to ID 0
@@ -225,7 +229,7 @@ initial release
 ## License
 MIT License
 
-Copyright (c) 2024 bolliy <stephan@mante.info>
+Copyright (c) 2025 bolliy <stephan@mante.info>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/admin/i18n/de/translations.json

@@ -1,12 +1,12 @@
 {
-    "donateTxt": "Wenn dir dieser Adapter gefällt, würde ich mich über eine Spende freuen.",
+    "donateTxt": "Wenn Ihnen dieser Adapter gefällt, denken Sie bitte über eine Spende nach, um meine Arbeit zu unterstützen.",
     "address": "Geräte-IP-Adresse",
     "port": "Modbus TCP-Port",
     "Modbus inverter IDs": "Modbus-Wechselrichter-IDs",
     "Update interval (sec)": "Aktualisierungsintervall [Sek.]",
     "The device ip address": "Die IP-Adresse des Geräts",
     "The modbus TCP port": "Der Modbus-TCP-Port",
-    "The modbus inverter IDs, separated with character ,": "Die Modbus-Wechselrichter-IDs, getrennt durch das Zeichen ,",
+    "The modbus inverter IDs, separated with character ,": "Wechselrichter-IDs, der Master muss zuerst eingegeben werden, getrennt durch ,",
     "Update interval to update the values from the inverters": "Aktualisierungsintervall zur Aktualisierung der Werte von den Wechselrichtern",
     "modbus connection timeout": "Zeitüberschreitung der Modbus-Verbindung",
     "delay between modbus requests": "Verzögerung zwischen Modbus-Anfragen",
@@ -18,7 +18,7 @@
     "If want to listen only at localhost use 127.0.0.1": "Wenn Sie nur auf localhost zuhören möchten, verwenden Sie 127.0.0.1",
     "ms.port": "Modbus-Proxy-TCP-Port",
     "The Modbus-proxy TCP port": "Der Modbus-Proxy-TCP-Port",
-    "The SDongle modbus ID": "Die SDongle-Modbus-ID, normalerweise 100",
+    "The SDongle modbus ID": "Die SDongle-Modbus-ID – normalerweise 100",
     "ms.log": "Erweiterte Protokollierung",
     "Advanced logging": "Erweiterte Protokollierung von Modbus-Transaktionen",
     "sl.meterId": "Modbus-ID des SmartLogger-Messgeräts",

package/admin/i18n/en/translations.json

@@ -6,7 +6,7 @@
 	"Update interval (sec)": "Update interval [sec]",
 	"The device ip address": "The device ip address",
 	"The modbus TCP port" : "The modbus TCP port",
-	"The modbus inverter IDs, separated with character ," : "The modbus inverter IDs, separated with character ,",
+	"The modbus inverter IDs, separated with character ," : "Inverter IDs, the master must be entered first, separated by ,",
 	"Update interval to update the values from the inverters" : "Update interval to update the values from the inverters",
 	"modbus connection timeout" : "modbus connection timeout",
 	"delay between modbus requests" : "delay between modbus requests",

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "sun2000",
-    "version": "0.18.0",
+    "version": "0.18.1",
     "news": {
+      "0.18.1": {
+        "en": "dependency and configuration updates\ncontrol: if the battery is not running, events related to the battery are discarded\nmodbus-proxy: adjusted advanced logging",
+        "de": "abhängigkeits- und konfigurationsupdates\nsteuerung: wenn die batterie nicht läuft, werden ereignisse im zusammenhang mit der batterie verworfen\nmodbus-proxy: angepasste erweiterte protokollierung",
+        "ru": "обновления зависимости и конфигурации\nуправление: если батарея не работает, события, связанные с батареей, отбрасываются\nmodbus-proxy: скорректированные передовые лесозаготовки",
+        "pt": "atualizações de dependência e configuração\ncontrole: se a bateria não estiver funcionando, os eventos relacionados à bateria são descartados\nmodbus-proxy: log avançado ajustado",
+        "nl": "afhankelijkheid en configuratie-updates\ncontrole: als de batterij niet draait, worden gebeurtenissen in verband met de batterij weggegooid\nmodbus-proxy: aangepaste geavanceerde logging",
+        "fr": "mises à jour de la dépendance et de la configuration\ncontrôle: si la batterie ne fonctionne pas, les événements liés à la batterie sont jetés\nmodbus-proxy: enregistrement avancé ajusté",
+        "it": "aggiornamenti di dipendenza e configurazione\ncontrollo: se la batteria non è in esecuzione, gli eventi relativi alla batteria vengono scartati\nmodbus-proxy: registrazione avanzata regolata",
+        "es": "actualizaciones de dependencia y configuración\ncontrol: si la batería no funciona, los eventos relacionados con la batería son descartados\nmodbus-proxy: registro avanzado ajustado",
+        "pl": "aktualizacje zależności i konfiguracji\nsterowanie: jeśli akumulator nie jest uruchomiony, zdarzenia związane z akumulatorem są odrzucane\nmodbus- proxy: dostosowane zaawansowane logowanie",
+        "uk": "оновлення залежності та конфігурації\nконтроль: якщо акумулятор не працює, події, пов'язані з акумулятором, відкидаються\nmodbus-proxy: регульований розширений журналювання",
+        "zh-cn": "依赖和配置更新\n控件: 如果电池没有运行, 与电池相关的事件会被丢弃\nmodbus-代用:经过调整的高级记录"
+      },
       "0.18.0": {
         "en": "dependency and configuration updates\nmodbus-proxy: the modbus ID 250 is mapped to ID 0",
         "de": "abhängigkeits- und konfigurationsupdates\nmodbus-proxy: die modbus ID 250 wird auf ID 0 abgebildet",
@@ -80,19 +93,6 @@
         "pl": "Dane SDongle nie zostały zapisane jako stany obiektu\nustawić ustawienia adaptera",
         "uk": "Дані SDongle не були написані як об'єкти\nналаштування адаптера",
         "zh-cn": "SDongle 数据没有作为对象状态写入\n调整适配器设置"
-      },
-      "0.15.0": {
-        "en": "dependency and configuration updates\ndisplay a clearly legible table bar #121\nmodbus-proxy write data also to the read cache #119",
-        "de": "abhängigkeits- und konfigurationsupdates\neine deutlich lesbare tischleiste #121 anzeigen\nmodbus-proxy schreibdaten auch zum lesespeicher #119",
-        "ru": "обновления зависимости и конфигурации\n#121\nmodbus-proxy пишут данные также кэшу #119",
-        "pt": "atualizações de dependência e configuração\nexibir uma barra de mesa claramente legível #121\nmodbus-proxy escrever dados também para o cache de leitura #119",
-        "nl": "afhankelijkheid en configuratie-updates\neen duidelijk leesbare tafelbalk #121 tonen\nmodbus-proxy schrijf gegevens ook naar de leescache #119",
-        "fr": "mises à jour de la dépendance et de la configuration\nafficher une barre de table clairement lisible #121\nmodbus-proxy écrire les données aussi au cache lecture #119",
-        "it": "aggiornamenti di dipendenza e configurazione\nvisualizza una barra da tavolo chiaramente leggibile #121\nmodbus-proxy scrivere i dati anche alla cache di lettura #119",
-        "es": "actualizaciones de dependencia y configuración\nmostrar una barra de mesa claramente legible #121\nmodbus-proxy escribe datos también al caché de lectura #119",
-        "pl": "aktualizacje zależności i konfiguracji\nwyświetla czytelny pasek tabeli # 121\nmodbus- proxy write data also to the read cache # 119",
-        "uk": "оновлення залежності та конфігурації\nдисплей чітко нижня білизна #121\nmodbus-proxy пише дані також для читання кеш #119",
-        "zh-cn": "依赖和配置更新\n显示清晰可见的表栏 # 121\nmodbus- 代理写入数据到读缓存 # 119"
       }
     },
     "titleLang": {

package/lib/controls/service_queue.js

@@ -139,12 +139,6 @@ class ServiceQueueMap  {
 					return await this._writeRegisters(47249,dataType.numToArray(event.value,dataType.uint32));
 				}
 			},
-			/*
-			{
-				state: { id: 'battery.targetSOC ', name: 'Target SOC', type: 'number', unit: '%', role: 'level', desc: 'reg: 47101 , len: 1'},
-				type : deviceType.gridPowerControl
-			},
-			*/
 			{
 				state: { id: 'battery.targetSOC', name: 'Target SOC', type: 'number', unit: '%', role: 'level', desc: 'reg: 47101 , len: 1'},
 				type : deviceType.battery,
@@ -242,7 +236,7 @@ class ServiceQueueMap  {
 		if (this.inverterInfo.instance) {
 			for (const item of this.serviceFields) {
 				//no battery - no controls
-				if (item.type == deviceType.battery && this.inverterInfo.instance.numberBatteryUnits() === 0) continue;
+				//if (item.type == deviceType.battery && this.inverterInfo.instance.numberBatteryUnits() === 0) continue;
 				if (item.type == deviceType.meter && !this.inverterInfo?.meter) continue;
 				if (item.type == deviceType.gridPowerControl && !this.inverterInfo?.meter) continue;
 				if (item?.state) {
@@ -259,7 +253,7 @@ class ServiceQueueMap  {
 					this.set(entry.state.id,state);
 				}
 			}
-
+			//upgrade
 			const tSOC = await this.adapter.getState(this.inverterInfo.path+'.control.battery.targetSOC ');
 			if (tSOC) {
 				await this.adapter.delObject(this.inverterInfo.path+'.control.battery.targetSOC ',{ recursive: false });
@@ -286,10 +280,14 @@ class ServiceQueueMap  {
 					tCDP[3] = 383 - Working mode settings - self-consumption (discharge)
 					*/
 					const tCDP = [1,0,1440,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
-					if (await this._writeRegisters(47255,tCDP)) this.adapter.logger.info('Control: The default TOU setting are transferred');
+					if (await this._writeRegisters(47255,tCDP)) this.log.info('Control: The default TOU setting are transferred');
 				}
 			}
 		}
+
+		if (this._initialized) {
+			this.log.info('Control: Service queue initialized');
+		}
 	}
 
 	get(id) {
@@ -316,8 +314,12 @@ class ServiceQueueMap  {
 		return this._map.values();
 	}
 
+	/**
+	 * Processes the events in the eventMap. For each event, it calls the associated function in the serviceMap.
+	 * @param {ModbusClient} modbusClient - The modbus client to use for writing the states.
+	 */
 	async process(modbusClient) {
-		if (!this.inverterInfo.instance.modbusAllowed) return;
+		//if (!this.inverterInfo.instance.modbusAllowed) return;
 		this._modbusClient = modbusClient;
 
 		if (this._initialized) {
@@ -326,8 +328,24 @@ class ServiceQueueMap  {
 				if (event.ack) continue; //allready done
 				const service = this._serviceMap.get(event.id);
 				if(!service.errorCount) service.errorCount = 0;
-
 				if (event.value !== null && service.fn) {
+					//check if battery is present and running
+					if (service.type == deviceType.battery) {
+						if (this.inverterInfo.instance.numberBatteryUnits() === 0) {
+							this.log.warn(`Control: Event is discarded because no battery has been detected. `);
+							if (!this.adapter.isReady) {
+								this.log.warn('Control: The Adapter is not ready! Please check the value in the state sun2000.x.info.JSONhealth and the Log output.');
+							}
+							this._eventMap.delete(event.id); //forget the event
+							continue;
+						}
+						const BatStatus = this.inverterInfo.instance.stateCache.get(this.inverterInfo.path+'.battery.runningStatus')?.value;
+						if (BatStatus !== 'RUNNING' && BatStatus !== 'STANDBY' && BatStatus !== '') {
+							this.log.warn(`Control: Event is discarded because battery is not running. State: ${this.inverterInfo.path}.battery.runningStatus = ${BatStatus}. `);
+							this._eventMap.delete(event.id); //forget the event
+							continue;
+						}
+					}
 					count ++;
 					if (await service.fn(event)) {
 						service.errorCount = 0;
@@ -347,10 +365,11 @@ class ServiceQueueMap  {
 						}
 					}
 				}
-				if (count > 1) break; //max 2
+				if (count > 1) break; //max 2 Events
 			}
 		}
-		if (!this._initialized && this.adapter.isReady) await this._init();
+		//if (!this._initialized && this.adapter.isReady) await this._init();
+		if (!this._initialized && this.adapter.isConnected) await this._init();
 	}
 
 	async _writeRegisters(address,data) {

package/lib/drivers/driver_inverter.js

@@ -969,9 +969,14 @@ class InverterSun2000 extends DriverBase{
 		}
 	}
 
-	//overload
+	/**
+	 * #overload#
+	 * Get the number of battery units.
+	 * @returns {number} The number of battery units
+	 */
 	numberBatteryUnits() {
 		let units = 0;
+		//Check if the first battery unit exists
 		const state1 = this.stateCache.get(`${this.deviceInfo.path}.battery.unit.1.SN`);
 		if (state1 && state1.value) units = 1;
 		const state2 = this.stateCache.get(`${this.deviceInfo.path}.battery.unit.2.SN`);

package/lib/modbus/modbus_server.js

@@ -153,6 +153,10 @@ class ModbusServer {
 			if (device) {
 				//this.adapter.log.debug('Device Info '+JSON.stringify(device?.info));
 				const values = device.getHoldingRegisters(startAddr,length);
+				if (this.adapter.settings.ms.log) {
+					this.log.info('Modbus-proxy: read data from id/address/data ' + unitId + '/' + startAddr +'/'+ values);
+				}
+
 				if (!this.adapter.isConnected) {
 					//this._addInfoStat('#WaitForConnected',startAddr, length, unitId);
 					await this.wait(500);
@@ -180,8 +184,12 @@ class ModbusServer {
 	}
 
 	async _handleSetReg(fnName,address, data, unitId, callback) {
-		try {
+		if (this.adapter.settings.ms.log) {
+			this.log.info('Modbus-proxy: Try to write data to id/address ' + unitId + '/' + address +'/'+ data);
+		} else {
 			this.log.debug('Modbus-proxy: Try to write data to id/address ' + unitId + '/' + address +'/'+ data);
+		}
+		try {
 			const device = this.getDeviceInstance(unitId);
 			if (!device) {
 				await this.wait(500);

package/main.js

@@ -279,7 +279,7 @@ class Sun2000 extends utils.Adapter {
 			this.settings.highInterval = 10000*this.settings.modbusIds.length;
 		} else {
 			let minInterval = this.settings.modbusIds.length*this.settings.modbusDelay*2.5; //len*5*delay/2
-			if (this.settings.integration > 0) { //SmartLogger
+			if (this.settings.integration > 0) { //SmartLogger, Emma
 				minInterval += 5000;
 			} else {
 				for (const device of this.devices) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sun2000",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "description": "sun2000",
   "author": {
     "name": "bolliy",
@@ -45,19 +45,19 @@
     "@types/chai": "^4.3.20",
     "@types/chai-as-promised": "^7.1.8",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^22.10.1",
+    "@types/node": "^22.10.5",
     "@types/proxyquire": "^1.3.31",
     "@types/sinon": "^17.0.3",
     "@types/sinon-chai": "^3.2.12",
     "chai": "^4.5.0",
     "chai-as-promised": "^7.1.2",
-    "eslint": "^9.16.0",
-    "globals": "^15.13.0",
-    "mocha": "^10.8.2",
+    "eslint": "^9.17.0",
+    "globals": "^15.14.0",
+    "mocha": "^11.0.1",
     "proxyquire": "^2.1.3",
     "sinon": "^19.0.2",
     "sinon-chai": "^3.7.0",
-    "typescript": "~5.6.3"
+    "typescript": "~5.7.2"
   },
   "main": "main.js",
   "files": [