diff --git a/.gitignore b/.gitignore index 54e17c93..91489fe1 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ tools/esp8266/binaries *.db *.suo *.ipch +/**/.vscode diff --git a/tools/esp8266/app.cpp b/tools/esp8266/app.cpp index dbb3ee9e..244ac2e3 100644 --- a/tools/esp8266/app.cpp +++ b/tools/esp8266/app.cpp @@ -676,8 +676,13 @@ void app::showFavicon(void) { //----------------------------------------------------------------------------- void app::showLiveData(void) { DPRINTLN(DBG_VERBOSE, F("app::showLiveData")); - String modHtml; + String modHtml, totalModHtml; + float totalYield = 0, totalYieldToday = 0, totalActual = 0; + uint8_t count = 0; + for(uint8_t id = 0; id < mSys->getNumInverters(); id++) { + count++; + Inverter<> *iv = mSys->getInverterByPos(id); if(NULL != iv) { #ifdef LIVEDATA_VISUALIZED @@ -695,6 +700,19 @@ void app::showLiveData(void) { for(uint8_t fld = 0; fld < 10; fld++) { pos = (iv->getPosByChFld(CH0, list[fld])); + + if(fld == 6){ + totalYield += iv->getValue(pos); + } + + if(fld == 7){ + totalYieldToday += iv->getValue(pos); + } + + if(fld == 2){ + totalActual += iv->getValue(pos); + } + if(0xff != pos) { modHtml += F("