Solar/Felicity-Inverter-Monitor
Solar/Felicity-Inverter-Monitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix charge mode display

Browse Source
This commit is contained in:
djnitehawk 2025-03-17 21:01:07 +05:30 committed by Dĵ ΝιΓΞΗΛψΚ
parent 52c275adaf
commit 2014c30909
3 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/Client/Pages/Index.razor
View File

@ -11,7 +11,7 @@
{
<div class="container">
@if (status?.GridUsageWatts > 100)
@if (status.GridUsageWatts > 100)
{
<div class="row">
<div class="col-sm-12">
@ -24,7 +24,7 @@
<div class="container text-center fw-bold p-0">
<div class="row bg-light rounded">
<div class="col">
<div class="fs-1 text-danger">@status?.GridUsageWatts</div>
<div class="fs-1 text-danger">@status.GridUsageWatts</div>
W
</div>
</div>
@ -45,17 +45,17 @@
<div class="container text-center fw-bold p-0">
<div class="row bg-light rounded">
<div class="progress p-0" style="height:2px;">
<span class="progress-bar" role="progressbar" style="width: @status?.LoadPercentage%" aria-valuenow="25"
<span class="progress-bar" role="progressbar" style="width: @status.LoadPercentage%" aria-valuenow="25"
aria-valuemin="0" aria-valuemax="100"></span>
</div>
<div class="col">
<div class="fs-1 text-danger">@status?.LoadWatts</div>
<div class="fs-1 text-danger">@status.LoadWatts</div>
W
</div>
</div>
<div class="row">
<div class="col">
<div class="fs-5 text-muted">@status?.OutputVoltage</div>
<div class="fs-5 text-muted">@status.OutputVoltage</div>
<span class="text-body">
V
</span>
@ -63,12 +63,12 @@
<div class="col">
<div class="row h-100 align-content-center">
<span class="fs-6 text-muted">
@(status?.WorkingMode)
@(status.WorkingMode)
</span>
</div>
</div>
<div class="col">
<div class="fs-5 text-muted">@status?.LoadCurrent</div>
<div class="fs-5 text-muted">@status.LoadCurrent</div>
A
</div>
</div>
@ -80,30 +80,30 @@
<div class="col-sm-6">
<div class="card mt-2 mt-sm-0">
<h5 class="card-header">
<span class="oi oi-sun" aria-hidden="true"/>
<span class="oi oi-sun" aria-hidden="true"></span>
<span>Solar Power</span>
</h5>
<div class="card-body pt-0">
<div class="container text-center fw-bold p-0">
<div class="row bg-light rounded">
<div class="progress p-0" style="height:2px;">
<span class="progress-bar" role="progressbar" style="width: @status?.PVPotential%" aria-valuenow="25" aria-valuemin="0"
<span class="progress-bar" role="progressbar" style="width: @status.PVPotential%" aria-valuenow="25" aria-valuemin="0"
aria-valuemax="100"></span>
</div>
<div class="col">
<div class="fs-1 text-success">@status?.PVInputWatt</div>
<div class="fs-1 text-success">@status.PVInputWatt</div>
W
</div>
</div>
<div class="row">
<div class="col">
<div class="fs-5 text-muted">@status?.PVInputVoltage</div>
<div class="fs-5 text-muted">@status.PVInputVoltage</div>
<span class="text-body">
V
</span>
</div>
<div class="col">
<div class="fs-5 text-muted">@status?.PVInputCurrent</div>
<div class="fs-5 text-muted">@status.PVInputCurrent</div>
A
</div>
</div>
@ -119,15 +119,14 @@
<div class="col-sm-12">
<div class="card">
<h5 class="card-header align-self-center w-100">
<span class="oi oi-battery-empty" aria-hidden="true">
Battery
</span>
<span class="oi oi-battery-empty" aria-hidden="true"></span>
<span>Battery</span>
</h5>
<div class="card-body p-0 m-0">
<div class="container text-center m-0 p-0">
<div class="row m-0 p-0">
<div class="progress p-0" style="height:2px;">
<span class="progress-bar" role="progressbar" style="width: @status?.BatteryDischargePotential%" aria-valuenow="25"
<span class="progress-bar" role="progressbar" style="width: @status.BatteryDischargePotential%" aria-valuenow="25"
aria-valuemin="0" aria-valuemax="100"></span>
</div>
</div>
@ -135,18 +134,18 @@
<div class="col-4">
<span class="fs-6 fw-bold text-muted charge-discharge">Charging</span>
<div class="fw-bold">
<div class="fs-1 text-danger">@status?.BatteryChargeWatts</div>
<div class="fs-1 text-danger">@status.BatteryChargeWatts</div>
W
<div class="fw-bold">
<div class="fs-5 text-muted">@status?.BatteryChargeCurrent</div>
<div class="fs-5 text-muted">@status.BatteryChargeCurrent</div>
A
</div>
</div>
</div>
<div class="col-4">
<div class="container bg-light rounded-1 p-1 m-0 fw-bold text-muted fs-1">
<div class="fs-6 voltage">@status?.ChargeMode</div>
<div class="text-black charge-discharge">@status?.BatteryVoltage</div>
<div class="fs-6 voltage">@GetChargeMode()</div>
<div class="text-black charge-discharge">@status.BatteryVoltage</div>
<div class="fs-4 text-black-50">V</div>
<div class="fs-6 bg-white text-dark">@GetCRate() C</div>
</div>
@ -154,10 +153,10 @@
<div class="col-4">
<span class="fs-6 fw-bold text-muted charge-discharge">Discharging</span>
<div class="fw-bold">
<div class="fs-1 text-success">@status?.BatteryDischargeWatts</div>
<div class="fs-1 text-success">@status.BatteryDischargeWatts</div>
W
<div class="fw-bold">
<div class="fs-5 text-muted">@status?.BatteryDischargeCurrent</div>
<div class="fs-5 text-muted">@status.BatteryDischargeCurrent</div>
A
</div>
</div>
@ -258,4 +257,9 @@
return 0;
}
private static string GetChargeMode()
=> status?.ChargeMode is ChargeMode.NONE
? "VOLTAGE"
: status?.ChargeMode.ToString() ?? string.Empty;
}

1
src/Shared/Models/InverterSetting.cs
View File

@ -30,6 +30,7 @@ public enum WorkingMode : ushort
[SuppressMessage("ReSharper", "InconsistentNaming")]
public enum ChargeMode : ushort
{
NONE = 0,
BULK = 1,
ABSORPTION = 2,
FLOAT = 3

4
src/changelog.md
View File

@ -1,5 +1,3 @@
## changelog
- show battery charging stage
- optimize updating of inverter settings
- optimize inverter status response
- fix charge mode display when not charging