Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/WebApi_ws_live.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ void WebApiWsLiveClass::generateOnBatteryJsonResponse(JsonVariant& root, bool al
if (yieldTotal) {
addTotalField(solarchargerObj, "yieldTotal", *yieldTotal, "kWh", 2);
}

solarchargerObj["isDataValid"] = solarChargerAge < (30 * 1000);
}

if (!all) { _lastPublishSolarCharger = millis(); }
Expand All @@ -125,6 +127,8 @@ void WebApiWsLiveClass::generateOnBatteryJsonResponse(JsonVariant& root, bool al
auto oInputPower = gridChargerStats->getInputPower();
float pwr = oInputPower.value_or(0.0f);
addTotalField(gridChargerObj, "Power", pwr, "W", 2);
auto lastUpdate = gridChargerStats->getLastUpdate();
gridChargerObj["isDataValid"] = lastUpdate > 0 && ((millis() - lastUpdate) < (30 * 1000));
}

if (!all) { _lastPublishGridCharger = millis(); }
Expand All @@ -151,6 +155,8 @@ void WebApiWsLiveClass::generateOnBatteryJsonResponse(JsonVariant& root, bool al
if (spStats->isVoltageValid() && spStats->isCurrentValid()) {
addTotalField(batteryObj, "power", spStats->getVoltage() * spStats->getChargeCurrent(), "W", 1);
}

batteryObj["isDataValid"] = spStats->getAgeSeconds() < 30;
}

if (!all) { _lastPublishBattery = millis(); }
Expand All @@ -162,6 +168,7 @@ void WebApiWsLiveClass::generateOnBatteryJsonResponse(JsonVariant& root, bool al

if (config.PowerMeter.Enabled) {
addTotalField(powerMeterObj, "Power", PowerMeter.getPowerTotal(), "W", 1);
powerMeterObj["isDataValid"] = PowerMeter.isDataValid();
}

if (!all) { _lastPublishPowerMeter = millis(); }
Expand Down
26 changes: 19 additions & 7 deletions webapp/src/components/InverterTotalInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col" v-if="solarChargerData.yieldTotal">
<CardElement
centerContent
textVariant="text-bg-primary"
:textVariant="solarChargerData.isDataValid === false ? 'text-bg-danger' : 'text-bg-primary'"
:text="$t('invertertotalinfo.MpptTotalYieldTotal')"
>
<h2>
Expand All @@ -27,7 +27,7 @@
<div class="col" v-if="solarChargerData.yieldDay">
<CardElement
centerContent
textVariant="text-bg-primary"
:textVariant="solarChargerData.isDataValid === false ? 'text-bg-danger' : 'text-bg-primary'"
:text="$t('invertertotalinfo.MpptTotalYieldDay')"
>
<h2>
Expand All @@ -42,7 +42,11 @@
</CardElement>
</div>
<div class="col" v-if="solarChargerData.power">
<CardElement centerContent textVariant="text-bg-primary" :text="$t('invertertotalinfo.MpptTotalPower')">
<CardElement
centerContent
:textVariant="solarChargerData.isDataValid === false ? 'text-bg-danger' : 'text-bg-primary'"
:text="$t('invertertotalinfo.MpptTotalPower')"
>
<h2>
{{
$n(solarChargerData.power.v, 'decimal', {
Expand Down Expand Up @@ -107,7 +111,7 @@
<CardElement
centerContent
flexChildren
textVariant="text-bg-primary"
:textVariant="totalBattData.isDataValid === false ? 'text-bg-danger' : 'text-bg-primary'"
:text="$t('invertertotalinfo.BatteryCharge')"
>
<div class="flex-fill" v-if="totalBattData.soc">
Expand Down Expand Up @@ -139,7 +143,7 @@
<CardElement
centerContent
flexChildren
textVariant="text-bg-primary"
:textVariant="totalBattData.isDataValid === false ? 'text-bg-danger' : 'text-bg-primary'"
:text="$t('invertertotalinfo.BatteryPower')"
>
<div class="flex-fill" v-if="totalBattData.power">
Expand Down Expand Up @@ -169,7 +173,11 @@
</div>
</template>
<div class="col" v-if="powerMeterData.enabled">
<CardElement centerContent textVariant="text-bg-primary" :text="$t('invertertotalinfo.HomePower')">
<CardElement
centerContent
:textVariant="powerMeterData.isDataValid === false ? 'text-bg-danger' : 'text-bg-primary'"
:text="$t('invertertotalinfo.HomePower')"
>
<h2>
{{
$n(powerMeterData.Power.v, 'decimal', {
Expand All @@ -182,7 +190,11 @@
</CardElement>
</div>
<div class="col" v-if="gridChargerData.enabled">
<CardElement centerContent textVariant="text-bg-primary" :text="$t('invertertotalinfo.GridChargerPower')">
<CardElement
centerContent
:textVariant="gridChargerData.isDataValid === false ? 'text-bg-danger' : 'text-bg-primary'"
:text="$t('invertertotalinfo.GridChargerPower')"
>
<h2>
{{
$n(gridChargerData.Power.v, 'decimal', {
Expand Down
4 changes: 4 additions & 0 deletions webapp/src/types/LiveDataStatus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,13 @@ export interface SolarCharger {
power?: ValueObject;
yieldDay?: ValueObject;
yieldTotal?: ValueObject;
isDataValid?: boolean;
}

export interface GridCharger {
enabled: boolean;
Power: ValueObject;
isDataValid?: boolean;
}

export interface Battery {
Expand All @@ -80,11 +82,13 @@ export interface Battery {
voltage?: ValueObject;
power?: ValueObject;
current?: ValueObject;
isDataValid?: boolean;
}

export interface PowerMeter {
enabled: boolean;
Power: ValueObject;
isDataValid?: boolean;
}

export interface LiveData {
Expand Down