From 3aa4751689a68a99044fac9686c66a89172ed7f3 Mon Sep 17 00:00:00 2001 From: lumapu Date: Mon, 8 Jan 2024 21:54:27 +0100 Subject: [PATCH] 0.8.49 * fix send total values if inverter state is different from `OFF` #1331 * fix german language issues #1335 --- src/CHANGES.md | 4 ++++ src/defines.h | 2 +- src/publisher/pubMqttIvData.h | 2 +- src/web/html/system.html | 6 +++--- src/web/lang.json | 6 +++--- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/CHANGES.md b/src/CHANGES.md index 5073a2c9..a11a4e2b 100644 --- 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 index bd5cc7ff..b205297f 100644 --- 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 index a7deadfb..0a59fdd6 100644 --- 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 index 16c6343e..ab0b5289 100644 --- 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 index d6c76ffc..c7243728 100644 --- 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ügbar und ist" + "de": "verfügbar und" }, { "token": "AVAIL_NO_DATA",