iobroker.sun2000 2.4.5 → 2.5.1

package/README.md

@@ -27,7 +27,7 @@ Read and write register data from Huawei SUN2000 inverter and LUNA2000 battery u
 Feel free to follow the discussions in the german [iobroker forum](https://forum.iobroker.net/topic/71768/test-adapter-sun2000-v0-1-x-huawei-wechselrichter)
 
 ## Requirements
-* Node.js 20 or higher
+* Node.js 22 or higher
 * ioBroker host (js-controller) 6.0.11 or higher
 * ioBroker admin 7.6.20 or higher
 
@@ -69,6 +69,19 @@ The sun2000 adapter calculates how much of your self-generated solar energy is a
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 2.5.1 (2026-06-29)
+- (bolliy) fix: update service queue logic ([#283](https://github.com/bolliy/ioBroker.sun2000/discussions/283))
+- (bolliy) statistics fix: adjust reset handling logic to treat significant drops in value as potential resets
+
+### 2.5.0 (2026-06-09)
+* (bolliy) statistics: added live power chart (statistics.jsonLive)
+* (bolliy) statistics: consumption breakdown — breakdown values are now subtracted from the total `consumption` entry so the lower chart panel shows the remainder separately from the breakdown series
+* (bolliy) statistics: `xAxisFormatter` for the live chart only labels full-hour ticks to avoid clutter
+* (bolliy) statistics: tooltip formatter refactored — `formatTooltipValue(unit, negative, decimals)` helper used consistently across all series
+* (bolliy) statistics: if no battery is present, the charts are generated without battery information (SOC, charge, discharge).
+* (bolliy) fix emma: update register addresses of meter.activePowerL1-L3 ([#282](https://github.com/bolliy/ioBroker.sun2000/issues/282))
+* (bolliy) requires node.js >= 22
+
 ### 2.4.5 (2026-05-14)
 * statistics fix: return weekly range up to current Monday
 * statistics: added support for generating statistics templates directly from built-in charts
@@ -83,18 +96,7 @@ The sun2000 adapter calculates how much of your self-generated solar energy is a
 * statistics: computed values `selfSufficiency` and `selfConsumption` calculated automatically in all time-series states
 * statistics: data placeholders (`%%solarYield%%`, `%%selfSufficiency%%` etc.) and negated variants (`%%gridExportNeg%%` etc.) for mirrored chart layouts
 
-### 2.4.2 (2026-04-04)
-* fix test-and-release: deploy with 24.x
-* statistics: flexcharts integration — built-in Apache ECharts configuration with bar and line chart support
-* statistics: day-break visualization with alternating shaded areas for hourly charts
-* statistics: per chart-type templates (`statistics.flexCharts.template.hourly` etc.) for full ECharts customization including functions
-* statistics: data placeholders (`%%solarYield%%`, `%%gridExport%%` etc.) allow complete chart layout control via template states
-* statistics: chart output states (`statistics.flexCharts.jsonOutput.hourly` etc.) updated automatically each hour
-
-### 2.4.0 (2026-03-14)
-* fix: the order of bit assignment corrected of alarmsJSON
-* new state `inverter.x.emma.activeAlarmSN` and `inverter.x.emma.HistoricalAlarmSN` : emma alarms  [#226](https://github.com/bolliy/ioBroker.sun2000/issues/226)
-* statistics: Aggregates historical collected datapoints into time-based summaries (e.g. hourly, daily, monthly, yearly). The data is stored in the path `statistics` as JSON.
+[Older changelogs can be found there](CHANGELOG_OLD.md)
 
 ## License
 MIT License

package/admin/jsonConfig.json5

@@ -385,6 +385,39 @@
                 }
             }
         },  
+        "tab8": {
+            "type": "panel",
+            "label": "Statistics",
+            "items": {
+                "stat_liveInterval": {
+                    "type": "number",
+                    "label": "Live chart interval (min)",
+                    "min" : 1,
+                    "max" : 15,
+                    "newLine": true,
+                    "tooltip": "Live chart update interval in minutes",
+                    "xs": 12,
+                    "sm": 12,
+                    "md": 6,
+                    "lg": 4,
+                    "xl": 4
+                },
+                "staticLink1": {
+                    "type": "staticLink",
+                    "text": "Information and settings regarding the statistics explained in the wiki",
+                    "href": "https://github.com/bolliy/ioBroker.sun2000/wiki/Statistk-(statistics)",
+                    "button": true,
+                    "icon": "info",
+                    "newLine": true,
+                    "xs": 12,
+                    "sm": 12,
+                    "md": 6,
+                    "lg": 3,
+                    "xl": 3
+                }     
+            }
+
+        },
         "tab7": {
             "type": "panel",
             "label": "Further Register",

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "sun2000",
-    "version": "2.4.5",
+    "version": "2.5.1",
     "news": {
+      "2.5.1": {
+        "en": "fix: update service queue logic ([#283](https://github.com/bolliy/ioBroker.sun2000/discussions/283))\nstatistics fix: adjust reset handling logic to treat significant drops in value as potential resets",
+        "de": "fix: update service queue logic ([#283](https://github.com/bolliy/ioBroker.sun2000/discussions/283))\nstatistics fix: anpassung der reset-handling-logik, um signifikante wertverluste als potenzielle resets zu behandeln",
+        "ru": "исправить: обновить логику очереди обслуживания ([#283](https://github.com/bolliy/ioBroker.sun2000/discussions/283))\nисправление статистики: настройте логику обработки сбросов, чтобы рассматривать значительное снижение стоимости как потенциальные сбросы",
+        "pt": "fix: update service fila logic ([#283](https://github.com/bolliy/ioBroker.sun2000/discussions/283))\nstatistics fix: ajuste a lógica de manipulação de reset para tratar quedas significativas no valor como resets potenciais",
+        "nl": "fix: update service wachtrij logica ([#283](https://github.com/bolliy/ioBroker.sun2000/discussions/283))\nstatistieken fix: aanpassen reset handling logica om significante dalingen in waarde te behandelen als potentiële ressets",
+        "fr": "correction: mise à jour de la logique de la file d'attente de service ([#283](https://github.com/bolliy/ioBroker.sun2000/discussions/283))\ncorrection statistique: ajuster la logique de réinitialisation pour traiter les baisses significatives de valeur comme des réinitialisations potentielles",
+        "it": "correzione: aggiornamento della coda di servizio logica ([#283](https://github.com/bolliy/ioBroker.sun2000/discussions/283))\nstatistiche fix: regolare la gestione del reset logica per trattare gocce significative di valore come potenziali reset",
+        "es": "fix: update service queue logic ([#283](https://github.com/bolliy/ioBroker.sun2000/discussions/283))\nestadística fijado: ajuste la lógica de manejo de reajuste para tratar gotas significativas en valor como posibles reajustes",
+        "pl": "fix: update service queue logic ([# 283] (https: / / github.com / bolliy / ioBroker.sun2000 / discussions / 283))\nstatystyki fix: dostosować logikę obsługi reset w celu traktowania znaczących spadku wartości jako potencjalnych reset",
+        "uk": "виправити: оновити логіку черги ([#283](https://github.com/bolliy/ioBroker.sun2000/discussions/283)))\nвиправлення статистичних даних: регулюйте логіку обробки скидання для обробки значних крапель у значення як потенційні скидання",
+        "zh-cn": "fix:更新服务队列逻辑([#283] (https://github.com/bolliy/ioBroker.sun2000/discussions/283))\n统计修补:调整重置处理逻辑,将价值大幅下降视为潜在重置"
+      },
+      "2.5.0": {
+        "en": "statistics: added live power chart (statistics.jsonLive)\nrequires node.js >= 22",
+        "de": "statistiken: Live Power Chart hinzugefügt (statistics.jsonLive)\nrequires node.js >= 22",
+        "ru": "статистика: добавлена живая диаграмма мощности (statistics.jsonLive)\nrequires node.js >= 22",
+        "pt": "estatísticas: gráfico de potência ao vivo adicionado (statistics.jsonLive)\nrequires node.js >= 22",
+        "nl": "statistieken: toegevoegde live power chart (statistics.jsonLive)",
+        "fr": "statistiques: tableau de puissance en direct ajouté (statistiques.jsonLive)\nrequires node.js >= 22",
+        "it": "statistiche: aggiunto live power chart (statistics.jsonLive)\nrequires node.js >= 22",
+        "es": "estadística: añadido gráfico de potencia en vivo (statistics.jsonLive)\nrequires node.js >= 22",
+        "pl": "statystyki: dodany live power chart (statistics.jsonLive)\nrequires node.js >= 22",
+        "uk": "статистика: додано графік живої потужності (statistics.jsonLive)\nrequires node.js >= 22",
+        "zh-cn": "统计:增加的实电图(统计学.jsonLive)"
+      },
       "2.4.5": {
         "en": "statistics fix: return weekly range up to current Monday\nstatistics: added support for generating statistics templates directly from built-in charts\nstatistics: improved tooltip formatter - tooltip units are now provided explicitly via tooltip.valueFormatter",
         "de": "statistik fix: wöchentliche Rückgabe bis zum aktuellen Montag\nstatistik: unterstützung für die erstellung von statistiken vorlagen direkt aus integrierten diagrammen\nstatistiken: verbesserter Tooltip-Formater - Tooltip-Einheiten werden nun explizit über tooltip.valueFormatter bereitgestellt",
@@ -67,32 +93,6 @@
         "pl": "fix: kolejność przypisywania bitów poprawionych alarmów JSON\nw języku angielskim:\nstatystyki: Zagregowane historyczne zbierane punkty danych w skróty czasowe (np. godzinowe, dzienne, miesięczne, roczne). Dane są przechowywane w ścieżce \"statystyki\" jako JSON.",
         "uk": "фіксувати: порядок відведення біту виправлено тривоги Сонце\nновий стан `inverter.x.emma.activeAlarmSN` і `inverter.x.emma.HistoricalAlarmSN` : emma тривоги [#226](https://github.com/bolliy/ioBroker.sun2000/products/226)\nстатистика: Агрегати історичних зібраних точок даних на часові суми (наприклад, час, щоденно, щомісяця, рік). Дані зберігаються на шляху `statistics` як JSON.",
         "zh-cn": "固定: 修改提醒的位任务顺序 贾森\n新状态`inverter.x.emma.active AlarmSN ' 和`inverter.x.emma. Historical AlarmSN ' : emma警报[# 226](https://github.com/bolliy/ioBroker.sun2000/issues/226)\n统计: 将历史收集的数据点汇总为时间摘要(如小时、每日、每月、每年)。 数据作为JSON储存在路径`统计'中."
-      },
-      "2.3.7": {
-        "en": "deleted deprecated state `collected.usableSurplusPower`",
-        "de": "gelöschter deprecated state `collect.usableSurplusPower `",
-        "ru": "удаленное устаревшее состояние 'collected.usableSurplusPower пункт",
-        "pt": "estado desactualizado excluído `colected.usableSurplusPower `",
-        "nl": "verwijderde verouderde staat  Wat",
-        "fr": "état obsolète supprimé `collected.usableSurplusPower \"",
-        "it": "cancellato stato deprecato `colletto.usableSurplusPower #",
-        "es": "borrado estado deprecatado `collected.usableSurplusPower `",
-        "pl": "usunięty stan zdepregatowany \"collected.usableSurplusPower '",
-        "uk": "вилучена депресована держава `collected.usableSurplusPower й",
-        "zh-cn": "删除已贬值状态“ 已收集。 可使用 SurplusPower `"
-      },
-      "2.3.6": {
-        "en": "dependency and configuration updates\nnew state `inverter.x.derived.alarmsJSON` : json array with intverter alarms (id, name, level) [#226](https://github.com/bolliy/ioBroker.sun2000/issues/226)\nadd ChargeDischargePower for Battery units [#234](https://github.com/bolliy/ioBroker.sun2000/issues/234)\nadd minimum and maximum temperature for battery packs [#236](https://github.com/bolliy/ioBroker.sun2000/issues/236)",
-        "de": "abhängigkeits- und konfigurationsupdates\nneuer Zustand `inverter.x.derived.alarmsJSON`: json array with intverter alarms (id, name, level) [#226](https://github.com/bolliy/ioBroker.sun2000/issues/226)\nadd ChargeDischargePower for Battery Units [#234](https://github.com/bolliy/ioBroker.sun2000/issues/234)\nmindest- und Höchsttemperatur für Akkupacks [#236](https://github.com/bolliy/ioBroker.sun2000/issues/236)",
-        "ru": "обновления зависимостей и конфигурации\njson array with intverter alarms (id, name, level) [#226] (https://github.com/bolliy/ioBroker.sun2000/issues/226)\nдобавить ChargeDischargePower для батарейных блоков [#234] (https://github.com/bolliy/ioBroker.sun2000/issues/234)\nдобавить минимальную и максимальную температуру для аккумуляторных батарей [#236] (https://github.com/bolliy/ioBroker.sun2000/issues/236)",
-        "pt": "atualizações de dependência e configuração\nnovo estado `inverter.x.derived.alarmsJSON` : json array com alarmes de inversor (id, name, level) [#226](https://github.com/bolliy/ioBroker.sun2000/issues/226)\nadicionar ChargeDischargePower for Battery units [#234](https://github.com/bolliy/ioBroker.sun2000/issues/234)\nadicionar temperatura mínima e máxima para pacotes de bateria [#236](https://github.com/bolliy/ioBroker.sun2000/issues/236)",
-        "nl": "afhankelijkheid en configuratie-updates\nnieuwe staat \nchargeDischargePower for Battery units [#234](https://github.com/bolliy/ioBroker.sun2000/issues/234)\nminimum- en maximumtemperatuur toevoegen voor batterijpakketten [#236](https://github.com/bolliy/ioBroker.sun2000/issues/236)",
-        "fr": "mises à jour de la dépendance et de la configuration\nnouvel état `inverter.x.derived.alarmsJSON` : tableau json avec alarmes d'intverter (id, nom, niveau) [#226](https://github.com/bolliy/ioBroker.sun2000/issues/226)\najouter ChargeDischargePower pour les unités de batterie [#234](https://github.com/bolliy/ioBroker.sun2000/issues/234)\najouter la température minimale et maximale pour les batteries [#236](https://github.com/bolliy/ioBroker.sun2000/issues/236)",
-        "it": "aggiornamenti di dipendenza e configurazione\nnuovo stato `inverter.x.derived.alarmsJSON` : json array con allarme intverter (id, nome, livello) [#226](https://github.com/bolliy/ioBroker.sun2000/problems/226)\naggiungi ChargeDischargePower per batterie [#234](https://github.com/bolliy/ioBroker.sun2000/issues/234)\naggiungere la temperatura minima e massima per le batterie [#236](https://github.com/bolliy/ioBroker.sun2000/issues/236)",
-        "es": "actualizaciones de dependencia y configuración\nnuevo estado `inverter.x.derived.alarmsJSON` : json array with intverter alarms (id, name, level) [#226](https://github.com/bolliy/ioBroker.sun2000/issues/226)\nañadir ChargeDischargePower for Battery units [#234](https://github.com/bolliy/ioBroker.sun2000/issues/234)\nañadir la temperatura mínima y máxima para los paquetes de baterías [#236](https://github.com/bolliy/ioBroker.sun2000/issues/236)",
-        "pl": "aktualizacje zależności i konfiguracji\nnowość \"inverter.x.derived.alarmsJSON\": tablica json z alarmami intverter (id, name, level) [# 226] (https: / / github.com / bolliy / ioBroker.sun2000 / issues / 226)\ndata umieszczenia w wykazie\ndodać minimalną i maksymalną temperaturę dla baterii [# 236] (https: / / github.com / bolliy / ioBroker.sun2000 / issues / 236)",
-        "uk": "оновлення залежності та конфігурації\nновий стан `inverter.x.derived.alarmsJSON` : json array with intverter тривоги (id, назва, рівень) [#226](https://github.com/bolliy/ioBroker.sun2000/products/226)\nadd ChargeDischargePower для батарей [#234](https://github.com/bolliy/ioBroker.sun2000/products/234)\nдодайте мінімальну і максимальну температуру для акумуляторних пакетів [#236](https://github.com/bolliy/ioBroker.sun2000/products/236)",
-        "zh-cn": "依赖和配置更新\nnew state `inverter.x. inducted.alarmsJSON ' : json 数组带内置式警报器(id, name, level) [# 226] (https://github.com/bolliy/ioBroker.sun2000/issues/226) (中文(简体) )\n添加电池单位充电放电器[#234](https://github.com/bolliy/ioBroker.sun2000/issues/234)\n增加电池包的最低和最高温度[第236号](https://github.com/bolliy/ioBroker.sun2000/issues/236)"
       }
     },
     "titleLang": {
@@ -251,7 +251,8 @@
     "ds_bu": true,
     "ds_bp": false,
     "cb_tou": false,
-    "integration": 0
+    "integration": 0,
+    "stat_liveInterval": 5
   },
   "objects": [],
   "instanceObjects": [
@@ -285,7 +286,7 @@
           "de": "Gerät angeschlossen"
         },
         "type": "boolean",
-        "role": "indicator.connected",
+        "role": "sensor",
         "read": true,
         "write": false,
         "desc": "Is the device connected?"
@@ -300,7 +301,7 @@
           "de": "Geräte IP"
         },
         "type": "string",
-        "role": "indicator.ip",
+        "role": "text",
         "read": true,
         "write": false,
         "desc": "Device IP address"
@@ -315,7 +316,7 @@
           "de": "Modbusport"
         },
         "type": "number",
-        "role": "indicator.port",
+        "role": "value",
         "read": true,
         "write": false,
         "desc": "Device modbus port"
@@ -330,7 +331,7 @@
           "de": "Modbus IDs der Geräte"
         },
         "type": "string",
-        "role": "indicator.id",
+        "role": "text",
         "read": true,
         "write": false,
         "desc": "device modbus IDs"
@@ -345,7 +346,7 @@
           "de": "modbus Update Intervall"
         },
         "type": "number",
-        "role": "value",
+        "role": "time.interval",
         "read": true,
         "write": false,
         "desc": "modbus update interval",
@@ -361,7 +362,7 @@
           "de": "modbus timeout"
         },
         "type": "number",
-        "role": "value",
+        "role": "time.timeout",
         "read": true,
         "write": false,
         "desc": "modbus timeout",
@@ -377,7 +378,7 @@
           "de": "modbus delay"
         },
         "type": "number",
-        "role": "value",
+        "role": "time.span",
         "read": true,
         "write": false,
         "desc": "delay between modbus requests",
@@ -393,7 +394,7 @@
           "de": "modbus connect delay"
         },
         "type": "number",
-        "role": "value",
+        "role": "time.span",
         "read": true,
         "write": false,
         "desc": "delay after modbus connected",
@@ -409,7 +410,7 @@
           "de": "Gesundheitsinformation"
         },
         "type": "string",
-        "role": "indicator.alarm.health",
+        "role": "json",
         "read": true,
         "write": false,
         "desc": "",
@@ -425,7 +426,7 @@
           "de": "modbus Server aktiv"
         },
         "type": "boolean",
-        "role": "value",
+        "role": "sensor",
         "read": true,
         "write": false,
         "desc": "",

package/lib/controls/inverter_service_queue.js

@@ -12,7 +12,7 @@ class ServiceQueueMap {
 		this._eventMap = new Map();
 		this._initialized = false;
 		this._name = 'inverter control';
-		this._emmaAvailable = this.adapter.devices.find(d => d.driverClass == driverClasses.emma);
+		//this._emmaAvailable = this.adapter.devices.find(d => d.driverClass == driverClasses.emma);
 
 		this.serviceFields = [
 			{

package/lib/drivers/driver_base.js

@@ -9,6 +9,7 @@ class DriverBase {
 		this.adapter = stateInstance.adapter;
 		this.stateCache = stateInstance.stateCache;
 		this.deviceInfo = device;
+
 		this._modbusClient = null; //NEW!!
 		//https://wiki.selfhtml.org/wiki/JavaScript/Operatoren/Nullish_Coalescing_Operator
 		//https://stackoverflow.com/questions/2851404/what-does-options-options-mean-in-javascript
@@ -77,7 +78,7 @@ class DriverBase {
 	 * @returns {boolean} True if the device is in test mode, false otherwise
 	 */
 	isTestMode() {
-		return false;
+		return this.deviceInfo.testMode ?? false;
 	}
 
 	logHoldingRegisters(startAddr, length) {

package/lib/drivers/driver_emma.js

@@ -10,6 +10,10 @@ class Emma extends DriverBase {
 			...options,
 		});
 
+		if (this.isTestMode()) {
+			this._modbusId = 1;
+		}
+
 		this.control = new ServiceQueueMap(this.adapter, this.deviceInfo); //emma service queue
 
 		//https://github.com/ioBroker/ioBroker.docs/blob/master/docs/en/dev/stateroles.md
@@ -590,6 +594,10 @@ class Emma extends DriverBase {
 							this.log.debug(`### PostHook indentification for Inverter Sun2000 - ret: ${JSON.stringify(ret)}`);
 							//check if inverter sun2000 already exists
 							const inverterExist = this.adapter.devices.findIndex(x => x.driverClass === driverClasses.inverter);
+							//TestMode
+							if (this.isTestMode() && ret.length === 0) {
+								ret.push({ slave_id: 1 });
+							}
 							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
@@ -707,9 +715,9 @@ class Emma extends DriverBase {
 							type: 'number',
 							unit: 'kW',
 							role: 'value.power',
-							desc: 'reg:31651, len:2',
+							desc: 'reg:31665, len:2',
 						},
-						register: { reg: 31651, type: dataType.int32, gain: 1000 },
+						register: { reg: 31665, type: dataType.int32, gain: 1000 },
 					},
 					{
 						state: {
@@ -718,9 +726,9 @@ class Emma extends DriverBase {
 							type: 'number',
 							unit: 'kW',
 							role: 'value.power',
-							desc: 'reg:31653, len:2',
+							desc: 'reg:31667, len:2',
 						},
-						register: { reg: 31653, type: dataType.int32, gain: 1000 },
+						register: { reg: 31667, type: dataType.int32, gain: 1000 },
 					},
 					{
 						state: {
@@ -729,9 +737,9 @@ class Emma extends DriverBase {
 							type: 'number',
 							unit: 'kW',
 							role: 'value.power',
-							desc: 'reg:31655, len:2',
+							desc: 'reg:31669, len:2',
 						},
-						register: { reg: 31655, type: dataType.int32, gain: 1000 },
+						register: { reg: 31669, type: dataType.int32, gain: 1000 },
 					},
 					{
 						state: {
@@ -804,16 +812,6 @@ class Emma extends DriverBase {
 
 		this.registerFields.push.apply(this.registerFields, newFields);
 	}
-
-	// Override
-	/**
-	 * Checks if the device is in test mode
-	 * @returns {boolean} True if the device is in test mode, false otherwise
-	 * A device is considered in test mode if its modbus ID is not equal to 0.
-	 */
-	isTestMode() {
-		return this.modbusId !== 0;
-	}
 }
 
 class EmmaCharger extends DriverBase {

package/lib/drivers/driver_inverter.js

@@ -103,6 +103,20 @@ class InverterSun2000 extends DriverBase {
 				this.activePowerSum.setStart(state?.val, state?.ts);
 			}
 		});
+		/*
+		this.chargeSumHelper = new RiemannSum();
+		this.adapter.getState(`${this.deviceInfo.path}.battery.currentDayChargeCapacity`, (err, state) => {
+			if (!err && state) {
+				this.chargeSumHelper.setStart(state?.val, state?.ts, false);
+			}
+		});
+		this.dischargeSumHelper = new RiemannSum();
+		this.adapter.getState(`${this.deviceInfo.path}.battery.currentDayDischargeCapacity`, (err, state) => {
+			if (!err && state) {
+				this.dischargeSumHelper.setStart(state?.val, state?.ts, false);
+			}
+		});
+		*/
 
 		this.control = new ServiceQueueMap(this.adapter, this.deviceInfo);
 
@@ -222,6 +236,37 @@ class InverterSun2000 extends DriverBase {
 				],
 				//Check if the address field is active
 				checkIfActive: () => this._batteryExists(),
+				/*
+				postHook: path => {
+					//calculate daily charge and discharge capacity
+					const chargeDischargePower = this.stateCache.get(`${path}battery.chargeDischargePower`)?.value ?? 0;
+					if (chargeDischargePower > 0) this.chargeSumHelper.add(chargeDischargePower); //riemann Sum for charge power
+					if (chargeDischargePower < 0) this.dischargeSumHelper.add(-chargeDischargePower); //riemann Sum for discharge power
+
+					const now = new Date();
+					const minute = now.getMinutes();
+					const hour = now.getHours();
+					//reset at 00:00 - until 00:05 if the inverter is a bit late with the update
+					if (hour !== 0 || minute > 5) {
+						const currentDayChargeCapacity = this.stateCache.get(`${path}battery.currentDayChargeCapacity`)?.value;
+						if (currentDayChargeCapacity !== undefined) {
+							if (!this.chargeSumHelper.startInitialized || currentDayChargeCapacity > this.chargeSumHelper.sum) {
+								this.chargeSumHelper.setStart(currentDayChargeCapacity);
+							}
+						}
+
+						const currentDayDischargeCapacity = this.stateCache.get(`${path}battery.currentDayDischargeCapacity`)?.value;
+						if (currentDayDischargeCapacity !== undefined) {
+							if (!this.dischargeSumHelper.startInitialized || currentDayDischargeCapacity > this.dischargeSumHelper.sum) {
+								this.dischargeSumHelper.setStart(currentDayDischargeCapacity);
+							}
+						}
+					}
+
+					this.stateCache.set(`${path}battery.statistics.currentDayChargeCapacity`, this.chargeSumHelper.sum, { type: 'number', stored: true }); //stored for statistics
+					this.stateCache.set(`${path}battery.statistics.currentDayDischargeCapacity`, this.dischargeSumHelper.sum, { type: 'number', stored: true }); //stored for statistics
+				},
+				*/
 			},
 			{
 				address: 32064,
@@ -236,7 +281,7 @@ class InverterSun2000 extends DriverBase {
 							name: 'Input power',
 							type: 'number',
 							unit: 'kW',
-							role: 'value.power.produced',
+							role: 'value.power',
 							desc: 'reg:32064, len:2, Power from solar',
 						},
 						register: { reg: 32064, type: dataType.int32, gain: 1000 },
@@ -465,7 +510,7 @@ class InverterSun2000 extends DriverBase {
 							name: 'Total charge',
 							type: 'number',
 							unit: 'kWh',
-							role: 'value.power.consumption',
+							role: 'value.power.consumed',
 							desc: 'reg:38238, len:2',
 						},
 						register: { reg: 38238, type: dataType.uint32, gain: 100 },
@@ -476,7 +521,7 @@ class InverterSun2000 extends DriverBase {
 							name: 'Total discharge',
 							type: 'number',
 							unit: 'kWh',
-							role: 'value.power.consumption',
+							role: 'value.power.produced',
 							desc: 'reg:38240, len:2',
 						},
 						register: { reg: 38240, type: dataType.uint32, gain: 100 },
@@ -508,7 +553,7 @@ class InverterSun2000 extends DriverBase {
 							name: 'Total charge',
 							type: 'number',
 							unit: 'kWh',
-							role: 'value.power.consumption',
+							role: 'value.power.consumed',
 							desc: 'reg:38280, len:2',
 						},
 						register: { reg: 38280, type: dataType.uint32, gain: 100 },
@@ -519,7 +564,7 @@ class InverterSun2000 extends DriverBase {
 							name: 'Total discharge',
 							type: 'number',
 							unit: 'kWh',
-							role: 'value.power.consumption',
+							role: 'value.power.produced',
 							desc: 'reg:38282, len:2',
 						},
 						register: { reg: 38282, type: dataType.uint32, gain: 100 },
@@ -551,7 +596,7 @@ class InverterSun2000 extends DriverBase {
 							name: 'Total charge',
 							type: 'number',
 							unit: 'kWh',
-							role: 'value.power.consumption',
+							role: 'value.power.consumed',
 							desc: 'reg:38322, len:2',
 						},
 						register: { reg: 38322, type: dataType.uint32, gain: 100 },
@@ -562,7 +607,7 @@ class InverterSun2000 extends DriverBase {
 							name: 'Total discharge',
 							type: 'number',
 							unit: 'kWh',
-							role: 'value.power.consumption',
+							role: 'value.power.produced',
 							desc: 'reg:38324, len:2',
 						},
 						register: { reg: 38324, type: dataType.uint32, gain: 100 },
@@ -843,7 +888,7 @@ class InverterSun2000 extends DriverBase {
 							name: 'Total charge',
 							type: 'number',
 							unit: 'kWh',
-							role: 'value.power.consumption',
+							role: 'value.power.consumed',
 							desc: 'reg:37780, len:2',
 						},
 						register: { reg: 37780, type: dataType.uint32, gain: 100 },
@@ -854,7 +899,7 @@ class InverterSun2000 extends DriverBase {
 							name: 'Total discharge',
 							type: 'number',
 							unit: 'kWh',
-							role: 'value.power.consumption',
+							role: 'value.power.produced',
 							desc: 'reg:37782, len:2',
 						},
 						register: { reg: 37782, type: dataType.uint32, gain: 100 },
@@ -865,10 +910,11 @@ class InverterSun2000 extends DriverBase {
 							name: 'Current day charge capacity',
 							type: 'number',
 							unit: 'kWh',
-							role: 'value.power.consumption',
+							role: 'value.power.consumed',
 							desc: 'reg:37784, len:2',
 						},
 						register: { reg: 37784, type: dataType.uint32, gain: 100 },
+						//store: storeType.never,
 					},
 					{
 						state: {
@@ -876,10 +922,11 @@ class InverterSun2000 extends DriverBase {
 							name: 'Current day discharge capacity',
 							type: 'number',
 							unit: 'kWh',
-							role: 'value.power.consumption',
+							role: 'value.power.produced',
 							desc: 'reg:37786, len:2',
 						},
 						register: { reg: 37786, type: dataType.uint32, gain: 100 },
+						//store: storeType.never,
 					},
 				],
 				checkIfActive: () => this._batteryExists(),
@@ -1466,7 +1513,7 @@ class InverterSun2000 extends DriverBase {
 							name: 'Positive active energy',
 							type: 'number',
 							unit: 'kWh',
-							role: 'value.power.consumption',
+							role: 'value.power.produced',
 							desc: 'reg:37119, len:2',
 						},
 						register: { reg: 37119, type: dataType.int32, gain: 100 },
@@ -1477,7 +1524,7 @@ class InverterSun2000 extends DriverBase {
 							name: 'Reverse active energy',
 							type: 'number',
 							unit: 'kWh',
-							role: 'value.power.consumption',
+							role: 'value.power.consumed',
 							desc: 'reg:37121, len:2',
 						},
 						register: { reg: 37121, type: dataType.int32, gain: 100 },
@@ -1488,7 +1535,7 @@ class InverterSun2000 extends DriverBase {
 							name: 'Accumulated reactive power',
 							type: 'number',
 							unit: 'kVarh',
-							role: 'value.power.reactive.consumption',
+							role: 'value.power.reactive.consumed',
 							desc: 'reg:37123, len:2',
 						},
 						register: { reg: 37123, type: dataType.int32, gain: 100 },
@@ -1643,7 +1690,7 @@ class InverterSun2000 extends DriverBase {
 					name: 'Portal yield today',
 					type: 'number',
 					unit: 'kWh',
-					role: 'value.power.consumption',
+					role: 'value.power.produced',
 					desc: 'yield from the portal',
 				},
 				fn: path => {
@@ -1666,7 +1713,7 @@ class InverterSun2000 extends DriverBase {
 					name: 'Solar yield today',
 					type: 'number',
 					unit: 'kWh',
-					role: 'value.power.consumption',
+					role: 'value.power.produced',
 					desc: 'Riemann sum of input power with efficiency loss',
 				},
 				fn: path => {
@@ -1680,7 +1727,7 @@ class InverterSun2000 extends DriverBase {
 					name: 'Active Energy today',
 					type: 'number',
 					unit: 'kWh',
-					role: 'value.power.consumption',
+					role: 'value.power.produced',
 					desc: 'Amount of Riemann sum of sum of active power',
 				},
 				fn: path => {
@@ -2104,7 +2151,7 @@ class InverterSun2000_M1 extends InverterSun2000 {
 							name: 'Total charge',
 							type: 'number',
 							unit: 'kWh',
-							role: 'value.power.consumption',
+							role: 'value.power.consumed',
 							desc: 'reg:38364, len:2',
 						},
 						register: { reg: 38364, type: dataType.uint32, gain: 100 },
@@ -2115,7 +2162,7 @@ class InverterSun2000_M1 extends InverterSun2000 {
 							name: 'Total discharge',
 							type: 'number',
 							unit: 'kWh',
-							role: 'value.power.consumption',
+							role: 'value.power.produced',
 							desc: 'reg:38366, len:2',
 						},
 						register: { reg: 38366, type: dataType.uint32, gain: 100 },
@@ -2147,7 +2194,7 @@ class InverterSun2000_M1 extends InverterSun2000 {
 							name: 'Total charge',
 							type: 'number',
 							unit: 'kWh',
-							role: 'value.power.consumption',
+							role: 'value.power.consumed',
 							desc: 'reg:38406, len:2',
 						},
 						register: { reg: 38406, type: dataType.uint32, gain: 100 },
@@ -2158,7 +2205,7 @@ class InverterSun2000_M1 extends InverterSun2000 {
 							name: 'Total discharge',
 							type: 'number',
 							unit: 'kWh',
-							role: 'value.power.consumption',
+							role: 'value.power.produced',
 							desc: 'reg:38408, len:2',
 						},
 						register: { reg: 38408, type: dataType.uint32, gain: 100 },
@@ -2190,7 +2237,7 @@ class InverterSun2000_M1 extends InverterSun2000 {
 							name: 'Total charge',
 							type: 'number',
 							unit: 'kWh',
-							role: 'value.power.consumption',
+							role: 'value.power.consumed',
 							desc: 'reg:38448, len:2',
 						},
 						register: { reg: 38448, type: dataType.uint32, gain: 100 },
@@ -2201,7 +2248,7 @@ class InverterSun2000_M1 extends InverterSun2000 {
 							name: 'Total discharge',
 							type: 'number',
 							unit: 'kWh',
-							role: 'value.power.consumption',
+							role: 'value.power.produced',
 							desc: 'reg:38450, len:2',
 						},
 						register: { reg: 38450, type: dataType.uint32, gain: 100 },