Browse Source

0.7.53

* fix ePaper / display night behaviour #1151
* fix ESP8266 compile error
pull/1163/head
lumapu 1 year ago
parent
commit
181cc6fc24
  1. 4
      src/CHANGES.md
  2. 2
      src/config/settings.h
  3. 2
      src/defines.h
  4. 8
      src/plugins/Display/Display.h

4
src/CHANGES.md

@ -1,5 +1,9 @@
# Development Changes
## 0.7.53 - 2023-09-16
* fix ePaper / display night behaviour #1151
* fix ESP8266 compile error
## 0.7.52 - 2023-09-16
* fix CMT configureable pins #1150, #1159
* update MqTT lib to version `1.4.5`

2
src/config/settings.h

@ -537,6 +537,7 @@ class settings {
}
}
#if defined(ESP32)
void jsonCmt(JsonObject obj, bool set = false) {
if(set) {
obj[F("csb")] = mCfg.cmt.pinCsb;
@ -558,6 +559,7 @@ class settings {
mCfg.cmt.pinSdio = DEF_CMT_SDIO;
}
}
#endif
void jsonNtp(JsonObject obj, bool set = false) {
if(set) {

2
src/defines.h

@ -13,7 +13,7 @@
//-------------------------------------
#define VERSION_MAJOR 0
#define VERSION_MINOR 7
#define VERSION_PATCH 52
#define VERSION_PATCH 53
//-------------------------------------
typedef struct {

8
src/plugins/Display/Display.h

@ -90,6 +90,7 @@ class Display {
Inverter<> *iv;
record_t<> *rec;
bool allOff = true;
for (uint8_t i = 0; i < mSys->getNumInverters(); i++) {
iv = mSys->getInverterByPos(i);
rec = iv->getRecordStruct(RealTimeRunData_Debug);
@ -104,12 +105,17 @@ class Display {
totalPower += iv->getChannelFieldValue(CH0, FLD_PAC, rec);
totalYieldDay += iv->getChannelFieldValue(CH0, FLD_YD, rec);
totalYieldTotal += iv->getChannelFieldValue(CH0, FLD_YT, rec);
if(allOff) {
if(iv->status != InverterStatus::OFF)
allOff = false;
}
}
// prepare display data
mDisplayData.nrProducing = nrprod;
mDisplayData.nrSleeping = nrsleep;
mDisplayData.totalPower = totalPower;
mDisplayData.totalPower = (allOff) ? 0.0 : totalPower; // if all inverters are off, total power can't be greater than 0
mDisplayData.totalYieldDay = totalYieldDay;
mDisplayData.totalYieldTotal = totalYieldTotal;
mDisplayData.RadioSymbol = mHmRadio->isChipConnected();

Loading…
Cancel
Save