First commit to local

src/Client/InverterMon.Client.csproj

@@ -15,17 +15,17 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="AntDesign.Charts" Version="0.5.6" />
+        <PackageReference Include="AntDesign.Charts" Version="0.5.6"/>
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.20" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.20"/>
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.20" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.20" PrivateAssets="all"/>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Shared\InverterMon.Shared.csproj" />
+        <ProjectReference Include="..\Shared\InverterMon.Shared.csproj"/>
     </ItemGroup>
 
     <ItemGroup>
-        <ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js" />
+        <ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js"/>
     </ItemGroup>
 
 </Project>

src/Client/Properties/launchSettings.json

@@ -5,7 +5,7 @@
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "http://localhost:9000",
+      "applicationUrl": "http://localhost:5238",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

src/InverterMonWindow/InverterMonWindow.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net7.0-windows7.0</TargetFramework>
+        <TargetFramework>net9.0-windows</TargetFramework>
         <Nullable>enable</Nullable>
         <UseWindowsForms>true</UseWindowsForms>
         <ImplicitUsings>enable</ImplicitUsings>
@@ -11,7 +11,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3124.44" />
+        <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3124.44"/>
     </ItemGroup>
 
     <ItemGroup>

src/Server/Endpoints/GetStatus/Endpoint.cs

@@ -31,7 +31,6 @@ public class Endpoint : EndpointWithoutRequest<object>
     {
         while (!c.IsCancellationRequested && !AppLife.ApplicationStopping.IsCancellationRequested)
         {
-            /*
             if (Env.IsDevelopment())
             {
                 var status = new InverterStatus
@@ -52,7 +51,6 @@ public class Endpoint : EndpointWithoutRequest<object>
                 yield return status;
             }
             else
-            */
                 yield return Inverter.Status;
 
             await Task.Delay(2000, c);

src/Server/InverterMon.Server.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <NoWarn>CS8618;CA2016</NoWarn>
@@ -27,13 +27,8 @@
         <UseSystemResourceKeys>true</UseSystemResourceKeys>
     </PropertyGroup>
 
-    <ItemGroup>
-      <Content Remove="nlog.config" />
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="FastEndpoints.Generator" Version="5.35.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
-        <PackageReference Include="NLog.Web.AspNetCore" Version="6.0.4" />
         <PackageReference Include="SerialPortLib" Version="1.1.2" />
         <PackageReference Include="FastEndpoints" Version="5.35.0" />
         <PackageReference Include="LiteDB" Version="5.0.21" />
@@ -47,11 +42,6 @@
 
     <ItemGroup>
         <None Include="../changelog.md" Link="changelog.md" />
-        <None Include="nlog.config">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
     </ItemGroup>
 
-    <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
-
 </Project>

src/Server/InverterService/FelicityInverter.cs

@@ -2,13 +2,10 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO.Ports;
 using InverterMon.Shared.Models;
-using System.Diagnostics;
-using Microsoft.Extensions.Logging;
-
 
 namespace InverterMon.Server.InverterService;
 
-sealed class SettingsData 
+sealed class SettingsData
 {
     public double BatteryCutOffVoltage { get; init; }
     public double BatteryCvChargingVoltage { get; init; }
@@ -25,11 +22,6 @@ sealed class SettingsData
  SuppressMessage("ReSharper", "MemberCanBeMadeStatic.Global")]
 public sealed class FelicitySolarInverter
 {
-    private readonly ILogger<FelicitySolarInverter> _logger;
-    public FelicitySolarInverter(ILogger<FelicitySolarInverter> logger)
-    {
-        _logger = logger;
-    }
     public InverterStatus Status { get; } = new();
 
     const byte SlaveAddress = 0x01;
@@ -167,9 +159,6 @@ public sealed class FelicitySolarInverter
         // [Slave Address][Function Code 0x03][Start Address Hi][Start Address Lo][Quantity Hi][Quantity Lo][CRC Lo][CRC Hi]
 
         byte[] frame;
-        using ILoggerFactory factory = LoggerFactory.Create(builder => builder.AddConsole());
-        ILogger logger = factory.CreateLogger("Felicity");
-        logger.LogInformation("ReadRegisters Logging");
 
         var statusRequest = startAddress == StatusStartAddress && numberOfPoints == StatusRegisterCount;
 
@@ -192,16 +181,6 @@ public sealed class FelicitySolarInverter
                 _cachedStatusFrame = frame;
         }
 
-        // debug
-        string str = "";
-        for (int i = 0; i < 8; i++)
-        {
-            str += frame[i].ToString("X") + " ";
-        }
-        Debug.WriteLine("Request frame: " + str);
-        logger.LogInformation("Request frame: {str}", str);
-        // end of debug
-
         var response = SendModbusRequest(frame);
 
         if (response.Length == 0)
@@ -213,16 +192,6 @@ public sealed class FelicitySolarInverter
         int byteCount = response[2];
         var expectedDataBytes = numberOfPoints * 2;
 
-        // debug
-        str = "";
-        for (int i = 0; i < response.Length; i++)
-        {
-            str += response[i].ToString("X") + " ";
-        }
-        Debug.WriteLine("Response frame: " + str);
-        logger.LogInformation("Response frame: {str}", str);
-        // end of debug
-
         if (byteCount != expectedDataBytes)
             throw new InvalidDataException("Unexpected byte count in response!");
 
@@ -230,16 +199,6 @@ public sealed class FelicitySolarInverter
         for (var i = 0; i < numberOfPoints; i++)
             registers[i] = (short)((response[3 + i * 2] << 8) | response[3 + i * 2 + 1]);
 
-        // debug
-        str = "";
-        for (int i = 0; i < numberOfPoints; i++)
-        {
-            str += registers[i].ToString("X") + " ";
-        }
-        Debug.WriteLine("Registers: " + str);
-        logger.LogInformation("Registers: {str}", str);
-        // end of debug
-
         return registers;
     }
 

src/Server/Program.cs

@@ -6,7 +6,6 @@ using InverterMon.Server.BatteryService;
 using InverterMon.Server.InverterService;
 using InverterMon.Server.Persistence;
 using InverterMon.Server.Persistence.Settings;
-using NLog.Extensions.Logging;
 
 //avoid parsing issues with non-english cultures
 var cultureInfo = new CultureInfo("en-US");
@@ -15,23 +14,16 @@ CultureInfo.DefaultThreadCurrentUICulture = cultureInfo;
 
 var bld = WebApplication.CreateBuilder();
 
-_ = int.TryParse(bld.Configuration["LaunchSettings:WebPort"] ?? "9000", out var port);
+_ = int.TryParse(bld.Configuration["LaunchSettings:WebPort"] ?? "80", out var port);
 bld.WebHost.ConfigureKestrel(o => o.Listen(IPAddress.Any, port));
 
 bld.Services
    .AddSingleton<UserSettings>()
    .AddSingleton<Database>()
    .AddSingleton<FelicitySolarInverter>()
-   .AddSingleton<JkBms>()
+   .AddSingleton<JkBms>();
-   .AddLogging(config =>
-   {
-       config.ClearProviders(); // Optional: Remove default providers
-       config.AddConsole();
-       config.AddDebug();
-       config.AddNLog();
-   });
 
-//if (!bld.Environment.IsDevelopment())
+if (!bld.Environment.IsDevelopment())
 {
     bld.Services
        .AddHostedService<StatusRetriever>();
@@ -54,5 +46,4 @@ app.UseRouting()
            c.Endpoints.RoutePrefix = "api";
            c.Binding.ReflectionCache.AddFromInverterMonServer();
        });
-
 app.Run();

src/Server/Properties/launchSettings.json

@@ -5,7 +5,7 @@
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "http://localhost:9000",
+      "applicationUrl": "http://localhost:80",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

src/Server/appsettings.json

@@ -1,19 +1,12 @@
 {
   "LaunchSettings": {
-    "DeviceAddress": "COM5",
+    "DeviceAddress": "COM3",
     "JkBmsAddress": "/dev/ttyUSB0",
-    "WebPort": 9000
+    "WebPort": 80
   },
   "Logging": {
     "LogLevel": {
-      "Default": "Debug",
+      "Default": "Information"
-      "Microsoft": "Error"
-    }
-  },
-  "EventLog": {
-    "LogLevel": {
-      "Default": "Warning",
-      "Microsoft": "Warning"
     }
   }
 }

src/Server/nlog.config

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- https://www.youtube.com/watch?v=o5u4fE0t79k -->
-<!-- https://github.com/NLog/NLog/wiki/Configuration-file -->
-<nlog xmlns="https://www.nlog-project.org/schemas/NLog.xsd"
-	  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	
-	<!-- the targets to write to -->
-	<targets>
-		<!-- write logs to file -->
-		<target name="logfile1" xsi:type="File" fileName="c:\temp\InverterMonServer-${shortdate}-1.log" />
-		<target name="logfile2" xsi:type="File" fileName="c:\temp\InverterMonServer-${shortdate}-2.log" />
-		<target name="logconsole" xsi:type="Console" />
-		<target name="ds" xsi:type="OutputDebugString"/>
-	</targets>
-	
-	<!-- rules to map from logger name to target -->
-	<rules>
-		<logger name="FelicitySolarInverter.*" minlevel="Debug" writeTo="logconsole" />
-		<target name="FelicitySolarInverter.*" minlevel="Debug" writeTo="ds"/>
-		<logger name="FelicitySolarInverter.*" minlevel="Trace" writeTo="logfile1" />
-		<logger name="Felicity*" minlevel="Trace" writeTo="logfile2" />
-	</rules>
-</nlog>

src/Shared/InverterMon.Shared.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net7.0</TargetFramework>
         <Nullable>enable</Nullable>
@@ -11,7 +11,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <SupportedPlatform Include="browser" />
+        <SupportedPlatform Include="browser"/>
     </ItemGroup>
 
 </Project>