3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-07-21 18:27:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

0.8.49

Browse source 
* fix send total values if inverter state is different from `OFF` #1331
* fix german language issues #1335
This commit is contained in:
lumapu 2024-01-08 21:54:27 +01:00
parent 3c5be9ae35
commit 3aa4751689
5 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CHANGES.md
View file

@ -1,5 +1,9 @@
# Development Changes # 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 ## 0.8.48 - 2024-01-07
* merge PR: pin selection for ESP-32 S2 #1334 * merge PR: pin selection for ESP-32 S2 #1334
* merge PR: enhancement: power graph display option #1330 * merge PR: enhancement: power graph display option #1330

2
src/defines.h
View file

@ -13,7 +13,7 @@
//------------------------------------- //-------------------------------------
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 8 #define VERSION_MINOR 8
#define VERSION_PATCH 48 #define VERSION_PATCH 49
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {

2
src/publisher/pubMqttIvData.h
View file

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

6
src/web/html/system.html
View file

@ -47,8 +47,8 @@
function irqBadge(state) { function irqBadge(state) {
switch(state) { switch(state) {
case 0: return badge(false, "{#UNKNOWN}", "warning"); break; case 0: return badge(false, "{#UNKNOWN}", "warning"); break;
case 1: return badge(true, "true"); break; case 1: return badge(true, "{#TRUE}"); break;
default: return badge(false, "false"); break; default: return badge(false, "{#FALSE}"); break;
} }
} }
@ -119,7 +119,7 @@
tr("{#SUNRISE}", new Date(obj.ts_sunrise * 1000).toLocaleString('de-DE')), tr("{#SUNRISE}", new Date(obj.ts_sunrise * 1000).toLocaleString('de-DE')),
tr("{#SUNSET}", new Date(obj.ts_sunset * 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_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")) tr("{#NIGHT_BEHAVE}", badge(obj.disNightComm, ((obj.disNightComm) ? "{#NOT}" : "") + " {#COMMUNICATING}", "warning"))
]) ])
) )

6
src/web/lang.json
View file

@ -876,7 +876,7 @@
{ {
"token": "NIGHT_TIME", "token": "NIGHT_TIME",
"en": "Night time, inverter polling disabled", "en": "Night time, inverter polling disabled",
"de": "Nacht, Wechselrichterabfrage deaktivert" "de": "Wechselrichterabfrage deaktivert (Nacht)"
}, },
{ {
"token": "PAUSED_AT", "token": "PAUSED_AT",
@ -886,7 +886,7 @@
{ {
"token": "START_AT", "token": "START_AT",
"en": "will start polling at", "en": "will start polling at",
"de": "wird starten um" "de": "Abfrage startet am"
}, },
{ {
"token": "DISABLED", "token": "DISABLED",
@ -901,7 +901,7 @@
{ {
"token": "AVAIL", "token": "AVAIL",
"en": "available and is", "en": "available and is",
"de": "verfügbar und ist" "de": "verfügbar und"
}, },
{ {
"token": "AVAIL_NO_DATA", "token": "AVAIL_NO_DATA",