diff --git a/src/CHANGES.md b/src/CHANGES.md index 78635620..8aeec68f 100644 --- a/src/CHANGES.md +++ b/src/CHANGES.md @@ -1,5 +1,9 @@ # Development Changes +## 0.7.19 - 2023-07-27 +* next attempt to fix yield day for multiple inverters #1016 +* reduced threshold for inverter state machine from 60min to 15min to go from state `WAS_ON` to `OFF` + ## 0.7.18 - 2023-07-26 * next attempt to fix yield day for multiple inverters #1016 diff --git a/src/config/config.h b/src/config/config.h index ad43ec2d..65b7aa1a 100644 --- a/src/config/config.h +++ b/src/config/config.h @@ -97,10 +97,10 @@ #define DEF_MAX_RETRANS_PER_PYLD 5 // number of seconds since last successful response, before inverter is marked inactive -#define INVERTER_INACT_THRES_SEC 300 +#define INVERTER_INACT_THRES_SEC 5*60 // number of seconds since last successful response, before inverter is marked offline -#define INVERTER_OFF_THRES_SEC 3600 +#define INVERTER_OFF_THRES_SEC 15*60 // threshold of minimum power on which the inverter is marked as inactive #define INACT_PWR_THRESH 3 diff --git a/src/defines.h b/src/defines.h index c144e89c..ccafdea7 100644 --- a/src/defines.h +++ b/src/defines.h @@ -13,7 +13,7 @@ //------------------------------------- #define VERSION_MAJOR 0 #define VERSION_MINOR 7 -#define VERSION_PATCH 18 +#define VERSION_PATCH 19 //------------------------------------- typedef struct { diff --git a/src/publisher/pubMqttIvData.h b/src/publisher/pubMqttIvData.h index 41e6a0bd..372ac9b5 100644 --- a/src/publisher/pubMqttIvData.h +++ b/src/publisher/pubMqttIvData.h @@ -122,17 +122,8 @@ class PubMqttIvData { if(mPos < rec->length) { bool retained = false; if (mCmd == RealTimeRunData_Debug) { - if(FLD_YT == rec->assign[mPos].fieldId) + if((FLD_YT == rec->assign[mPos].fieldId) || (FLD_YD == rec->assign[mPos].fieldId)) retained = true; - else if(FLD_YD == rec->assign[mPos].fieldId) { - if(!mZeroValues) { - if ((rec->assign[mPos].ch == CH0) && (!mIv->isProducing())) { // avoids returns to 0 on restart - mPos++; - return; - } - } - retained = true; - } // calculate total values for RealTimeRunData_Debug if (CH0 == rec->assign[mPos].ch) {