iobroker.sun2000 2.3.4 → 2.3.5

package/README.md

@@ -65,6 +65,12 @@ 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**
 -->
+### 2.3.5 (2025-11-17)
+* dependency and configuration updates
+* Battery status check was suspended in inverter control [#220](https://github.com/bolliy/ioBroker.sun2000/issues/220)
+* Emma: dynamic detection of sun2000 inverters and integration of devices such as sun2000
+* allow Modbus ID 0 when using the sDongle [#218](https://github.com/bolliy/ioBroker.sun2000/issues/118)
+
 ### 2.3.4 (2025-11-01)
 * dependency and configuration updates
 * new state `collected.dailyExternalYield` Riemann sum of `collected.externalPower`

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "sun2000",
-    "version": "2.3.4",
+    "version": "2.3.5",
     "news": {
+      "2.3.5": {
+        "en": "dependency and configuration updates\nBattery status check was suspended in inverter control [#220](https://github.com/bolliy/ioBroker.sun2000/issues/220)\nEmma: dynamic detection of sun2000 inverters and integration of devices such as sun2000\nallow Modbus ID 0 when using the sDongle [#218](https://github.com/bolliy/ioBroker.sun2000/issues/118)",
+        "de": "abhängigkeits- und konfigurationsupdates\nDie Batteriestatusprüfung wurde in der Wechselrichtersteuerung [#220](https://github.com/bolliy/ioBroker.sun2000/issues/220) ausgesetzt\nEmma: dynamische Erkennung von Wechselrichtern von Sun2000 und Integration von Geräten wie sun2000\nerlauben Sie Modbus ID 0 bei Verwendung des sDongle [#218](https://github.com/bolliy/ioBroker.sun2000/issues/118)",
+        "ru": "обновления зависимостей и конфигурации\nПроверка состояния батареи была приостановлена в инверторном управлении [#220] (https://github.com/bolliy/ioBroker.sun2000/issues/220)\nЭмма: динамическое обнаружение инверторов Sun2000 и интеграция таких устройств, как Sun2000\nразрешить Modbus ID 0 при использовании sDongle [#218] (https://github.com/bolliy/ioBroker.sun2000/issues/118)",
+        "pt": "atualizações de dependência e configuração\nA verificação do estado da bateria foi suspensa no controle do inversor [#220](https://github.com/bolliy/ioBroker.sun2000/issues/220)\nEmma: detecção dinâmica de inversores sun2000 e integração de dispositivos como sun2000\npermitir Modbus ID 0 ao usar o sDongle [#218](https://github.com/bolliy/ioBroker.sun2000/issues/118)",
+        "nl": "afhankelijkheid en configuratie-updates\nDe controle van de status van de batterij werd opgeschort bij controle van de inverter [#220](https://github.com/bolliy/ioBroker.sun2000/issues/220)\nEmma: dynamische detectie van zonne2000 omvormers en integratie van apparaten zoals sun2000\nmodbus ID 0 toestaan bij gebruik van sDongle [#218](https://github.com/bolliy/ioBroker.sun2000/issues/118)",
+        "fr": "mises à jour de la dépendance et de la configuration\nLe contrôle de l'état de la batterie a été suspendu dans le contrôle de l'onduleur [#220](https://github.com/bolliy/ioBroker.sun2000/issues/220)\nEmma : détection dynamique des onduleurs Sun2000 et intégration de dispositifs tels que Sun2000\npermettre Modbus ID 0 lors de l'utilisation de sDongle [#218](https://github.com/bolliy/ioBroker.sun2000/issues/118)",
+        "it": "aggiornamenti di dipendenza e configurazione\nIl controllo dello stato della batteria è stato sospeso nel controllo dell'inverter [#220](https://github.com/bolliy/ioBroker.sun2000/issues/220)\nEmma: rilevazione dinamica degli inverter Sun2000 e integrazione di dispositivi come sun2000\nconsentire Modbus ID 0 quando si utilizza lo sDongle [#218](https://github.com/bolliy/ioBroker.sun2000/issues/118)",
+        "es": "actualizaciones de dependencia y configuración\nSe suspendió el control del estado de la batería [#220](https://github.com/bolliy/ioBroker.sun2000/issues/220)\nEmma: detección dinámica de inversores de sol2000 e integración de dispositivos como el sol2000\npermitir Modbus ID 0 al utilizar el sDongle [#218](https://github.com/bolliy/ioBroker.sun2000/issues/118)",
+        "pl": "aktualizacje zależności i konfiguracji\nKontrola stanu baterii została zawieszona w kontrolach inwertera [# 220] (https: / / github.com / bolliy / ioBroker.sun2000 / issues / 220)\nEmma: dynamiczna detekcja inwerterów sun2000 i integracja urządzeń takich jak sun2000\nw przypadku stosowania sDongle [# 218] (https: / / github.com / bolliy / ioBroker.sun2000 / issues / 118)",
+        "uk": "оновлення залежності та конфігурації\nПеревірка стану акумулятора була припинена в інверторному режимі [#220] (https://github.com/bolliy/ioBroker.sun2000/issues/220)\nЕмма: динамічне виявлення інверторів сонця2000 та інтеграції пристроїв, таких як сонце2000\nдозволити Modbus ID 0 при використанні sDongle [#218](https://github.com/bolliy/ioBroker.sun2000/issues/118)",
+        "zh-cn": "依赖和配置更新\n在反转控制中暂停了电池状态检查[#220](https://github.com/bolliy/ioBroker.sun2000/issues/220)\n艾玛:对太阳2000反转器的动态检测和太阳2000等设备的集成\n允许在使用 sDongle [# 218] 时使用 Modbus ID (https:// github.com/ bolliy/ioBroker.sun2000/issues/118) "
+      },
       "2.3.4": {
         "en": "dependency and configuration updates\nnew state `collected.dailyExternalYield` Riemann sum of `collected.externalPower`",
         "de": "abhängigkeits- und konfigurationsupdates\nneuer Zustand `collect.dailyExternalYield` Riemann Summe von `collected.externalPower `",
@@ -80,19 +93,6 @@
         "pl": "inverter control: add same state for startup and shutdown an inverter [# 199] (https: / / github.com / bolliy / ioBroker.sun2000 / issues / 199)\nfix: Nazwa statusu urządzenia została poprawiona [# 202] (https: / / github.com / bolliy / ioBroker.sun2000 / pull / 202)\ndodać nieudokumentowany status urządzenia \"Wyłączenie: koniec procesu rozładowania ESS\"\nemma control: New state 'emma.control.battery.ESSControlMode'. Można teraz skonfigurować EMMA z TOU- mode (Time of Use), aby naładować baterię z siatki. [# 200] (https: / / github.com / bolliy / ioBroker.sun2000 / discussions / 200)\njeśli zainstalowana jest Emma, niektóre stany sterujące inwertera są wyłączone (tylko do odczytu). Głównie dla ustawień siatki.\nusunięto zdepregatowane stany kontrolne.\na workaround for issue [# 582] (https: / / github.com / yaacov / node- modbus- serial / issues / 582) of node- modbus- serial został wdrożony.",
         "uk": "контроль інвертора: додати однаковий стан для запуску та відключення інвертора [#199](https://github.com/bolliy/ioBroker.sun2000/issues/199)\nвиправлено: Назва стану пристрою було виправлено [#202] (https://github.com/bolliy/ioBroker.sun2000/pull/202)\nдодати недокументований статус пристрою `Пошук: кінець процесу розряду ESS\nемма управління: новий стан ` emma.control.battery.ESSControlMode`. Ви можете налаштувати EMMA з TOU-mode (Time of Use) для зарядки акумулятора з сітки. [#200](https://github.com/bolliy/ioBroker.sun2000/discussions/200)\nякщо встановлений Емма, деактивуються деякі стани управління інвертором (прочитати тільки). В основному для налаштування сітки.\nвилучені стани керування.\n[#582](https://github.com/yaacov/node-modbus-serial/issues/582) вузла-modbus-serial.",
         "zh-cn": "反转器控制:为启动和关闭添加相同状态的反转器[199](https://github.com/bolliy/ioBroker.sun2000/issues/199)\n固定: 设备状态名称已更正 [# 202] (https://github.com/bolliy/ioBroker.sun2000/pul/202)\n添加无文件设备状态“关闭:ESS放电过程结束”\nemma控制:新状态`emma.control.battery.ESS Control Mode'. 您现在可以用 TOU- mode( 使用时间) 配置 EMMA 从电网中充电 。 [# 200] (https://github.com/bolliy/ioBroker.sun2000/discussions/200)\n如果安装了Emma,反转器的某些控制状态就会失效(只读). 主要用于网格设置.\n贬值的控制状态已被取消.\n已落实了节点-modbus-serial[#582](https://github.com/yaacov/node-modbus-serial/issues/582)的工作."
-      },
-      "2.2.0": {
-        "en": "dependency and configuration updates\nnew state `meter.derived.signConventionForPowerFeed-in` sign of meter.activePower that is currently being fed into the power grid\nnew state `meter.derived.feed-inPower` electric power that is supplied to a grid (\"fed in\")",
-        "de": "abhängigkeits- und konfigurationsupdates\nneuer Zustand `meter.derived.signConventionForPowerFeed-in` Zeichen von meter.active Strom, der derzeit in das Stromnetz eingespeist wird\nneue Zustand `meter.derived.feed-inPower` elektrische Leistung, die einem Netz zugeführt wird (\"fed in\")",
-        "ru": "обновления зависимостей и конфигурации\nновый государственный знак «meter.derived.signConventionForPowerFeed-in» Мощность, которая в настоящее время подается в электросеть\nэлектрическая мощность нового состояния «meter.derived.feed-inPower», которая подается в сеть («питается в»)",
-        "pt": "atualizações de dependência e configuração\nnovo estado `meter.derived.signConventionForPowerFeed-in` sinal do medidor.active Energia que está sendo alimentada na rede de energia\nnovo estado `meter.derived.feed-inPower` energia elétrica que é fornecida a uma grade (\"feed in\")",
-        "nl": "afhankelijkheid en configuratie-updates\nnieuwe staat  Energie die momenteel wordt gevoed in het elektriciteitsnet\nnieuwe toestand ",
-        "fr": "mises à jour de la dépendance et de la configuration\nnouvel état `meter.derived.signConventionForPowerFeed-in` signe de meter.active Puissance qui est actuellement introduite dans le réseau électrique\nnouvel état `meter.derived.feed-inPower` électricité qui est fourni à un réseau (\"feed in\")",
-        "it": "aggiornamenti di dipendenza e configurazione\nnuovo stato `meter.derived.signConventionForPowerFeed-in` segno di metro.active Potenza che sta attualmente alimentando nella rete elettrica\nnuovo stato `meter.derived.feed-inPower` potere elettrico che viene fornito a una griglia (\"fed in\")",
-        "es": "actualizaciones de dependencia y configuración\nnuevo estado `meter.derived.signConventionForPowerFeed-in` signo de medidor.active Potencia que actualmente está siendo alimentada en la red eléctrica\nnuevo estado `meter.derived.feed-inPower` energía eléctrica que se suministra a una red (\"fed in\")",
-        "pl": "aktualizacje zależności i konfiguracji\nnowy stan 'meter.derived.signConventionForPowerFeed- in' znak meter.active Energia zasilana obecnie do sieci energetycznej\nnowy stan 'meter.derived.feed-inPower' energia elektryczna, która jest dostarczana do sieci (\"karmiona w\")",
-        "uk": "оновлення залежності та конфігурації\nновий стан `meter.derived.signConventionForPowerFeed-in` знак лічильника.active Потужність, яка в даний час вдається в електромережу\nновий стан `meter.derived.feed-inPower` електрична потужність, яка подається в сітку (\"fed in\")",
-        "zh-cn": "依赖和配置更新\n新的状态“ 公尺” 。 生成。 签署 Convention ForPowerFeed- in' sign of meter. 活动 目前输入电网的电力\n新状态“ met. entered. feed-inpower” 供电给电网(“ feeded in”)"
       }
     },
     "titleLang": {
@@ -233,14 +233,14 @@
   "native": {
     "address": "",
     "port": 502,
-    "modbusIds": "1",
+    "modbusIds": "",
     "updateInterval": 20,
     "sd_active": false,
     "sDongleId": "100",
     "timeout": 10000,
     "delay": 0,
     "connectDelay": 5000,
-    "autoAdjust": true,
+    "autoAdjust": false,
     "ms_active": false,
     "ms_address": "0.0.0.0",
     "ms_port": 502,

package/lib/controls/inverter_service_queue.js

@@ -750,6 +750,7 @@ class ServiceQueueMap {
 							this._eventMap.delete(event.id); //forget the event
 							continue;
 						}
+						/*
 						const BatStatus = this.inverterInfo.instance.stateCache.get(`${this.inverterInfo.path}.battery.runningStatus`)?.value ?? -1;
 						if (BatStatus !== 2 && BatStatus !== 1 && BatStatus !== -1) {
 							this.log.warn(
@@ -758,6 +759,7 @@ class ServiceQueueMap {
 							this._eventMap.delete(event.id); //forget the event
 							continue;
 						}
+						*/
 					}
 					if (service.state.type === 'number') {
 						if (!this.isNumber(event)) {

package/lib/drivers/driver_emma.js

@@ -570,7 +570,7 @@ class Emma extends DriverBase {
 					this.log.debug('### PostHook for Emma - identify Subdevices charger');
 					this.identifySubdevices('charger', this.modbusId)
 						.then(ret => {
-							this.log.debug(`### PostHook identification for Emmachargers - ret: ${JSON.stringify(ret)}`);
+							this.log.debug(`### PostHook identification for Emma chargers - ret: ${JSON.stringify(ret)}`);
 							for (const [i, charger] of ret.entries()) {
 								const device = {
 									index: i,
@@ -588,8 +588,23 @@ class Emma extends DriverBase {
 					this.identifySubdevices('sun2000', this.modbusId)
 						.then(ret => {
 							this.log.debug(`### PostHook indentification for Inverter Sun2000 - ret: ${JSON.stringify(ret)}`);
-							for (const [, inverter] of ret.entries()) {
+							//check if inverter sun2000 already exists
+							const inverterExist = this.adapter.devices.findIndex(x => x.driverClass === driverClasses.inverter);
+							for (const [i, inverter] of ret.entries()) {
 								this.log.info(`${this._name} identify subdevice an inverter sun2000: OID=${inverter.obj_id}, modbus id: ${inverter.slave_id}`);
+								//unless inverters are configured, add them
+								if (inverterExist === -1) {
+									const device = {
+										index: i,
+										duration: 5000,
+										modbusId: inverter.slave_id,
+										driverClass: driverClasses.inverter,
+										meter: false,
+									};
+									this.adapter.devices.push(device);
+									this.adapter.initDevicePath(device);
+									this.log.info(`Inverter sun2000 with modbus id ${inverter.slave_id} added.`);
+								}
 							}
 						})
 						.catch(err => {

package/lib/drivers/driver_inverter.js

@@ -1520,7 +1520,7 @@ class InverterSun2000 extends DriverBase {
 					//let inputYield = this.stateCache.get(`${path}dailyEnergyYield`)?.value ?? 0 * 0.97 + charge - disCharge;
 					const activeEnergy = this.stateCache.get(`${path}derived.dailyActiveEnergy`)?.value ?? 0;
 					//let inYield = activeEnergy + (charge - disCharge) * 0.97; //efficiency loss of battery 3%
-					let inYield = activeEnergy + (charge - disCharge); //efficiency loss of battery 3%
+					let inYield = activeEnergy + charge * 0.97 - disCharge * 1.03; //efficiency loss of battery 3%
 					if (inYield < 0) {
 						inYield = 0;
 					}

package/lib/modbus/modbus_connect.js

@@ -97,11 +97,17 @@ class ModbusConnect extends DeviceInterface {
 	close() {
 		return new Promise(resolve => {
 			if (this.client) {
-				this.client.close(() => {
+				try {
+					this.client.close(() => {
+						resolve({});
+					});
+					//workaround for issue https://github.com/yaacov/node-modbus-serial/issues/582 with node-modbus-serial
 					resolve({});
-				});
-				//workaround for issue https://github.com/yaacov/node-modbus-serial/issues/582 with node-modbus-serial
-				resolve({});
+				} catch (err) {
+					this.log.warn(`Could not close Modbus connection: ${err.message}`);
+					resolve({});
+					//reject();
+				}
 			} else {
 				resolve({});
 			}
@@ -112,9 +118,15 @@ class ModbusConnect extends DeviceInterface {
 	_destroy() {
 		return new Promise(resolve => {
 			if (this.client) {
-				this.client.destroy(() => {
+				try {
+					this.client.destroy(() => {
+						resolve({});
+					});
+				} catch (err) {
+					this.log.warn(`Could not destroy Modbus connection: ${err.message}`);
 					resolve({});
-				});
+					//reject();
+				}
 			} else {
 				resolve({});
 			}
@@ -140,8 +152,6 @@ class ModbusConnect extends DeviceInterface {
 		if (err.modbusCode === undefined) {
 			this._adjustDelay(err, false);
 			await this.close();
-			//await this._destroy();
-			//await this.closing();
 			await this._create();
 			if (err.errno === 'ECONNREFUSED') {
 				this.log.warn('Has another device interrupted the modbus connection?');
@@ -150,8 +160,6 @@ class ModbusConnect extends DeviceInterface {
 		} else {
 			if (err.modbusCode === 0) {
 				await this.close();
-				//await this._destroy();
-				//await this.closing();
 				this._adjustDelay(err, false);
 				await this._create();
 			}

package/main.js

@@ -386,14 +386,13 @@ class Sun2000 extends utils.Adapter {
 			this.settings.modbusDelay = this.config.delay; //ms
 			this.settings.modbusConnectDelay = this.config.connectDelay; //ms
 			this.settings.modbusAdjust = this.config.autoAdjust;
-			this.settings.modbusIds = this.config.modbusIds.split(',').map(n => {
-				return Number(n);
-			});
-			/*
-			this.settings.chargerIds = this.config.chargerIds.split(',').map(n => {
-				return Number(n);
-			});
-			*/
+			if (this.config.modbusIds !== '') {
+				this.settings.modbusIds = this.config.modbusIds.split(',').map(n => {
+					return Number(n);
+				});
+			} else {
+				this.settings.modbusIds = [];
+			}
 			//SmartDongle
 			this.settings.sd.active = this.config.sd_active;
 			// eslint-disable-next-line no-constant-binary-expression
@@ -419,27 +418,34 @@ class Sun2000 extends utils.Adapter {
 			if (this.settings.modbusAdjust) {
 				await this.setState('info.JSONhealth', { val: '{message: "Adjust modbus settings"}', ack: true });
 			} else {
-				await this.setState('info.JSONhealth', { val: '{message : "Information is collected"}', ack: true });
+				await this.setState('info.JSONhealth', { val: '{message : "Information is collected..."}', ack: true });
 			}
-			//future: if (this.settings.integration !== 2 && (this.settings.modbusIds.length === 0 || this.settings.modbusIds.length > 5)) {
-			if (this.settings.modbusIds.length === 0 || this.settings.modbusIds.length > 5) {
-				this.adapterDisable(`*** Adapter deactivated, inverter modbus Ids is invalid! ***`);
+			//validate modbus Ids
+			if (this.settings.modbusIds.length > 5) {
+				this.adapterDisable(`*** Adapter deactivated, Only a maximum of 5 inverters are allowed! ***`);
+				return;
+			}
+			if (this.settings.integration !== 2 && this.settings.modbusIds.length === 0) {
+				this.adapterDisable(`*** Adapter deactivated, inverter Modbus IDs must be entered! ***`);
 				return;
 			}
 			//ES6 use a for (const [index, item] of array.entries()) of loop
 			for (const [i, id] of this.settings.modbusIds.entries()) {
 				//Inverter
-				if (id < 1 || id >= 250) {
+				if (id >= 250) {
 					this.adapterDisable(`*** Adapter deactivated, inverter modbus Id ${id} is not permitted! ***`);
 					return;
 				}
-				this.devices.push({
-					index: i,
-					duration: 5000,
-					modbusId: id,
-					driverClass: driverClasses.inverter,
-					meter: i == 0 && this.settings.integration === 0,
-				});
+				//inverter modbus id 0 does not exist with emma
+				if (this.settings.integration !== 2 || id > 0) {
+					this.devices.push({
+						index: i,
+						duration: 5000,
+						modbusId: id,
+						driverClass: driverClasses.inverter,
+						meter: i == 0 && this.settings.integration === 0,
+					});
+				}
 			}
 
 			//SDongle

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sun2000",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "description": "sun2000",
   "author": {
     "name": "bolliy",
@@ -37,13 +37,11 @@
     "@alcalzone/release-script-plugin-iobroker": "^4.0.0",
     "@alcalzone/release-script-plugin-license": "^4.0.0",
     "@alcalzone/release-script-plugin-manual-review": "^4.0.0",
-    "@eslint/eslintrc": "^3.3.1",
-    "@eslint/js": "^9.39.0",
     "@iobroker/adapter-dev": "^1.5.0",
     "@iobroker/eslint-config": "^2.2.0",
-    "@iobroker/testing": "^5.1.1",
+    "@iobroker/testing": "^5.2.2",
     "@tsconfig/node20": "^20.1.6",
-    "@types/node": "^24.9.2",
+    "@types/node": "^24.10.1",
     "globals": "^16.5.0",
     "typescript": "~5.9.3"
   },