From 2f0b3f6228c135eeb907136465ef556140dd0b28 Mon Sep 17 00:00:00 2001 From: djnitehawk Date: Thu, 13 Mar 2025 20:58:02 +0530 Subject: [PATCH] enable debug data --- src/Client/Program.cs | 11 ++--- .../BatteryService/JK-BMS-RS485-Service.cs | 2 +- src/Server/Endpoints/GetStatus/Endpoint.cs | 43 +++++++++---------- .../Settings/GetSettingValues/Endpoint.cs | 38 ++++++++-------- src/Server/Program.cs | 11 +++-- src/Shared/Models/BMSStatus.cs | 12 +++--- src/changelog.md | 2 +- 7 files changed, 58 insertions(+), 61 deletions(-) diff --git a/src/Client/Program.cs b/src/Client/Program.cs index de3c47b..a64080e 100644 --- a/src/Client/Program.cs +++ b/src/Client/Program.cs @@ -5,11 +5,12 @@ using Microsoft.AspNetCore.Components.WebAssembly.Hosting; var builder = WebAssemblyHostBuilder.CreateDefault(args); builder.RootComponents.Add("#app"); builder.RootComponents.Add("head::after"); -builder.Services.AddScoped(_ => new HttpClient -{ - BaseAddress = new Uri(builder.HostEnvironment.BaseAddress), - Timeout = TimeSpan.FromSeconds(3) -}); +builder.Services.AddScoped( + _ => new HttpClient + { + BaseAddress = new(builder.HostEnvironment.BaseAddress), + Timeout = TimeSpan.FromSeconds(3) + }); _ = InverterMon.Client.Pages.Index.StartStatusStreaming(builder.HostEnvironment.BaseAddress); _ = InverterMon.Client.Pages.BMS.StartStatusStreaming(builder.HostEnvironment.BaseAddress); await builder.Build().RunAsync(); \ No newline at end of file diff --git a/src/Server/BatteryService/JK-BMS-RS485-Service.cs b/src/Server/BatteryService/JK-BMS-RS485-Service.cs index d9a3797..913ec9c 100644 --- a/src/Server/BatteryService/JK-BMS-RS485-Service.cs +++ b/src/Server/BatteryService/JK-BMS-RS485-Service.cs @@ -128,7 +128,7 @@ public class JkBms Status.PackVoltage = 25.6f; Status.IsCharging = true; Status.AvgCurrentAmps = 21.444f; - Status.CapacityPct = 90; + Status.CapacityPct = 50; Status.PackCapacity = 320; Status.PackNominalVoltage = 51.2f; Status.IsWarning = false; diff --git a/src/Server/Endpoints/GetStatus/Endpoint.cs b/src/Server/Endpoints/GetStatus/Endpoint.cs index 13a30ba..d0acb3f 100644 --- a/src/Server/Endpoints/GetStatus/Endpoint.cs +++ b/src/Server/Endpoints/GetStatus/Endpoint.cs @@ -31,28 +31,27 @@ public class Endpoint : EndpointWithoutRequest { while (!c.IsCancellationRequested && !AppLife.ApplicationStopping.IsCancellationRequested) { - // if (Env.IsDevelopment()) - // { - // var status = new InverterStatus - // { - // OutputVoltage = Random.Shared.Next(240), - // LoadWatts = Random.Shared.Next(3500), - // LoadPercentage = Random.Shared.Next(100), - // BatteryVoltage = Random.Shared.Next(24), - // BatteryChargeCurrent = Random.Shared.Next(20), - // BatteryDischargeCurrent = Random.Shared.Next(300), - // HeatSinkTemperature = Random.Shared.Next(300), - // PVInputCurrent = Random.Shared.Next(300), - // PVInputVoltage = Random.Shared.Next(300), - // PVInputWatt = Random.Shared.Next(1000), - // PV_MaxCapacity = 1000, - // BatteryCapacity = 100 - // }; - // - // yield return status; - // } - // else - yield return Inverter.Status; + if (Env.IsDevelopment()) + { + var status = new InverterStatus + { + OutputVoltage = Random.Shared.Next(240), + LoadWatts = Random.Shared.Next(3500), + LoadPercentage = Random.Shared.Next(100), + BatteryVoltage = Random.Shared.Next(24), + BatteryChargeCurrent = Random.Shared.Next(20), + BatteryDischargeCurrent = Random.Shared.Next(300), + PVInputCurrent = Random.Shared.Next(300), + PVInputVoltage = Random.Shared.Next(300), + PVInputWatt = Random.Shared.Next(1000), + PV_MaxCapacity = 1000, + BatteryCapacity = 100 + }; + + yield return status; + } + else + yield return Inverter.Status; await Task.Delay(2000, c); } diff --git a/src/Server/Endpoints/Settings/GetSettingValues/Endpoint.cs b/src/Server/Endpoints/Settings/GetSettingValues/Endpoint.cs index c64c14a..dbfa4c0 100644 --- a/src/Server/Endpoints/Settings/GetSettingValues/Endpoint.cs +++ b/src/Server/Endpoints/Settings/GetSettingValues/Endpoint.cs @@ -17,25 +17,25 @@ public class Endpoint : EndpointWithoutRequest public override async Task HandleAsync(CancellationToken c) { - // if (Env.IsDevelopment()) - // { - // var res = new CurrentSettings - // { - // BackToBatteryVoltage = 48.1, - // BackToGridVoltage = 48.2, - // FloatChargeVoltage = 48.3, - // ChargePriority = ChargePriority.OnlySolar, - // DischargeCuttOffVoltage = 48.4, - // BulkChargeVoltage = 48.5, - // MaxACChargeCurrent = 10, - // MaxCombinedChargeCurrent = 20, - // OutputPriority = OutputPriority.SolarFirst, - // SystemSpec = UserSettings.ToSystemSpec() - // }; - // await SendAsync(res, cancellation: c); - // - // return; - // } + if (Env.IsDevelopment()) + { + var res = new CurrentSettings + { + BackToBatteryVoltage = 48.1, + BackToGridVoltage = 48.2, + FloatChargeVoltage = 48.3, + ChargePriority = ChargePriority.OnlySolar, + DischargeCuttOffVoltage = 48.4, + BulkChargeVoltage = 48.5, + MaxACChargeCurrent = 10, + MaxCombinedChargeCurrent = 20, + OutputPriority = OutputPriority.SolarFirst, + SystemSpec = UserSettings.ToSystemSpec() + }; + await SendAsync(res, cancellation: c); + + return; + } try { diff --git a/src/Server/Program.cs b/src/Server/Program.cs index 03e2b64..50a79d5 100644 --- a/src/Server/Program.cs +++ b/src/Server/Program.cs @@ -23,12 +23,11 @@ bld.Services .AddSingleton() .AddSingleton(); -// if (!bld.Environment.IsDevelopment()) -// { -bld.Services - .AddHostedService(); - -// } +if (!bld.Environment.IsDevelopment()) +{ + bld.Services + .AddHostedService(); +} bld.Services.AddFastEndpoints(o => o.SourceGeneratorDiscoveredTypes = DiscoveredTypes.All); diff --git a/src/Shared/Models/BMSStatus.cs b/src/Shared/Models/BMSStatus.cs index 16f880a..50ba851 100644 --- a/src/Shared/Models/BMSStatus.cs +++ b/src/Shared/Models/BMSStatus.cs @@ -69,14 +69,12 @@ public class BMSStatus public string GetTimeString() { - var currentTime = DateTime.UtcNow - .AddHours(5).AddMinutes(30); //only supports IST time zone :-( - + var currentTime = DateTime.UtcNow.AddHours(5).AddMinutes(30); //only supports IST time zone :-( var futureTime = currentTime.AddHours(TimeHrs).AddMinutes(TimeMins); - if (futureTime.Date == currentTime.Date) - return futureTime.ToString("h:mm tt"); - - return futureTime.ToString("dddd h:mm tt"); + return futureTime.ToString( + futureTime.Date == currentTime.Date + ? "h:mm tt" + : "dddd h:mm tt"); } } \ No newline at end of file diff --git a/src/changelog.md b/src/changelog.md index 77d0561..6da23a7 100644 --- a/src/changelog.md +++ b/src/changelog.md @@ -1,3 +1,3 @@ ## changelog -- add source generator for reflection data \ No newline at end of file +- initial release \ No newline at end of file