iobroker.sun2000 2.3.1 → 2.3.2

package/README.md

@@ -65,6 +65,9 @@ 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.2 (2025-10-24)
+* allows again `control.battery.chargeFromGridFunction` when using the Emma
+
 ### 2.3.1 (2025-10-21)
 * fix: handle potential null values in set method of RegisterMap
 
@@ -75,7 +78,7 @@ browse in the [wiki](https://github.com/bolliy/ioBroker.sun2000/wiki)
 * inverter control: add same state for startup and shutdown an inverter [#199](https://github.com/bolliy/ioBroker.sun2000/issues/199)
 * fix: Device status name has been corrected [#202](https://github.com/bolliy/ioBroker.sun2000/pull/202)
 * add undocumented device status `Shutdown: End of the ESS discharge process` 
-* emma control: new state ` emma.control.battery.ESSControlMode`. You can now configure EMMA with TOU-mode (Time of Use) to charge the battery from grid. [#200](https://github.com/bolliy/ioBroker.sun2000/discussions/200)
+* emma control: new state `emma.control.battery.ESSControlMode`. You can now configure EMMA with TOU-mode (Time of Use) to charge the battery from grid. [#200](https://github.com/bolliy/ioBroker.sun2000/discussions/200)
 * if an Emma is installed, some control states of the inverter are deactivated (read only). Mainly for the grid settings.
 * deprecated control states have been removed.
 * a workaround for issue [#582](https://github.com/yaacov/node-modbus-serial/issues/582) of node-modbus-serial has been implemented.

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "sun2000",
-    "version": "2.3.1",
+    "version": "2.3.2",
     "news": {
+      "2.3.2": {
+        "en": "allows again `control.battery.chargeFromGridFunction` when using the Emma",
+        "de": "erlaubt wieder `control.battery.chargeFromGridFunction` bei Verwendung der Emma",
+        "ru": "позволяет снова «control.battery.chargeFromGridFunction» при использовании Emma",
+        "pt": "permite novamente `control.battery.chargeFromGridFunction` ao usar a Emma",
+        "nl": "maakt het mogelijk opnieuw te controleren.battery.chargeFromGridFunction",
+        "fr": "permet de nouveau `control.battery.chargeFromGridFunction` lors de l'utilisation de l'Emma",
+        "it": "permette di nuovo `control.battery.chargeFromGridFunction` quando si utilizza Emma",
+        "es": "permite de nuevo 'control.battery.chargeDesdeGridFunction' al utilizar Emma",
+        "pl": "pozwala ponownie 'control.battery.chargeFromGridFunction' podczas korzystania z Emmy",
+        "uk": "дозволяє знову `control.battery.chargeЗ альбомуGridFunction` при використанні Емма",
+        "zh-cn": "允许在使用 Emma 时再次使用 \" control.battery. charge from GridFunction \" "
+      },
       "2.3.1": {
         "en": "fix: handle potential null values in set method of RegisterMap",
         "de": "fix: griff potenzielle Nullwerte in der eingestellten Methode des Registrierens Landkarte",
@@ -80,19 +93,6 @@
         "pl": "emma: ustala się czas systemowy [# 179] (https: / / github.com / bolliy / ioBroker.sun2000 / issues / 179)\ncontrol: add grid Power Scheduling Functional to inverter driver [# 176] (https: / / github.com / bolliy / ioBroker.sun2000 / issues / 176)",
         "uk": "emma: час системи визначається [#179](https://github.com/bolliy/ioBroker.sun2000/products/179)\ncontrol: add power scheduling features to inverter драйвер [#176](https://github.com/bolliy/ioBroker.sun2000/issues/176)",
         "zh-cn": "emma:系统时间正在确定 [# 179] (https://github.com/bolliy/ioBroker.sun2000/issues/179)\n控制:向反向驱动器添加电网电源调度功能[#176](https://github.com/bolliy/ioBroker.sun2000/issues/1976)"
-      },
-      "2.0.0": {
-        "en": "add support for chargers via Emma and save the data in the charger path #171\nEstablish data consistency between meter.activePower and the power of the meter phases #174\nallows `control.battery.chargeFromGridFunction` when using the Emma\nbreaking change: \nthe value `sun2000.x.inverter.x.battery.runningStatus` is saved as a number. The translated value (such as STANDBY, RUNNING etc.) is stored in the path sun2000.x.inverter.x.battery.derived",
-        "de": "unterstützung für Ladegeräte über Emma hinzufügen und die Daten im Ladepfad #171 speichern\nDatenkonsistenz zwischen meter.activePower und der Leistung der Zählerphasen #174 einstellen\nerlaubt `control.battery.chargeFromGridFunction` bei Verwendung der Emma\nänderung:\nder Wert `sun2000.x.inverter.x.battery.runningStatus` wird als Nummer gespeichert. Der übersetzte Wert (wie STANDBY, RUNNING etc.) wird im Pfad sun2000.x.inverter.x.battery.derived gespeichert",
-        "ru": "добавьте поддержку зарядных устройств через Emma и сохраните данные в пути зарядного устройства #171\nУстановить согласованность данных между meter.activePower и мощностью фаз счетчика #174\nпозволяет «control.battery.chargeFromGridFunction» при использовании Emma\nпреодоление изменений:\nзначение 'sun2000.x.inverter.x.battery.runningStatus' сохраняется в виде числа. Переведенное значение (например, STANDBY, RUNNING и т.д.) сохраняется в пути sun2000.x.inverter.x.battery.derived",
-        "pt": "adicionar suporte para carregadores via Emma e salvar os dados no caminho do carregador #171\nEstabelecer a consistência dos dados entre a potência do medidor e a potência das fases do medidor #174\npermite `control.battery.chargeFromGridFunction` ao usar a Emma\nalteração de quebra:\no valor `sun2000.x.inverter.x.battery.runningStatus` é salvo como um número. O valor traduzido (como STADBY, RUNNING etc.) é armazenado no caminho sun2000.x.inverter.x.battery.derived",
-        "nl": "ondersteuning voor opladers toevoegen via Emma en de gegevens opslaan in het opladerpad #171\nVaststelling van gegevens consistentie tussen meter.activePower en het vermogen van de meter fasen #174\nstaat control.battery.chargeFromGridFunction\nbreek verandering:\nde waarde  De vertaalde waarde (zoals STANDBY, RUNNING etc.) wordt opgeslagen in het pad sun2000.x.inverter.x.battery. afgeleide",
-        "fr": "ajouter le support pour les chargeurs via Emma et enregistrer les données dans le chemin de chargeur #171\nÉtablir la cohérence des données entre le compteur.activePower et la puissance des phases du compteur #174\npermet `control.battery.chargeFromGridFunction` lors de l'utilisation de l'Emma\nrupture du changement:\nla valeur `sun2000.x.inverter.x.battery.runningStatus` est enregistrée en nombre. La valeur traduite (comme STANDBY, RUNNING, etc.) est stockée dans le chemin sun2000.x.inverter.x.battery.derived",
-        "it": "aggiungere supporto per i caricatori tramite Emma e salvare i dati nel percorso del caricabatterie #171\nStabilire la consistenza dei dati tra metro.activePower e la potenza delle fasi metro #174\npermette `control.battery.chargeFromGridFunction` quando si utilizza Emma\ncambiamento di rottura:\nil valore `sun2000.x.inverter.x.battery.runningStatus` viene salvato come numero. Il valore tradotto (come STANDBY, RUNNING ecc.) è memorizzato nel percorso sun2000.x.inverter.x.battery.derived",
-        "es": "añadir soporte para los cargadores a través de Emma y guardar los datos en la ruta del cargador #171\nEstablecer la coherencia de los datos entre el medidor.activePower y la potencia de las fases del medidor #174\npermite 'control.battery.chargeDesdeGridFunction' al usar Emma\ncambio de ruptura:\nel valor `sun2000.x.inverter.x.battery.runningStatus` se guarda como un número. El valor traducido (como STANDBY, RUNNING etc.) se almacena en el camino sun2000.x.inverter.x.battery.derived",
-        "pl": "dodaj obsługę ładowarek przez Emmę i zapisz dane w ścieżce ładowarki # 171\nUstanowienie spójności danych między miernikiem. ActivePower i mocą faz miernika # 174\npozwala 'control.battery.chargeFromGridFunction' przy użyciu Emmy\nzmiana\nwartość 'sun2000.x.inverter.x.battery.runningStatus' jest zapisywana jako liczba. Wartość przetłumaczona (taka jak STANDBY, RUNNING itp.) jest przechowywana w ścieżce Sun2000.x.inverter.x.battery.deriver",
-        "uk": "додати підтримку зарядних пристроїв через Емма і зберегти дані в шляху зарядного пристрою #171\nВстановити консистенцію даних між лічильником.activePower і потужністю метрових фаз #174\nдозволяє `control.battery.chargeЗ альбомуGridFunction` при використанні Емма\nзміна розриву:\nзначення `sun2000.x.inverter.x.battery.runningStatus` зберігається як номер. Перекладено значення (наприклад, STANDBY, RUNNING тощо) зберігається в шляху сонце2000.x.inverter.x.battery.derived",
-        "zh-cn": "通过 Emma 添加对充电器的支持, 并保存充电器路径 # 171 中的数据\n在 meter.activePower和meter阶段的功率之间建立数据一致性 #174\n在使用 Emma 时允许“ control. battery. force from GridFunction ”\n断开更改 :\n将“sun2000.x.inverter.x.battery.running Status”作为数字保存。 翻译值( 如 STANDBY, RUNNING 等) 存储在路径 sun2000.x.inverter.x.battery. 衍生"
       }
     },
     "titleLang": {

package/lib/controls/inverter_service_queue.js

@@ -55,8 +55,10 @@ class ServiceQueueMap {
 			},
 			{
 				state: { id: 'battery.chargeFromGridFunction', name: 'Charge from grid', type: 'boolean', role: 'switch.enable', desc: 'reg: 47087, len: 1' },
-				type: deviceType.battery,
-				deactiveIfEmmaAvailable: true,
+				//type: deviceType.gridPowerControl,
+				//deactiveIfEmmaAvailable: true,
+				//It is currently unknown whether the ChargeFromGrid(AC) does not work when using the Emma.
+				type: deviceType.inverter, //
 				fn: async event => {
 					const ret = await this._writeRegisters(47087, event.value === true ? [1] : [0]);
 					if (ret) {

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 for Emma - ret: ${JSON.stringify(ret)}`);
+							this.log.debug(`### PostHook identification for Emmachargers - ret: ${JSON.stringify(ret)}`);
 							for (const [i, charger] of ret.entries()) {
 								const device = {
 									index: i,
@@ -587,9 +587,9 @@ class Emma extends DriverBase {
 						});
 					this.identifySubdevices('sun2000', this.modbusId)
 						.then(ret => {
-							this.log.debug(`### PostHook for InverterSun2000 - ret: ${JSON.stringify(ret)}`);
-							for (const [i, inverter] of ret.entries()) {
-								this.log.info(`inverter ${i} sun2000 found - modbus id: ${inverter.slave_id}`);
+							this.log.debug(`### PostHook indentification for Inverter Sun2000 - ret: ${JSON.stringify(ret)}`);
+							for (const [, inverter] of ret.entries()) {
+								this.log.info(`${this._name} identify subdevice an inverter sun2000: OID=${inverter.obj_id}, modbus id: ${inverter.slave_id}`);
 							}
 						})
 						.catch(err => {

package/lib/drivers/driver_inverter.js

@@ -153,11 +153,12 @@ class InverterSun2000 extends DriverBase {
 					this.identifySubdevices('sun2000', this.modbusId)
 						.then(ret => {
 							this.log.debug(`### PostHook for InverterSun2000 - ret: ${JSON.stringify(ret)}`);
-							for (const [i, charger] of ret.entries()) {
+							for (const [i, inverter] of ret.entries()) {
+								this.log.info(`${this._name} identifies an inverter sun2000: OID=${inverter.obj_id}, modbus id: ${inverter.slave_id}`);
 								const device = {
 									index: i,
 									duration: 0,
-									modbusId: charger.slave_id,
+									modbusId: inverter.slave_id,
 									driverClass: driverClasses.emmaCharger,
 								};
 								this.adapter.devices.push(device);

package/lib/register.js

@@ -80,7 +80,7 @@ class Registers {
 						let usableSurplusPower = 0;
 
 						if (this.adapter.control) {
-							surplusPower += feedinPower;
+							surplusPower = feedinPower;
 
 							const minSoc = this.adapter.control.get('usableSurplus.minSoc')?.value ?? 0;
 							let bufferSoc = this.adapter.control.get('usableSurplus.bufferSoc')?.value ?? 0;
@@ -88,13 +88,21 @@ class Registers {
 							const soc = this.stateCache.get('collected.SOC')?.value ?? 0;
 							const allowNegativeValue = this.adapter.control.get('usableSurplus.allowNegativeValue')?.value ?? false;
 							const hysterese = this.adapter.control.get('usableSurplus.bufferHysteresis')?.value ?? 0;
-							// chargeDischarge
+							// discharge power is negative
 							if (chargeDischarge < 0) {
 								surplusPower += chargeDischarge;
 							}
-							if (soc >= minSoc) {
+
+							let threshold = hysterese / 2;
+							if (this.bufferOn) {
+								threshold = -threshold;
+							}
+
+							if (soc > minSoc) {
+								// charge power is positive
 								if (chargeDischarge > 0) surplusPower += chargeDischarge;
-								if (bufferSoc === 0 || soc < bufferSoc) {
+
+								if (bufferSoc === 0 || soc < bufferSoc + threshold) {
 									surplusPower -= residualPower / 1000;
 								}
 							}
@@ -102,11 +110,6 @@ class Registers {
 							usableSurplusPower = surplusPower;
 
 							if (bufferSoc > 0) {
-								let threshold = hysterese / 2;
-
-								if (this.bufferOn) {
-									threshold = -threshold;
-								}
 								if (soc > minSoc && soc >= bufferSoc + threshold) {
 									this.bufferOn = true;
 									const bufferPower = this.adapter.control.get('usableSurplus.bufferPower')?.value ?? 0;
@@ -165,7 +168,6 @@ class Registers {
 					this.stateCache.set('collected.inputPower', inPower, { type: 'number', renew: true });
 					this.stateCache.set('collected.inputPowerWithEfficiencyLoss', inPowerEff, { type: 'number' });
 					this.stateCache.set('collected.activePower', actPower, { type: 'number', renew: true });
-					//this.stateCache.set('collected.feed-inPower', feedinPower, { type: 'number' }); //positive -> power to grid
 					this.stateCache.set('collected.houseConsumption', houseConsum, { type: 'number' });
 					this.stateCache.set('collected.chargeDischargePower', chargeDischarge, { type: 'number' });
 					this.stateCache.set('collected.usableSurplusPower', surplusArray[1], {

package/package.json

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