Innovenergy
/
Innovenergy_trunk
2
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

tie namespace and assembly names to directory structure

This commit is contained in:
ig 2023-02-25 15:53:58 +01:00
parent 599b23da2c
commit 955b0e7118
198 changed files with 372 additions and 430 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
csharp/InnovEnergy.props
View File

@ -3,13 +3,14 @@
<PropertyGroup>
<Company>InnovEnergy</Company>
<Nullable>enable</Nullable>
<LangVersion>default</LangVersion>
<LangVersion>preview</LangVersion>
<IsTrimmable>true</IsTrimmable>
<RootNamespace>InnovEnergy</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
<TargetFramework>net6.0</TargetFramework>
<InvariantGlobalization>true</InvariantGlobalization>
<SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>
<RootNamespace>$(Company).$(MSBuildProjectDirectory.Replace($(SolutionDir), "").Replace("lib/", "Lib/").Replace("app/", "App/").Replace("src/", "").Replace("/","."))</RootNamespace>
<Authors>$(Company) Team</Authors>
</PropertyGroup>
</Project>

2
csharp/InnovEnergy.sln
View File

@ -65,7 +65,7 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backend", "app/Backend/Backend.csproj", "{A56F58C2-B265-435B-A985-53B4D6F49B1A}"
EndProject
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Units", "lib/Units/Units.csproj", "{C04FB6DA-23C6-46BB-9B21-8F4FBA32FFF7}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StatusData", "lib\StatusData\StatusData.csproj", "{C04FB6DA-23C6-46BB-9B21-8F4FBA32FFF7}"
EndProject
Global

20
csharp/app/Backend/Backend.csproj
View File

@ -1,12 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>preview</LangVersion>
<RootNamespace>Innovenergy.Backend</RootNamespace>
</PropertyGroup>
<Import Project="../InnovEnergy.app.props" />
<ItemGroup>
<PackageReference Include="Flurl.Http" Version="3.2.4" />
@ -28,17 +21,10 @@
<PackageReference Include="Swashbuckle.AspNetCore.Filters.Abstractions" Version="7.0.6" />
</ItemGroup>
<ItemGroup>
<Reference Include="AWSSDK.Core">
<HintPath>..\..\..\..\..\..\.nuget\packages\awssdk.core\3.7.8.10\lib\netcoreapp3.1\AWSSDK.Core.dll</HintPath>
</Reference>
<Reference Include="SQLite-net">
<HintPath>..\..\..\..\..\.nuget\packages\sqlite-net-pcl\1.8.116\lib\netstandard2.0\SQLite-net.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\lib\WebServer\WebServer.csproj" />
<ProjectReference Include="..\..\lib\Utils\Utils.csproj" />
</ItemGroup>
</Project>

4
csharp/app/BmsTunnel/BatteryConnection.cs
View File

@ -1,9 +1,9 @@
using CliWrap;
using CliWrap.Buffered;
using InnovEnergy.Lib.Utils;
using static InnovEnergy.BmsTunnel.CliPrograms;
using static InnovEnergy.App.BmsTunnel.CliPrograms;
namespace InnovEnergy.BmsTunnel;
namespace InnovEnergy.App.BmsTunnel;
using Nodes = IReadOnlyList<Byte>;

2
csharp/app/BmsTunnel/BmsTunnel.cs
View File

@ -3,7 +3,7 @@ using System.Text;
using CliWrap.Buffered;
using InnovEnergy.Lib.Utils;
namespace InnovEnergy.BmsTunnel;
namespace InnovEnergy.App.BmsTunnel;
public class BmsTunnel : IDisposable

4
csharp/app/BmsTunnel/BmsTunnel.csproj
View File

@ -1,10 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../InnovEnergy.app.props" />
<PropertyGroup>
<RootNamespace>InnovEnergy.BmsTunnel</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CliWrap" Version="3.6.0" />
<PackageReference Include="System.IO.Ports" Version="7.0.0" />

2
csharp/app/BmsTunnel/CliPrograms.cs
View File

@ -1,6 +1,6 @@
using CliWrap;
namespace InnovEnergy.BmsTunnel;
namespace InnovEnergy.App.BmsTunnel;
public static class CliPrograms
{

2
csharp/app/BmsTunnel/Program.cs
View File

@ -5,7 +5,7 @@
using InnovEnergy.Lib.Utils;
using static System.String;
namespace InnovEnergy.BmsTunnel;
namespace InnovEnergy.App.BmsTunnel;
public static class Program
{

4
csharp/app/Collector/Collector.csproj
View File

@ -1,10 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../InnovEnergy.app.props" />
<PropertyGroup>
<RootNamespace>InnovEnergy.Collector</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="../../lib/Utils/Utils.csproj" />
<ProjectReference Include="../../lib/WebServer/WebServer.csproj" />

8
csharp/app/Collector/src/BatteryDataParser.cs
View File

@ -1,14 +1,14 @@
using System.Net;
using System.Text;
using InnovEnergy.Collector.Influx;
using InnovEnergy.Collector.Records;
using InnovEnergy.Collector.Utils;
using InnovEnergy.App.Collector.Influx;
using InnovEnergy.App.Collector.Records;
using InnovEnergy.App.Collector.Utils;
using InnovEnergy.Lib.Utils;
using InnovEnergy.Lib.Utils.Net;
using Convert = System.Convert;
namespace InnovEnergy.Collector;
namespace InnovEnergy.App.Collector;
using Data = IReadOnlyList<String>;

8
csharp/app/Collector/src/BatteryDataParserV4.cs
View File

@ -1,15 +1,15 @@
using System.Net;
using System.Text;
using InnovEnergy.Collector.Influx;
using InnovEnergy.Collector.Records;
using InnovEnergy.Collector.Utils;
using InnovEnergy.App.Collector.Influx;
using InnovEnergy.App.Collector.Records;
using InnovEnergy.App.Collector.Utils;
using InnovEnergy.Lib.Utils;
using Convert = System.Convert;
// NOT (YET) USED
namespace InnovEnergy.Collector;
namespace InnovEnergy.App.Collector;
using Data = IReadOnlyList<String>;

2
csharp/app/Collector/src/Influx/FieldAttribute.cs
View File

@ -2,7 +2,7 @@ using static System.AttributeTargets;
#nullable disable
namespace InnovEnergy.Collector.Influx;
namespace InnovEnergy.App.Collector.Influx;
[AttributeUsage(Property)]
public class FieldAttribute : Attribute

6
csharp/app/Collector/src/Influx/InfluxRecord.cs
View File

@ -1,10 +1,10 @@
using System.Text;
using InnovEnergy.Collector.Utils;
using InnovEnergy.App.Collector.Utils;
using InnovEnergy.Lib.Utils;
using static System.Globalization.CultureInfo;
using static InnovEnergy.Collector.Influx.LineProtocolSyntax;
using static InnovEnergy.App.Collector.Influx.LineProtocolSyntax;
namespace InnovEnergy.Collector.Influx;
namespace InnovEnergy.App.Collector.Influx;
public static class InfluxRecord
{

2
csharp/app/Collector/src/Influx/LineProtocolSyntax.cs
View File

@ -1,7 +1,7 @@
using System.Diagnostics.CodeAnalysis;
using static System.Globalization.CultureInfo;
namespace InnovEnergy.Collector.Influx;
namespace InnovEnergy.App.Collector.Influx;
internal static class LineProtocolSyntax
{

2
csharp/app/Collector/src/Influx/TagAttribute.cs
View File

@ -1,6 +1,6 @@
using static System.AttributeTargets;
namespace InnovEnergy.Collector.Influx;
namespace InnovEnergy.App.Collector.Influx;
[AttributeUsage(Property)]
public class TagAttribute : Attribute

12
csharp/app/Collector/src/Program.cs
View File

@ -2,17 +2,17 @@
using System.Reactive.Concurrency;
using System.Reactive.Linq;
using System.Reactive.Subjects;
using InnovEnergy.Collector.Influx;
using InnovEnergy.Collector.Records;
using InnovEnergy.Lib.Utils;
using static System.Text.Encoding;
using static InnovEnergy.Lib.Utils.ExceptionHandling;
using System.Text.Json;
using InnovEnergy.App.Collector.Influx;
using InnovEnergy.App.Collector.Records;
using InnovEnergy.Lib.Utils;
using InnovEnergy.Lib.Utils.Net;
using InnovEnergy.Lib.WebServer;
using static System.Text.Encoding;
using static InnovEnergy.Lib.Utils.ExceptionHandling;
namespace InnovEnergy.Collector;
namespace InnovEnergy.App.Collector;
// TODO: net6

4
csharp/app/Collector/src/Records/Alarms.cs
View File

@ -1,10 +1,10 @@
using InnovEnergy.Collector.Influx;
using InnovEnergy.App.Collector.Influx;
// ReSharper disable IdentifierTypo
// ReSharper disable UnusedAutoPropertyAccessor.Global
// ReSharper disable InconsistentNaming
namespace InnovEnergy.Collector.Records;
namespace InnovEnergy.App.Collector.Records;
public class Alarms : BatteryRecord
{

2
csharp/app/Collector/src/Records/BatteryRecord.cs
View File

@ -1,4 +1,4 @@
namespace InnovEnergy.Collector.Records;
namespace InnovEnergy.App.Collector.Records;
public abstract class BatteryRecord
{}

4
csharp/app/Collector/src/Records/BatteryStatus.cs
View File

@ -1,9 +1,9 @@
using InnovEnergy.Collector.Influx;
using InnovEnergy.App.Collector.Influx;
// ReSharper disable UnusedAutoPropertyAccessor.Global
// ReSharper disable MemberCanBePrivate.Global
namespace InnovEnergy.Collector.Records;
namespace InnovEnergy.App.Collector.Records;
public class BatteryStatus : BatteryRecord
{

4
csharp/app/Collector/src/Records/Error.cs
View File

@ -1,8 +1,8 @@
using InnovEnergy.Collector.Influx;
using InnovEnergy.App.Collector.Influx;
// ReSharper disable UnusedAutoPropertyAccessor.Global
namespace InnovEnergy.Collector.Records;
namespace InnovEnergy.App.Collector.Records;
public class Error : BatteryRecord
{

4
csharp/app/Collector/src/Records/InstallationStatus.cs
View File

@ -1,6 +1,6 @@
using InnovEnergy.Collector.Influx;
using InnovEnergy.App.Collector.Influx;
namespace InnovEnergy.Collector.Records;
namespace InnovEnergy.App.Collector.Records;
public class InstallationStatus : BatteryRecord
{

4
csharp/app/Collector/src/Records/IoStatus.cs
View File

@ -1,8 +1,8 @@
using InnovEnergy.Collector.Influx;
using InnovEnergy.App.Collector.Influx;
// ReSharper disable UnusedAutoPropertyAccessor.Global
namespace InnovEnergy.Collector.Records;
namespace InnovEnergy.App.Collector.Records;
public class IoStatus : BatteryRecord
{

4
csharp/app/Collector/src/Records/Leds.cs
View File

@ -1,9 +1,9 @@
using InnovEnergy.Collector.Influx;
using InnovEnergy.App.Collector.Influx;
// ReSharper disable UnusedAutoPropertyAccessor.Global
// ReSharper disable UnusedMember.Global
namespace InnovEnergy.Collector.Records;
namespace InnovEnergy.App.Collector.Records;
public class Leds : BatteryRecord
{

5
csharp/app/Collector/src/Records/Temperatures.cs
View File

@ -1,7 +1,6 @@
using InnovEnergy.Collector.Influx;
using InnovEnergy.App.Collector.Influx;
namespace InnovEnergy.Collector.Records;
namespace InnovEnergy.App.Collector.Records;
#pragma warning disable CS8618

5
csharp/app/Collector/src/Records/Warnings.cs
View File

@ -1,7 +1,6 @@
using InnovEnergy.Collector.Influx;
using InnovEnergy.App.Collector.Influx;
namespace InnovEnergy.Collector.Records;
namespace InnovEnergy.App.Collector.Records;
#pragma warning disable CS8618

2
csharp/app/Collector/src/Settings.cs
View File

@ -1,6 +1,6 @@
using System.Net;
namespace InnovEnergy.Collector;
namespace InnovEnergy.App.Collector;
public static class Settings
{

2
csharp/app/Collector/src/Utils/Extensions.cs
View File

@ -1,6 +1,6 @@
using System.Globalization;
namespace InnovEnergy.Collector.Utils;
namespace InnovEnergy.App.Collector.Utils;
public static class Extensions
{

2
csharp/app/Collector/src/Utils/Log.cs
View File

@ -1,4 +1,4 @@
namespace InnovEnergy.Collector.Utils;
namespace InnovEnergy.App.Collector.Utils;
internal static class Log
{

2
csharp/app/Collector/src/Utils/Property.cs
View File

@ -1,7 +1,7 @@
using System.Reflection;
using InnovEnergy.Lib.Utils;
namespace InnovEnergy.Collector.Utils;
namespace InnovEnergy.App.Collector.Utils;
public readonly struct Property
{

2
csharp/app/Collector/src/Utils/ReadOnlyListExtensions.cs
View File

@ -1,4 +1,4 @@
namespace InnovEnergy.Collector.Utils;
namespace InnovEnergy.App.Collector.Utils;
public static class ReadOnlyListExtensions
{

2
csharp/app/Collector/src/Utils/Utils.cs
View File

@ -1,4 +1,4 @@
namespace InnovEnergy.Collector.Utils;
namespace InnovEnergy.App.Collector.Utils;
public static class Utils
{

2
csharp/app/EmuMeterDriver/Config.cs
View File

@ -1,7 +1,7 @@
using System.Reflection;
using InnovEnergy.Lib.Victron.VeDBus;
namespace InnovEnergy.EmuMeter;
namespace InnovEnergy.App.EmuMeterDriver;
public static class Config
{

3
csharp/app/EmuMeterDriver/EmuMeterDriver.cs
View File

@ -5,8 +5,7 @@ using InnovEnergy.Lib.Protocols.Modbus.Clients;
using InnovEnergy.Lib.Utils;
using InnovEnergy.Lib.Victron.VeDBus;
namespace InnovEnergy.EmuMeter;
namespace InnovEnergy.App.EmuMeterDriver;
public static class EmuMeterDriver
{

4
csharp/app/EmuMeterDriver/EmuMeterDriver.csproj
View File

@ -1,10 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../InnovEnergy.app.props" />
<PropertyGroup>
<RootNamespace>InnovEnergy.EmuMeter</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\lib\Devices\EmuMeter\EmuMeter.csproj" />
<ProjectReference Include="..\..\lib\Protocols\DBus\DBus.csproj" />

2
csharp/app/EmuMeterDriver/Nic.cs
View File

@ -2,7 +2,7 @@ using System.Text.Json.Nodes;
using CliWrap;
using CliWrap.Buffered;
namespace InnovEnergy.EmuMeter;
namespace InnovEnergy.App.EmuMeterDriver;
public readonly struct Nic
{

2
csharp/app/EmuMeterDriver/Program.cs
View File

@ -1,4 +1,4 @@
using InnovEnergy.EmuMeter;
using InnovEnergy.App.EmuMeterDriver;
using InnovEnergy.Lib.Protocols.DBus;
using InnovEnergy.Lib.Utils;
using InnovEnergy.Lib.Utils.Net;

2
csharp/app/EmuMeterDriver/Signal.cs
View File

@ -2,7 +2,7 @@ using InnovEnergy.Lib.Devices.EmuMeter;
using InnovEnergy.Lib.Protocols.DBus.Protocol.DataTypes;
using InnovEnergy.Lib.Victron.VeDBus;
namespace InnovEnergy.EmuMeter;
namespace InnovEnergy.App.EmuMeterDriver;
public record Signal(Func<EmuMeterStatus, Object> Source, ObjectPath Path, String Format = "")
{

2
csharp/app/EmuMeterDriver/Utils.cs
View File

@ -1,4 +1,4 @@
namespace InnovEnergy.EmuMeter;
namespace InnovEnergy.App.EmuMeterDriver;
public static class Utils
{

2
csharp/app/InnovEnergy.app.props
View File

@ -11,7 +11,6 @@
<PublishSingleFile>true</PublishSingleFile>
<PublishReadyToRun>true</PublishReadyToRun>
<TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@ -20,6 +19,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<RootNamespace>InnovEnergy.App.$(AssemblyName)</RootNamespace>
</PropertyGroup>
</Project>

4
csharp/app/OpenVpnCertificatesServer/Files.cs
View File

@ -1,6 +1,4 @@
namespace InnovEnergy.OpenVpnCertificatesServer;
using System;
namespace InnovEnergy.App.OpenVpnCertificatesServer;
public static class Files
{

5
csharp/app/OpenVpnCertificatesServer/Http.cs
View File

@ -1,9 +1,8 @@
namespace InnovEnergy.OpenVpnCertificatesServer;
using System;
using System.Net;
using Flurl;
namespace InnovEnergy.App.OpenVpnCertificatesServer;
public static class Http
{
// TODO: use worker thread

4
csharp/app/OpenVpnCertificatesServer/OpenVpnCertificatesServer.csproj
View File

@ -1,10 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../InnovEnergy.app.props" />
<PropertyGroup>
<RootNamespace>InnovEnergy.OpenVpnCertificatesServer</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BouncyCastle" Version="1.8.9" />
<PackageReference Include="Flurl.Http" Version="3.2.2" />

2
csharp/app/OpenVpnCertificatesServer/PKI/CertificateAuthority.cs
View File

@ -7,7 +7,7 @@ using Org.BouncyCastle.Math;
using Org.BouncyCastle.Security;
using Org.BouncyCastle.X509;
namespace InnovEnergy.OpenVpnCertificatesServer.PKI;
namespace InnovEnergy.App.OpenVpnCertificatesServer.PKI;
public static class CertificateAuthority
{

2
csharp/app/OpenVpnCertificatesServer/PKI/Pem.cs
View File

@ -1,6 +1,6 @@
using Org.BouncyCastle.OpenSsl;
namespace InnovEnergy.OpenVpnCertificatesServer.PKI;
namespace InnovEnergy.App.OpenVpnCertificatesServer.PKI;
public static class Pem
{

2
csharp/app/OpenVpnCertificatesServer/PKI/PwdFinder.cs
View File

@ -1,6 +1,6 @@
using Org.BouncyCastle.OpenSsl;
namespace InnovEnergy.OpenVpnCertificatesServer.PKI;
namespace InnovEnergy.App.OpenVpnCertificatesServer.PKI;
public class PwdFinder : IPasswordFinder
{

13
csharp/app/OpenVpnCertificatesServer/Program.cs
View File

@ -1,15 +1,14 @@
using InnovEnergy.Lib.Utils;
using InnovEnergy.Lib.Victron.VictronVRM;
using InnovEnergy.OpenVpnCertificatesServer.PKI;
using System.Diagnostics;
using System.Diagnostics;
using System.Text;
using Flurl;
using ICSharpCode.SharpZipLib.Tar;
using InnovEnergy.App.OpenVpnCertificatesServer.PKI;
using InnovEnergy.Lib.Utils;
using InnovEnergy.Lib.Victron.VictronVRM;
using Org.BouncyCastle.Crypto;
using static InnovEnergy.App.OpenVpnCertificatesServer.PKI.CertificateAuthority;
using static InnovEnergy.OpenVpnCertificatesServer.PKI.CertificateAuthority;
namespace InnovEnergy.OpenVpnCertificatesServer;
namespace InnovEnergy.App.OpenVpnCertificatesServer;
// dotnet publish OpenVpnCertificatesServer.csproj -c Release -r linux-x64 -p:PublishSingleFile=true --self-contained true && scp bin/Release/net6.0/linux-x64/publish/OpenVpnCertificatesServer ig@salidomo.innovenergy.ch:~/get_cert/get_cert

5
csharp/app/OpenVpnCertificatesServer/Utils.cs
View File

@ -1,9 +1,8 @@
namespace InnovEnergy.OpenVpnCertificatesServer;
using System;
using System.Text;
using ICSharpCode.SharpZipLib.Tar;
namespace InnovEnergy.App.OpenVpnCertificatesServer;
public static class Utils
{
public static void WriteFile(this TarOutputStream tar, String fileName, Byte[] contents, Boolean executable = false)

2
csharp/app/RemoteSupportConsole/Login.cs
View File

@ -1,4 +1,4 @@
namespace InnovEnergy.RemoteSupportConsole;
namespace InnovEnergy.App.RemoteSupportConsole;
public static class Login
{

2
csharp/app/RemoteSupportConsole/ObservablePipeSource.cs
View File

@ -2,7 +2,7 @@ using System.Reactive.Linq;
using System.Reactive.Threading.Tasks;
using CliWrap;
namespace InnovEnergy.RemoteSupportConsole;
namespace InnovEnergy.App.RemoteSupportConsole;
public static class ObservablePipeSource
{

2
csharp/app/RemoteSupportConsole/Program.cs
View File

@ -4,7 +4,7 @@ using InnovEnergy.Lib.Utils;
using InnovEnergy.Lib.Victron.VictronVRM;
using static System.Globalization.CompareOptions;
namespace InnovEnergy.RemoteSupportConsole;
namespace InnovEnergy.App.RemoteSupportConsole;
// dotnet publish -c release -r ubuntu-x64
// dotnet publish RemoteSupportConsole.csproj -c Release -r linux-x64 -p:PublishSingleFile=true --self-contained true

4
csharp/app/RemoteSupportConsole/RemoteSupportConsole.csproj
View File

@ -1,10 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../InnovEnergy.app.props" />
<PropertyGroup>
<RootNamespace>InnovEnergy.RemoteSupportConsole</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="../../lib/Utils/Utils.csproj" />
<ProjectReference Include="../../lib/Victron/VictronVRM/VictronVRM.csproj" />

2
csharp/app/RemoteSupportConsole/Ssh.cs
View File

@ -1,7 +1,7 @@
using CliWrap;
using InnovEnergy.Lib.Utils;
namespace InnovEnergy.RemoteSupportConsole;
namespace InnovEnergy.App.RemoteSupportConsole;
public static class Ssh
{

2
csharp/app/RemoteSupportConsole/VpnConnection.cs
View File

@ -2,7 +2,7 @@ using InnovEnergy.Lib.Utils;
using InnovEnergy.Lib.Victron.VictronVRM;
using static System.ConsoleColor;
namespace InnovEnergy.RemoteSupportConsole;
namespace InnovEnergy.App.RemoteSupportConsole;
public static class VpnConnection
{

2
csharp/app/RemoteSupportConsole/VpnInfo.cs
View File

@ -2,7 +2,7 @@ using Flurl;
using Flurl.Http;
using InnovEnergy.Lib.Utils;
namespace InnovEnergy.RemoteSupportConsole;
namespace InnovEnergy.App.RemoteSupportConsole;
public static class VpnInfo
{

2
csharp/app/RemoteSupportConsole/VrmConnection.cs
View File

@ -7,7 +7,7 @@ using InnovEnergy.Lib.Victron.VictronVRM;
using static System.ConsoleColor;
using static System.StringSplitOptions;
namespace InnovEnergy.RemoteSupportConsole;
namespace InnovEnergy.App.RemoteSupportConsole;
public static class VrmConnection
{

2
csharp/app/RemoteSupportConsole/VrmInfo.cs
View File

@ -3,7 +3,7 @@ using InnovEnergy.Lib.Utils;
using InnovEnergy.Lib.Victron.VictronVRM;
using static System.ConsoleColor;
namespace InnovEnergy.RemoteSupportConsole;
namespace InnovEnergy.App.RemoteSupportConsole;
public static class VrmInfo

2
csharp/app/RemoteSupportConsole/VrmProxy.cs
View File

@ -1,4 +1,4 @@
namespace InnovEnergy.RemoteSupportConsole;
namespace InnovEnergy.App.RemoteSupportConsole;
public readonly record struct VrmProxy(IDisposable Connection, String User, String Host, String Port) : IDisposable
{

33
csharp/app/SaliMax/SaliMax.csproj
View File

@ -1,25 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../InnovEnergy.app.props" />
<PropertyGroup>
<RootNamespace>InnovEnergy.SaliMax</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="../../lib/Devices/Adam6060/Adam6060.csproj"/>
<ProjectReference Include="../../lib/Devices/AMPT/Ampt.csproj"/>
<ProjectReference Include="../../lib/Devices/Battery48TL/Battery48TL.csproj"/>
<ProjectReference Include="../../lib/Devices/EmuMeter/EmuMeter.csproj"/>
<ProjectReference Include="../../lib/Devices/Trumpf/TruConvertAc/TruConvertAc.csproj"/>
<ProjectReference Include="../../lib/Devices/Trumpf/TruConvertDc/TruConvertDc.csproj"/>
<ProjectReference Include="../../lib/Devices/Trumpf/TruConvert/TruConvert.csproj"/>
<ProjectReference Include="../../lib/StatusApi/StatusApi.csproj"/>
<ProjectReference Include="../../lib/Utils/Utils.csproj"/>
<ProjectReference Include="../../lib/Time/Time.csproj"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../../lib/Devices/Adam6060/Adam6060.csproj" />
<ProjectReference Include="../../lib/Devices/AMPT/Ampt.csproj" />
<ProjectReference Include="../../lib/Devices/Battery48TL/Battery48TL.csproj" />
<ProjectReference Include="../../lib/Devices/EmuMeter/EmuMeter.csproj" />
<ProjectReference Include="../../lib/Devices/Trumpf/TruConvertAc/TruConvertAc.csproj" />
<ProjectReference Include="../../lib/Devices/Trumpf/TruConvertDc/TruConvertDc.csproj" />
<ProjectReference Include="../../lib/Devices/Trumpf/TruConvert/TruConvert.csproj" />
<ProjectReference Include="../../lib/StatusApi/StatusApi.csproj" />
<ProjectReference Include="../../lib/Utils/Utils.csproj" />
<PackageReference Include="CliWrap" Version="3.6.0" />
<PackageReference Include="DecimalMath.DecimalEx" Version="1.0.2" />
<PackageReference Include="Flurl.Http" Version="3.2.4" />
<PackageReference Include="System.IO.Ports" Version="7.0.0" />
<ProjectReference Include="..\..\lib\Time\Time.csproj" />
<PackageReference Include="CliWrap" Version="3.6.0"/>
<PackageReference Include="Flurl.Http" Version="3.2.4"/>
<PackageReference Include="System.IO.Ports" Version="7.0.0"/>
<PackageReference Include="DecimalMath.DecimalEx" Version="1.0.2"/>
</ItemGroup>

2
csharp/app/SaliMax/src/AsciiArt.cs
View File

@ -1,6 +1,6 @@
using InnovEnergy.Lib.Utils;
namespace InnovEnergy.SaliMax;
namespace InnovEnergy.App.SaliMax;
public static class AsciiArt
{

2
csharp/app/SaliMax/src/BusPort.cs
View File

@ -1,4 +1,4 @@
namespace InnovEnergy.SaliMax;
namespace InnovEnergy.App.SaliMax;
public enum BusPort
{

2
csharp/app/SaliMax/src/Controller/AvgBatteriesStatus.cs
View File

@ -1,6 +1,6 @@
using InnovEnergy.Lib.Devices.Battery48TL;
namespace InnovEnergy.SaliMax.Controller;
namespace InnovEnergy.App.SaliMax.Controller;
public class AvgBatteriesStatus
{

4
csharp/app/SaliMax/src/Controller/Control.cs
View File

@ -1,6 +1,4 @@
using static InnovEnergy.SaliMax.SystemConfig.SalimaxConfig;
namespace InnovEnergy.SaliMax.Controller;
namespace InnovEnergy.App.SaliMax.Controller;
public static class Control
{

6
csharp/app/SaliMax/src/Controller/ControlRecord.cs
View File

@ -1,9 +1,9 @@
using InnovEnergy.App.SaliMax.SaliMaxRelays;
using InnovEnergy.App.SaliMax.SystemConfig;
using InnovEnergy.Lib.Devices.Trumpf.TruConvertAc;
using InnovEnergy.Lib.Devices.Trumpf.TruConvertDc;
using InnovEnergy.SaliMax.SaliMaxRelays;
using InnovEnergy.SaliMax.SystemConfig;
namespace InnovEnergy.SaliMax.Controller;
namespace InnovEnergy.App.SaliMax.Controller;
public class ControlRecord
{

2
csharp/app/SaliMax/src/Controller/ControlTarget.cs
View File

@ -1,4 +1,4 @@
namespace InnovEnergy.SaliMax.Controller;
namespace InnovEnergy.App.SaliMax.Controller;
public enum ControlTarget // TODO to delete
{

10
csharp/app/SaliMax/src/Controller/Controller.cs
View File

@ -1,14 +1,14 @@
using InnovEnergy.App.SaliMax.SaliMaxRelays;
using InnovEnergy.App.SaliMax.SystemConfig;
using InnovEnergy.Lib.Devices.Trumpf.TruConvert;
using InnovEnergy.Lib.Devices.Trumpf.TruConvertAc;
using InnovEnergy.Lib.Devices.Trumpf.TruConvertDc;
using InnovEnergy.Lib.Time.Unix;
using InnovEnergy.Lib.Utils;
using InnovEnergy.SaliMax.SaliMaxRelays;
using InnovEnergy.SaliMax.SystemConfig;
using InnovEnergy.Time.Unix;
using static InnovEnergy.SaliMax.SaliMaxRelays.RelayState;
using static InnovEnergy.App.SaliMax.SaliMaxRelays.RelayState;
namespace InnovEnergy.SaliMax.Controller;
namespace InnovEnergy.App.SaliMax.Controller;
public static class Controller
{

2
csharp/app/SaliMax/src/Controller/SaliMaxState.cs
View File

@ -1,4 +1,4 @@
namespace InnovEnergy.SaliMax.Controller;
namespace InnovEnergy.App.SaliMax.Controller;
public struct SaliMaxState
{

2
csharp/app/SaliMax/src/Controller/State.cs
View File

@ -1,5 +1,5 @@
namespace InnovEnergy.SaliMax.Controller;
namespace InnovEnergy.App.SaliMax.Controller;
public enum State : Int16
{

2
csharp/app/SaliMax/src/Controller/StateConfig.cs
View File

@ -1,5 +1,5 @@
namespace InnovEnergy.SaliMax.Controller;
namespace InnovEnergy.App.SaliMax.Controller;
public static class StateConfig
{

8
csharp/app/SaliMax/src/Controller/StatusRecord.cs
View File

@ -1,12 +1,12 @@
using InnovEnergy.Lib.Devices.Ampt;
using InnovEnergy.App.SaliMax.SaliMaxRelays;
using InnovEnergy.App.SaliMax.SystemConfig;
using InnovEnergy.Lib.Devices.AMPT;
using InnovEnergy.Lib.Devices.Battery48TL;
using InnovEnergy.Lib.Devices.EmuMeter;
using InnovEnergy.Lib.Devices.Trumpf.TruConvertAc;
using InnovEnergy.Lib.Devices.Trumpf.TruConvertDc;
using InnovEnergy.SaliMax.SaliMaxRelays;
using InnovEnergy.SaliMax.SystemConfig;
namespace InnovEnergy.SaliMax.Controller;
namespace InnovEnergy.App.SaliMax.Controller;
public record StatusRecord
{

4
csharp/app/SaliMax/src/Log/Ampt.cs
View File

@ -1,8 +1,8 @@
using System.Text.Json.Nodes;
using InnovEnergy.Lib.Devices.Ampt;
using InnovEnergy.Lib.Devices.AMPT;
using InnovEnergy.Lib.StatusApi;
namespace InnovEnergy.SaliMax.Log;
namespace InnovEnergy.App.SaliMax.Log;
public static class Ampt
{

2
csharp/app/SaliMax/src/Log/Battery48Tl.cs
View File

@ -2,7 +2,7 @@ using System.Text.Json.Nodes;
using InnovEnergy.Lib.Devices.Battery48TL;
using InnovEnergy.Lib.StatusApi;
namespace InnovEnergy.SaliMax.Log;
namespace InnovEnergy.App.SaliMax.Log;
public static class Battery48Tl
{

4
csharp/app/SaliMax/src/Log/EmuMeter.cs
View File

@ -3,9 +3,9 @@ using InnovEnergy.Lib.Devices.EmuMeter;
using InnovEnergy.Lib.StatusApi;
using InnovEnergy.Lib.Utils;
using static DecimalMath.DecimalEx;
using static InnovEnergy.SaliMax.Log.JsonUtil;
using static InnovEnergy.App.SaliMax.Log.JsonUtil;
namespace InnovEnergy.SaliMax.Log;
namespace InnovEnergy.App.SaliMax.Log;
public static class EmuMeter
{

2
csharp/app/SaliMax/src/Log/JsonUtil.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json.Nodes;
using InnovEnergy.Lib.StatusApi;
namespace InnovEnergy.SaliMax.Log;
namespace InnovEnergy.App.SaliMax.Log;
public static class JsonUtil
{

6
csharp/app/SaliMax/src/Log/Salimax.cs
View File

@ -1,9 +1,9 @@
using System.Text.Json.Nodes;
using InnovEnergy.App.SaliMax.Controller;
using InnovEnergy.Lib.StatusApi;
using InnovEnergy.SaliMax.Controller;
using InnovEnergy.Time.Unix;
using InnovEnergy.Lib.Time.Unix;
namespace InnovEnergy.SaliMax.Log;
namespace InnovEnergy.App.SaliMax.Log;
public static class Salimax
{

4
csharp/app/SaliMax/src/Log/TruConvertAc.cs
View File

@ -2,9 +2,9 @@ using System.Text.Json.Nodes;
using InnovEnergy.Lib.Devices.Trumpf.TruConvertAc;
using InnovEnergy.Lib.Utils;
using static DecimalMath.DecimalEx;
using static InnovEnergy.SaliMax.Log.JsonUtil;
using static InnovEnergy.App.SaliMax.Log.JsonUtil;
namespace InnovEnergy.SaliMax.Log;
namespace InnovEnergy.App.SaliMax.Log;
public static class TruConvertAc
{

4
csharp/app/SaliMax/src/Log/TruConvertDc.cs
View File

@ -1,8 +1,8 @@
using System.Text.Json.Nodes;
using InnovEnergy.Lib.Devices.Trumpf.TruConvertDc;
using static InnovEnergy.SaliMax.Log.JsonUtil;
using static InnovEnergy.App.SaliMax.Log.JsonUtil;
namespace InnovEnergy.SaliMax.Log;
namespace InnovEnergy.App.SaliMax.Log;
using JO = JsonObject;

20
csharp/app/SaliMax/src/Program.cs
View File

@ -1,27 +1,23 @@
using System.Diagnostics;
using System.Text.Json;
using System.Text.Json.Nodes;
using System.Text.Json.Serialization;
using Flurl.Http;
using InnovEnergy.App.SaliMax.Controller;
using InnovEnergy.App.SaliMax.Log;
using InnovEnergy.App.SaliMax.SaliMaxRelays;
using InnovEnergy.App.SaliMax.SystemConfig;
using InnovEnergy.Lib.Devices.AMPT;
using InnovEnergy.Lib.Devices.Battery48TL;
using InnovEnergy.Lib.Devices.EmuMeter;
using InnovEnergy.Lib.Devices.Trumpf.TruConvertAc;
using InnovEnergy.Lib.Devices.Trumpf.TruConvertDc;
using InnovEnergy.Lib.Devices.Ampt;
using InnovEnergy.Lib.Devices.Battery48TL;
using InnovEnergy.SaliMax.Controller;
using InnovEnergy.SaliMax.Log;
using InnovEnergy.SaliMax.SaliMaxRelays;
using InnovEnergy.SaliMax.SystemConfig;
using InnovEnergy.Time.Unix;
using InnovEnergy.Lib.Time.Unix;
#pragma warning disable IL2026
namespace InnovEnergy.SaliMax;
namespace InnovEnergy.App.SaliMax;
internal static class Program
{

2
csharp/app/SaliMax/src/S3Config.cs
View File

@ -5,7 +5,7 @@ using InnovEnergy.Lib.Utils;
using static System.Text.Encoding;
using Convert = System.Convert;
namespace InnovEnergy.SaliMax;
namespace InnovEnergy.App.SaliMax;
public record S3Config
{

2
csharp/app/SaliMax/src/SaliMaxRelays/RelayMapBoolean.cs
View File

@ -1,4 +1,4 @@
namespace InnovEnergy.SaliMax.SaliMaxRelays;
namespace InnovEnergy.App.SaliMax.SaliMaxRelays;
public enum RelayState
{

2
csharp/app/SaliMax/src/SaliMaxRelays/SaliMaxRelaysDevice.cs
View File

@ -1,7 +1,7 @@
using InnovEnergy.Lib.Devices.Adam6060;
using InnovEnergy.Lib.Utils;
namespace InnovEnergy.SaliMax.SaliMaxRelays;
namespace InnovEnergy.App.SaliMax.SaliMaxRelays;
public class SaliMaxRelaysDevice
{

2
csharp/app/SaliMax/src/SaliMaxRelays/SaliMaxRelaysStatus.cs
View File

@ -1,4 +1,4 @@
namespace InnovEnergy.SaliMax.SaliMaxRelays;
namespace InnovEnergy.App.SaliMax.SaliMaxRelays;
public record SaliMaxRelayStatus
{

2
csharp/app/SaliMax/src/SystemConfig/Config.cs
View File

@ -1,4 +1,4 @@
namespace InnovEnergy.SaliMax.SystemConfig;
namespace InnovEnergy.App.SaliMax.SystemConfig;
public static class Config
{

2
csharp/app/SaliMax/src/SystemConfig/Defaults.cs
View File

@ -1,7 +1,7 @@
using InnovEnergy.Lib.Devices.Trumpf.TruConvertAc;
using InnovEnergy.Lib.Devices.Trumpf.TruConvertDc;
namespace InnovEnergy.SaliMax.SystemConfig;
namespace InnovEnergy.App.SaliMax.SystemConfig;
public static class Defaults
{

4
csharp/app/SaliMax/src/SystemConfig/SalimaxConfig.cs
View File

@ -1,9 +1,9 @@
using System.Text.Json;
using InnovEnergy.Lib.Time.Unix;
using InnovEnergy.Lib.Utils;
using InnovEnergy.Time.Unix;
using static System.Text.Json.JsonSerializer;
namespace InnovEnergy.SaliMax.SystemConfig;
namespace InnovEnergy.App.SaliMax.SystemConfig;
// shut up trim warnings
#pragma warning disable IL2026

6
csharp/app/SaliMax/src/Topology.cs
View File

@ -1,10 +1,10 @@
#undef BatteriesAllowed
using InnovEnergy.App.SaliMax.Controller;
using InnovEnergy.App.SaliMax.Log;
using InnovEnergy.Lib.Utils;
using InnovEnergy.SaliMax.Controller;
using InnovEnergy.SaliMax.Log;
namespace InnovEnergy.SaliMax;
namespace InnovEnergy.App.SaliMax;
public static class Topology
{

2
csharp/app/SaliMax/src/Utils.cs
View File

@ -1,6 +1,6 @@
using InnovEnergy.Lib.Utils;
namespace InnovEnergy.SaliMax;
namespace InnovEnergy.App.SaliMax;
public static class Utils
{

4
csharp/lib/Channels/Channels.csproj
View File

@ -2,10 +2,6 @@
<Import Project="../InnovEnergy.lib.props" />
<PropertyGroup>
<RootNamespace>InnovEnergy.Lib.Channels</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Utils\Utils.csproj" />
</ItemGroup>

2
csharp/lib/Channels/V2/Bak/Connections/Connection.cs
View File

@ -1,4 +1,4 @@
namespace InnovEnergy.Lib.Channels.V2.Connections;
namespace InnovEnergy.Lib.Channels.V2.Bak.Connections;
public abstract class Connection<C> : IConnection<C> where C : IDisposable
{

2
csharp/lib/Channels/V2/Bak/Connections/Connections.cs
View File

@ -1,6 +1,6 @@
using System.Net.Sockets;
namespace InnovEnergy.Lib.Channels.V2.Connections;
namespace InnovEnergy.Lib.Channels.V2.Bak.Connections;
public class TcpClientConnection : Connection<Socket>
{

2
csharp/lib/Channels/V2/Bak/Connections/Extensions.cs
View File

@ -1,4 +1,4 @@
namespace InnovEnergy.Lib.Channels.V2.Connections;
namespace InnovEnergy.Lib.Channels.V2.Bak.Connections;
public static class Connection
{

2
csharp/lib/Channels/V2/Bak/Connections/IConnection.cs
View File

@ -1,4 +1,4 @@
namespace InnovEnergy.Lib.Channels.V2.Connections;
namespace InnovEnergy.Lib.Channels.V2.Bak.Connections;
public interface IConnection
{

4
csharp/lib/Channels/V2/Bak/GenericChannel.cs
View File

@ -1,6 +1,6 @@
using InnovEnergy.Lib.Channels.V2.Connections;
using InnovEnergy.Lib.Channels.V2.Bak.Connections;
namespace InnovEnergy.Lib.Channels.V2;
namespace InnovEnergy.Lib.Channels.V2.Bak;
public abstract class GenericChannel2<C, Rx, Tx> : IChannel<Rx, Tx>, IConnection
{

2
csharp/lib/Devices/AMPT/Ampt.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<AssemblyName>InnovEnergy.Lib.Devices.Ampt</AssemblyName>
<RootNamespace>InnovEnergy.Lib.Devices.Ampt</RootNamespace>
<!-- <OutputType>Exe</OutputType> -->
</PropertyGroup>

2
csharp/lib/Devices/AMPT/AmptCommunicationUnit.cs
View File

@ -3,7 +3,7 @@ using InnovEnergy.Lib.Protocols.Modbus.Clients;
using InnovEnergy.Lib.Protocols.Modbus.Connections;
using InnovEnergy.Lib.StatusApi.Connections;
namespace InnovEnergy.Lib.Devices.Ampt;
namespace InnovEnergy.Lib.Devices.AMPT;
public class AmptCommunicationUnit
{

2
csharp/lib/Devices/AMPT/AmptDeviceStatus.cs
View File

@ -1,7 +1,7 @@
using InnovEnergy.Lib.StatusApi.Connections;
using InnovEnergy.Lib.StatusApi.Devices;
namespace InnovEnergy.Lib.Devices.Ampt;
namespace InnovEnergy.Lib.Devices.AMPT;
public record AmptDeviceStatus
(

5
csharp/lib/Devices/AMPT/AmptStatus.cs
View File

@ -1,7 +1,4 @@
using InnovEnergy.Lib.StatusApi.Connections;
using InnovEnergy.Lib.StatusApi.Devices;
namespace InnovEnergy.Lib.Devices.Ampt;
namespace InnovEnergy.Lib.Devices.AMPT;
public record AmptStatus
(

2
csharp/lib/Devices/AMPT/AmptStringStatus.cs
View File

@ -1,4 +1,4 @@
namespace InnovEnergy.Lib.Devices.Ampt;
namespace InnovEnergy.Lib.Devices.AMPT;
public record AmptStringStatus
{

2
csharp/lib/Devices/Adam6060/Adam6060.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<AssemblyName>InnovEnergy.Lib.Devices.Adam6060</AssemblyName>
<RootNamespace>InnovEnergy.Lib.Devices.Adam6060</RootNamespace>
<!-- <OutputType>Exe</OutputType> -->
</PropertyGroup>

2
csharp/lib/Devices/Battery48TL/Battery48TL.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<AssemblyName>InnovEnergy.Lib.Devices.Battery48TL</AssemblyName>
<RootNamespace>InnovEnergy.Lib.Devices.Battery48TL</RootNamespace>
</PropertyGroup>
<ItemGroup>

2
csharp/lib/Devices/EmuMeter/EmuMeter.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<AssemblyName>InnovEnergy.Lib.Devices.EmuMeter</AssemblyName>
<RootNamespace>InnovEnergy.Lib.Devices.EmuMeter</RootNamespace>
</PropertyGroup>
<ItemGroup>

Some files were not shown because too many files have changed in this diff Show More