0.8.49

* fix send total values if inverter state is different from `OFF` #1331 * fix german language issues #1335
lumapu · Jan 8, 2024 · 3aa4751 · 3aa4751
1 parent 3c5be9a
commit 3aa4751
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/src/CHANGES.md b/src/CHANGES.md
@@ -1,5 +1,9 @@
 # Development Changes
 
+## 0.8.49 - 2024-01-08
+* fix send total values if inverter state is different from `OFF` #1331
+* fix german language issues #1335
+
 ## 0.8.48 - 2024-01-07
 * merge PR: pin selection for ESP-32 S2 #1334
 * merge PR: enhancement: power graph display option #1330

diff --git a/src/defines.h b/src/defines.h
@@ -13,7 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       8
-#define VERSION_PATCH       48
+#define VERSION_PATCH       49
 
 //-------------------------------------
 typedef struct {

diff --git a/src/publisher/pubMqttIvData.h b/src/publisher/pubMqttIvData.h
@@ -141,7 +141,7 @@ class PubMqttIvData {
 
                     // calculate total values for RealTimeRunData_Debug
                     if (CH0 == rec->assign[mPos].ch) {
-                        if(mIv->getStatus() > InverterStatus::STARTING) {
+                        if(mIv->getStatus() != InverterStatus::OFF) {
                             if(mIv->config->add2Total) {
                                 mTotalFound = true;
                                 switch (rec->assign[mPos].fieldId) {

diff --git a/src/web/html/system.html b/src/web/html/system.html
@@ -47,8 +47,8 @@
             function irqBadge(state) {
                 switch(state) {
                     case 0: return badge(false, "{#UNKNOWN}", "warning"); break;
-                    case 1: return badge(true, "true"); break;
-                    default: return badge(false, "false"); break;
+                    case 1: return badge(true, "{#TRUE}"); break;
+                    default: return badge(false, "{#FALSE}"); break;
                 }                    
             }
 
@@ -119,7 +119,7 @@
                                 tr("{#SUNRISE}", new Date(obj.ts_sunrise * 1000).toLocaleString('de-DE')),
                                 tr("{#SUNSET}", new Date(obj.ts_sunset * 1000).toLocaleString('de-DE')),
                                 tr("{#COMMUNICATION_START}", new Date((obj.ts_sunrise + obj.ts_offsSr) * 1000).toLocaleString('de-DE')),
-                                tr("{#COMMUNICATION_STTOP}", new Date((obj.ts_sunset + obj.ts_offsSs) * 1000).toLocaleString('de-DE')),
+                                tr("{#COMMUNICATION_STOP}", new Date((obj.ts_sunset + obj.ts_offsSs) * 1000).toLocaleString('de-DE')),
                                 tr("{#NIGHT_BEHAVE}", badge(obj.disNightComm, ((obj.disNightComm) ? "{#NOT}" : "") + " {#COMMUNICATING}", "warning"))
                             ])
                         )

diff --git a/src/web/lang.json b/src/web/lang.json
@@ -876,7 +876,7 @@
                 {
                     "token": "NIGHT_TIME",
                     "en": "Night time, inverter polling disabled",
-                    "de": "Nacht, Wechselrichterabfrage deaktivert"
+                    "de": "Wechselrichterabfrage deaktivert (Nacht)"
                 },
                 {
                     "token": "PAUSED_AT",
@@ -886,7 +886,7 @@
                 {
                     "token": "START_AT",
                     "en": "will start polling at",
-                    "de": "wird starten um"
+                    "de": "Abfrage startet am"
                 },
                 {
                     "token": "DISABLED",
@@ -901,7 +901,7 @@
                 {
                     "token": "AVAIL",
                     "en": "available and is",
-                    "de": "verf&uuml;gbar und ist"
+                    "de": "verf&uuml;gbar und"
                 },
                 {
                     "token": "AVAIL_NO_DATA",