From 49d80fd41d4acff6577fb4d40e3930ff8b5a6902 Mon Sep 17 00:00:00 2001 From: djnitehawk Date: Thu, 13 Mar 2025 21:39:30 +0530 Subject: [PATCH] restore user settings first --- src/Server/BatteryService/JK-BMS-RS485-Service.cs | 12 +++++++++--- src/Server/publish.cmd | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Server/BatteryService/JK-BMS-RS485-Service.cs b/src/Server/BatteryService/JK-BMS-RS485-Service.cs index 913ec9c..4ae1329 100644 --- a/src/Server/BatteryService/JK-BMS-RS485-Service.cs +++ b/src/Server/BatteryService/JK-BMS-RS485-Service.cs @@ -1,4 +1,5 @@ -using InverterMon.Server.Persistence.Settings; +using InverterMon.Server.Persistence; +using InverterMon.Server.Persistence.Settings; using InverterMon.Shared.Models; using SerialPortLib; @@ -13,7 +14,12 @@ public class JkBms readonly AmpValQueue _recentAmpReadings = new(5); //avg value over 5 readings (~5secs) readonly SerialPortInput _bms = new(); - public JkBms(UserSettings userSettings, IConfiguration config, ILogger logger, IWebHostEnvironment env, IHostApplicationLifetime appLife) + public JkBms(Database _, //essential to restore user settings first + UserSettings userSettings, + IConfiguration config, + ILogger logger, + IWebHostEnvironment env, + IHostApplicationLifetime appLife) { if (env.IsDevelopment()) { @@ -130,7 +136,7 @@ public class JkBms Status.AvgCurrentAmps = 21.444f; Status.CapacityPct = 50; Status.PackCapacity = 320; - Status.PackNominalVoltage = 51.2f; + Status.PackNominalVoltage = 48; Status.IsWarning = false; Status.TimeHrs = 24; Status.TimeMins = 10; diff --git a/src/Server/publish.cmd b/src/Server/publish.cmd index 0f030c9..9cdd4a6 100644 --- a/src/Server/publish.cmd +++ b/src/Server/publish.cmd @@ -1 +1 @@ -dotnet publish ./InverterMon.Server.csproj -c Release -r linux-arm64 --self-contained -p:PublishTrimmed=true -p:TrimmerLogLevel=Detailed -o D:\\DOWNLOADS \ No newline at end of file +dotnet publish ./InverterMon.Server.csproj -c Release -r win-x64 --self-contained -p:PublishTrimmed=true -p:TrimmerLogLevel=Detailed -o D:\\DOWNLOADS \ No newline at end of file