Merge pull request #202 from git-kick/Issue#199

Issue#199
git-kick · Nov 16, 2023 · d1db82b · d1db82b
2 parents 2a67a3b + 54f6e4c
commit d1db82b
Show file tree

Hide file tree

Showing 18 changed files with 81 additions and 52 deletions.
diff --git a/README.md b/README.md
@@ -337,6 +337,18 @@ The RSCP protocol groups *Tags* (i.e. states or values) into *Namespaces* (i.e.
     <td>number</td>
     <td>End minute of idle period (2).</td>
   </tr>
+  <tr>
+    <td>EP</td>
+    <td>PARAM_EP_RESERVE</td>
+    <td>number</td>
+    <td>Target reserve for emergency power; percentage of the battery capacity. Correlates to PARAM_EP_RESERVE_ENERGY.</td>
+  </tr>
+  <tr>
+    <td>EP</td>
+    <td>PARAM_EP_RESERVE_ENERGY</td>
+    <td>number</td>
+    <td>Target reserve for emergency power; energy in [Wh]. Correlates to PARAM_EP_RESERVE.</td>
+  </tr>
   <tr>
     <td>DB (3)</td>
     <td>TIME_START</td>
@@ -450,10 +462,14 @@ Here is a sample script for charge limit control - it is not meant for as-is usa
 <a name="log"></a>
 
 ## Changelog
-### 1.2.5 - UNDER DEVELOPMENT
-
+### 1.2.5-dev - UNDER DEVELOPMENT
+ 
 (git-kick)
-* Removed "dangerous" setter tags, instead of just switching them off - [Issue #196](https://github.com/git-kick/ioBroker.e3dc-rscp/issues/196)
+* Added setter function for PARAM_EP_RESERVE and PARAM_EP_RESERVE_ENERGY in EP namespace - [Issue #199](https://github.com/git-kick/ioBroker.e3dc-rscp/issues/199)  
+  * Renamed PARAM_EP_RESERVE_W to PARAM_EP_RESERVE_ENERGY because it is a [Wh] energy variable.
+  * Renamed PARAM_EP_RESERVE_MAX_W to PARAM_EP_RESERVE_MAX_ENERGY for the same reason.
+
+* Removed "dangerous" setter tags introduced with v1.2.4 , instead of just switching them off - [Issue #196](https://github.com/git-kick/ioBroker.e3dc-rscp/issues/196)
 
 
 ### 1.2.4

diff --git a/admin/i18n/de/translations.json b/admin/i18n/de/translations.json
@@ -199,9 +199,9 @@
     "OVERRIDE_AVAILABLE_POWER": "Übersteuern der verfügbaren Leistung",
     "PARAM_1": "Parameter 1",
     "PARAM_2": "Parameter 2",
-    "PARAM_EP_RESERVE": "Notstrom-Reserve",
-    "PARAM_EP_RESERVE_MAX_W": "Notstrom-Leistung maximal",
-    "PARAM_EP_RESERVE_W": "Notstrom-Leistung",
+    "PARAM_EP_RESERVE": "Notstromreserve, Soll prozentual",
+    "PARAM_EP_RESERVE_ENERGY": "Notstromreserve, Soll-Energie",
+    "PARAM_EP_RESERVE_MAX_ENERGY": "Notstromreserve, maximale Energie",
     "PARAM_LAST_SOC": "Letzter SOC",
     "PARAM_NO_REMAINING_RETRY": "Keine verbleibende Wiederholung",
     "PARAM_TIME_LAST_EMPTY": "Batterie zuletzt leer",

diff --git a/admin/i18n/en/translations.json b/admin/i18n/en/translations.json
@@ -199,9 +199,9 @@
     "OVERRIDE_AVAILABLE_POWER": "Override available power",
     "PARAM_1": "Parameter 1",
     "PARAM_2": "Parameter 2",
-    "PARAM_EP_RESERVE": "Emergency power reserve",
-    "PARAM_EP_RESERVE_MAX_W": "Emergency power maximum",
-    "PARAM_EP_RESERVE_W": "Emergency power",
+    "PARAM_EP_RESERVE": "Emergency energy reserve, target percentage",
+    "PARAM_EP_RESERVE_ENERGY": "Emergency energy reserve, target energy",
+    "PARAM_EP_RESERVE_MAX_ENERGY": "Emergency energy reserve, maximum energy",
     "PARAM_LAST_SOC": "Last SOC",
     "PARAM_NO_REMAINING_RETRY": "No remaining retry",
     "PARAM_TIME_LAST_EMPTY": "Latest battery empty timestamp",

diff --git a/admin/i18n/es/translations.json b/admin/i18n/es/translations.json
@@ -200,8 +200,8 @@
     "PARAM_1": "Parámetro 1",
     "PARAM_2": "Parámetro 2",
     "PARAM_EP_RESERVE": "Reserva de marcha de emergencia [Wh]",
-    "PARAM_EP_RESERVE_MAX_W": "Potencia máxima de emergencia [W]",
-    "PARAM_EP_RESERVE_W": "Energía de emergencia [W]",
+    "PARAM_EP_RESERVE_ENERGY": "Reserva de energía de emergencia, energía objetivo",
+    "PARAM_EP_RESERVE_MAX_ENERGY": "Reserva de energía de emergencia, energía máxima.",
     "PARAM_LAST_SOC": "Último SOC",
     "PARAM_NO_REMAINING_RETRY": "No queda ningún reintento",
     "PARAM_TIME_LAST_EMPTY": "Última marca de tiempo vacía de la batería",

diff --git a/admin/i18n/fr/translations.json b/admin/i18n/fr/translations.json
@@ -200,8 +200,8 @@
     "PARAM_1": "Paramètre 1",
     "PARAM_2": "Paramètre 2",
     "PARAM_EP_RESERVE": "Réserve de marche de secours [Wh]",
-    "PARAM_EP_RESERVE_MAX_W": "Puissance de secours maximale [W]",
-    "PARAM_EP_RESERVE_W": "Alimentation de secours [W]",
+    "PARAM_EP_RESERVE_ENERGY": "Réserve d'énergie de secours, énergie cible",
+    "PARAM_EP_RESERVE_MAX_ENERGY": "Réserve d'énergie de secours, énergie maximale",
     "PARAM_LAST_SOC": "Dernier SOC",
     "PARAM_NO_REMAINING_RETRY": "Aucune nouvelle tentative restante",
     "PARAM_TIME_LAST_EMPTY": "Dernier horodatage vide de la batterie",

diff --git a/admin/i18n/it/translations.json b/admin/i18n/it/translations.json
@@ -200,8 +200,8 @@
     "PARAM_1": "Parametro 1",
     "PARAM_2": "Parametro 2",
     "PARAM_EP_RESERVE": "Riserva di carica di emergenza [Wh]",
-    "PARAM_EP_RESERVE_MAX_W": "Potenza di emergenza massima [W]",
-    "PARAM_EP_RESERVE_W": "Potenza di emergenza [W]",
+    "PARAM_EP_RESERVE_ENERGY": "Riserva energetica di emergenza, energia target",
+    "PARAM_EP_RESERVE_MAX_ENERGY": "Riserva energetica di emergenza, massima energia",
     "PARAM_LAST_SOC": "Ultimo SOC",
     "PARAM_NO_REMAINING_RETRY": "Nessun tentativo rimanente",
     "PARAM_TIME_LAST_EMPTY": "Ultima batteria vuota timestamp",

diff --git a/admin/i18n/nl/translations.json b/admin/i18n/nl/translations.json
@@ -200,8 +200,8 @@
     "PARAM_1": "Parameter 1",
     "PARAM_2": "Parameter 2",
     "PARAM_EP_RESERVE": "Nood gangreserve [Wh]",
-    "PARAM_EP_RESERVE_MAX_W": "Maximaal noodvermogen [W]",
-    "PARAM_EP_RESERVE_W": "Noodvermogen [W]",
+    "PARAM_EP_RESERVE_ENERGY": "Noodenergiereserve, doelenergie",
+    "PARAM_EP_RESERVE_MAX_ENERGY": "Noodenergiereserve, maximale energie",
     "PARAM_LAST_SOC": "Laatste SOC",
     "PARAM_NO_REMAINING_RETRY": "Geen resterende nieuwe poging",
     "PARAM_TIME_LAST_EMPTY": "Laatste batterij lege tijdstempel",

diff --git a/admin/i18n/pl/translations.json b/admin/i18n/pl/translations.json
@@ -200,8 +200,8 @@
     "PARAM_1": "Parametr 1",
     "PARAM_2": "Parametr 2",
     "PARAM_EP_RESERVE": "Rezerwa mocy awaryjnej [Wh]",
-    "PARAM_EP_RESERVE_MAX_W": "Moc maksymalna awaryjna [W]",
-    "PARAM_EP_RESERVE_W": "Moc awaryjna [W]",
+    "PARAM_EP_RESERVE_ENERGY": "Rezerwa energii awaryjnej, energia docelowa",
+    "PARAM_EP_RESERVE_MAX_ENERGY": "Awaryjna rezerwa energii, maksymalna energia",
     "PARAM_LAST_SOC": "Ostatni SOC",
     "PARAM_NO_REMAINING_RETRY": "Brak pozostałych prób",
     "PARAM_TIME_LAST_EMPTY": "Najnowszy znacznik czasu opróżnienia baterii",

diff --git a/admin/i18n/pt/translations.json b/admin/i18n/pt/translations.json
@@ -200,8 +200,8 @@
     "PARAM_1": "Parâmetro 1",
     "PARAM_2": "Parâmetro 2",
     "PARAM_EP_RESERVE": "Reserva de energia de emergência [Wh]",
-    "PARAM_EP_RESERVE_MAX_W": "Potência máxima de emergência [W]",
-    "PARAM_EP_RESERVE_W": "Energia de emergência [W]",
+    "PARAM_EP_RESERVE_ENERGY": "Reserva de energia de emergência, energia alvo",
+    "PARAM_EP_RESERVE_MAX_ENERGY": "Reserva de energia de emergência, energia máxima",
     "PARAM_LAST_SOC": "Último SOC",
     "PARAM_NO_REMAINING_RETRY": "Nenhuma nova tentativa restante",
     "PARAM_TIME_LAST_EMPTY": "Carimbo de data / hora vazio da bateria mais recente",

diff --git a/admin/i18n/ru/translations.json b/admin/i18n/ru/translations.json
@@ -200,8 +200,8 @@
     "PARAM_1": "Параметр 1",
     "PARAM_2": "Параметр 2",
     "PARAM_EP_RESERVE": "Аварийный запас мощности [Втч]",
-    "PARAM_EP_RESERVE_MAX_W": "Максимальная аварийная мощность [Вт]",
-    "PARAM_EP_RESERVE_W": "Аварийная мощность [Вт]",
+    "PARAM_EP_RESERVE_ENERGY": "Аварийный запас энергии, целевая энергия",
+    "PARAM_EP_RESERVE_MAX_ENERGY": "Аварийный запас энергии, максимальная энергия",
     "PARAM_LAST_SOC": "Последний СОК",
     "PARAM_NO_REMAINING_RETRY": "Нет оставшихся повторов",
     "PARAM_TIME_LAST_EMPTY": "Последняя временная метка разряда батареи",

diff --git a/admin/i18n/uk/translations.json b/admin/i18n/uk/translations.json
@@ -200,8 +200,8 @@
     "PARAM_1": "Параметр 1",
     "PARAM_2": "Параметр 2",
     "PARAM_EP_RESERVE": "Аварійний резерв живлення",
-    "PARAM_EP_RESERVE_MAX_W": "Максимальна аварійна потужність",
-    "PARAM_EP_RESERVE_W": "Аварійне живлення",
+    "PARAM_EP_RESERVE_ENERGY": "Аварійний запас енергії, цільова енергія",
+    "PARAM_EP_RESERVE_MAX_ENERGY": "Аварійний запас енергії, максимальна енергія",
     "PARAM_LAST_SOC": "Останній SOC",
     "PARAM_NO_REMAINING_RETRY": "Немає повторних спроб",
     "PARAM_TIME_LAST_EMPTY": "Позначка часу останнього розрядження батареї",

diff --git a/admin/i18n/zh-cn/translations.json b/admin/i18n/zh-cn/translations.json
@@ -200,8 +200,8 @@
     "PARAM_1": "参数1",
     "PARAM_2": "参数2",
     "PARAM_EP_RESERVE": "紧急电源储备[Wh]",
-    "PARAM_EP_RESERVE_MAX_W": "紧急功率最大[W]",
-    "PARAM_EP_RESERVE_W": "应急电源[W]",
+    "PARAM_EP_RESERVE_ENERGY": "应急能量储备、目标能量",
+    "PARAM_EP_RESERVE_MAX_ENERGY": "应急能量储备，最大能量",
     "PARAM_LAST_SOC": "最后一个SOC",
     "PARAM_NO_REMAINING_RETRY": "没有剩余重试次数",
     "PARAM_TIME_LAST_EMPTY": "最新电池空时间戳",

diff --git a/admin/words.js b/admin/words.js
diff --git a/io-package.json b/io-package.json
@@ -1,9 +1,9 @@
 {
     "common": {
         "name": "e3dc-rscp",
-        "version": "1.2.5",
+        "version": "1.2.5-dev",
         "news": {
-            "1.2.5": {
+            "1.2.5-dev": {
                 "en": "Under development",
                 "de": "In Entwicklung",
                 "ru": "В разработке",

diff --git a/lib/RscpTags.json b/lib/RscpTags.json
@@ -4738,11 +4738,11 @@
 		"DataTagHex": "0x000010",
 		"NameSpace": "EP",
 		"NameSpaceHex": "0x0B",
-		"DataType": "Float32",
-		"DataTypeHex": "0x0A",
+		"DataType": "Container",
+		"DataTypeHex": "0x0E",
 		"UserLevel": "NO_AUTH",
 		"Unit": "",
-		"Description": "imported from nischram/E3dcGui"
+		"Description": "Container for setting PARAM_ values; imported from nischram/E3dcGui"
 	},
 	"453246976": {
 		"TagHex": "0x1B040000",
@@ -4781,7 +4781,7 @@
 		"DataTypeHex": "0x0A",
 		"UserLevel": "NO_AUTH",
 		"Unit": "%",
-		"Description": "imported from nischram/E3dcGui"
+		"Description": "target battery SOC kept as EP reserve (correlates with PARAM_EP_RESERVE_ENERGY); imported from nischram/E3dcGui"
 	},
 	"453247012": {
 		"TagHex": "0x1B040024",
@@ -4824,29 +4824,29 @@
 	},
 	"453247027": {
 		"TagHex": "0x1B040033",
-		"TagName": "PARAM_EP_RESERVE_W",
-		"TagNameGlobal": "TAG_EP_PARAM_EP_RESERVE_W",
+		"TagName": "PARAM_EP_RESERVE_ENERGY",
+		"TagNameGlobal": "TAG_EP_PARAM_EP_RESERVE_ENERGY",
 		"DataTagHex": "0x040033",
 		"NameSpace": "EP",
 		"NameSpaceHex": "0x0B",
 		"DataType": "Float32",
 		"DataTypeHex": "0x0A",
 		"UserLevel": "NO_AUTH",
-		"Unit": "W",
-		"Description": "imported from nischram/E3dcGui"
+		"Unit": "Wh",
+		"Description": "target energy to be kept as EP reserve (correlates with PARAM_EP_RESERVE) (renamed from PARAM_EP_RESERVE_W); imported from nischram/E3dcGui"
 	},
 	"453247028": {
 		"TagHex": "0x1B040034",
-		"TagName": "PARAM_EP_RESERVE_MAX_W",
-		"TagNameGlobal": "TAG_EP_PARAM_EP_RESERVE_MAX_W",
+		"TagName": "PARAM_EP_RESERVE_MAX_ENERGY",
+		"TagNameGlobal": "TAG_EP_PARAM_EP_RESERVE_MAX_ENERGY",
 		"DataTagHex": "0x040034",
 		"NameSpace": "EP",
 		"NameSpaceHex": "0x0B",
 		"DataType": "Float32",
 		"DataTypeHex": "0x0A",
 		"UserLevel": "NO_AUTH",
-		"Unit": "W",
-		"Description": "imported from nischram/E3dcGui"
+		"Unit": "Wh",
+		"Description": "max. energy kept as EP reserve (renamed from PARAM_EP_RESERVE_MAX_W); imported from nischram/E3dcGui"
 	},
 	"461373449": {
 		"TagHex": "0x1B800009",
@@ -4855,11 +4855,11 @@
 		"DataTagHex": "0x800009",
 		"NameSpace": "EP",
 		"NameSpaceHex": "0x0B",
-		"DataType": "None",
-		"DataTypeHex": "0x00",
+		"DataType": "Container",
+		"DataTypeHex": "0x0E",
 		"UserLevel": "NO_AUTH",
 		"Unit": "",
-		"Description": "Container with index and values: EP_RESERVE, EP_RESERVE_W, EP_RESERVE_MAX_W, TIME_LAST_EMPTY, TIME_LAST_FULL, LAST_SOC - imported from nischram/E3dcGui"
+		"Description": "Container with index and values: EP_RESERVE, EP_RESERVE_ENERGY, EP_RESERVE_MAX_ENERGY, TIME_LAST_EMPTY, TIME_LAST_FULL, LAST_SOC - imported from nischram/E3dcGui"
 	},
 	"201326593": {
 		"TagHex": "0x0C000001",