mirror of
https://github.com/lumapu/ahoy.git
synced 2025-06-09 22:21:39 +02:00
fix #396 thx @Argafal
This commit is contained in:
parent
8bf3b1d018
commit
282672622f
1 changed files with 5 additions and 2 deletions
|
@ -585,6 +585,7 @@ void app::sendMqtt(void) {
|
||||||
char topic[32 + MAX_NAME_LENGTH], val[32];
|
char topic[32 + MAX_NAME_LENGTH], val[32];
|
||||||
float total[4];
|
float total[4];
|
||||||
bool sendTotal = false;
|
bool sendTotal = false;
|
||||||
|
bool totalIncomplete = false;
|
||||||
snprintf(val, 32, "%ld", millis() / 1000);
|
snprintf(val, 32, "%ld", millis() / 1000);
|
||||||
|
|
||||||
mMqtt.sendMsg("uptime", val);
|
mMqtt.sendMsg("uptime", val);
|
||||||
|
@ -604,8 +605,10 @@ void app::sendMqtt(void) {
|
||||||
if(mMqttSendList.front() == RealTimeRunData_Debug) {
|
if(mMqttSendList.front() == RealTimeRunData_Debug) {
|
||||||
// inverter status
|
// inverter status
|
||||||
uint8_t status = MQTT_STATUS_AVAIL_PROD;
|
uint8_t status = MQTT_STATUS_AVAIL_PROD;
|
||||||
if (!iv->isAvailable(mUtcTimestamp, rec))
|
if (!iv->isAvailable(mUtcTimestamp, rec)) {
|
||||||
status = MQTT_STATUS_NOT_AVAIL_NOT_PROD;
|
status = MQTT_STATUS_NOT_AVAIL_NOT_PROD;
|
||||||
|
totalIncomplete = true;
|
||||||
|
}
|
||||||
else if (!iv->isProducing(mUtcTimestamp, rec)) {
|
else if (!iv->isProducing(mUtcTimestamp, rec)) {
|
||||||
if (MQTT_STATUS_AVAIL_PROD == status)
|
if (MQTT_STATUS_AVAIL_PROD == status)
|
||||||
status = MQTT_STATUS_AVAIL_NOT_PROD;
|
status = MQTT_STATUS_AVAIL_NOT_PROD;
|
||||||
|
@ -662,7 +665,7 @@ void app::sendMqtt(void) {
|
||||||
|
|
||||||
mMqttSendList.pop(); // remove from list once all inverters were processed
|
mMqttSendList.pop(); // remove from list once all inverters were processed
|
||||||
|
|
||||||
if (true == sendTotal) {
|
if ((true == sendTotal) && (false == totalIncomplete)) {
|
||||||
uint8_t fieldId;
|
uint8_t fieldId;
|
||||||
for (uint8_t i = 0; i < 4; i++) {
|
for (uint8_t i = 0; i < 4; i++) {
|
||||||
switch (i) {
|
switch (i) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue