app => App, lib => Lib

2023-02-25 16:04:41 +01:00 · 2023-02-25 16:04:41 +01:00 · aa46ad37b6
parent 5a3ee3d37e
commit aa46ad37b6
489 changed files with 115 additions and 114 deletions
--- a/csharp/App/Backend/Backend.csproj
+++ b/csharp/App/Backend/Backend.csproj
@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-    <Import Project="../InnovEnergy.app.props" />
+    <Import Project="../InnovEnergy.App.props" />

    <ItemGroup>
        <PackageReference Include="Flurl.Http" Version="3.2.4" />
@ -24,7 +24,7 @@
  

    <ItemGroup>
-      <ProjectReference Include="..\..\lib\Utils\Utils.csproj" />
+      <ProjectReference Include="../../Lib/Utils/Utils.csproj" />
    </ItemGroup>

 </Project>
--- a/csharp/App/Backend/Controllers/Controller.cs
+++ b/csharp/App/Backend/Controllers/Controller.cs
--- a/csharp/App/Backend/Controllers/Credentials.cs
+++ b/csharp/App/Backend/Controllers/Credentials.cs
--- a/csharp/App/Backend/Controllers/ReturnsAttribute.cs
+++ b/csharp/App/Backend/Controllers/ReturnsAttribute.cs
--- a/csharp/App/Backend/Database/Db.cs
+++ b/csharp/App/Backend/Database/Db.cs
--- a/csharp/App/Backend/Database/Fake.cs
+++ b/csharp/App/Backend/Database/Fake.cs
--- a/csharp/App/Backend/Database/Folder.cs
+++ b/csharp/App/Backend/Database/Folder.cs
--- a/csharp/App/Backend/Database/Installation.cs
+++ b/csharp/App/Backend/Database/Installation.cs
--- a/csharp/App/Backend/Database/User.cs
+++ b/csharp/App/Backend/Database/User.cs
--- a/csharp/App/Backend/Database/User2Folder.cs
+++ b/csharp/App/Backend/Database/User2Folder.cs
--- a/csharp/App/Backend/Database/User2Installation.cs
+++ b/csharp/App/Backend/Database/User2Installation.cs
--- a/csharp/App/Backend/FakeFolders.csv
+++ b/csharp/App/Backend/FakeFolders.csv
--- a/csharp/App/Backend/FakeInstallations.csv
+++ b/csharp/App/Backend/FakeInstallations.csv
--- a/csharp/App/Backend/FakePasswords.csv
+++ b/csharp/App/Backend/FakePasswords.csv
--- a/csharp/App/Backend/FakeUsers.csv
+++ b/csharp/App/Backend/FakeUsers.csv
--- a/csharp/App/Backend/HeaderFilter.cs
+++ b/csharp/App/Backend/HeaderFilter.cs
--- a/csharp/App/Backend/Model/Folder.cs
+++ b/csharp/App/Backend/Model/Folder.cs
--- a/csharp/App/Backend/Model/Installation.cs
+++ b/csharp/App/Backend/Model/Installation.cs
--- a/csharp/App/Backend/Model/Relations/Relation.cs
+++ b/csharp/App/Backend/Model/Relations/Relation.cs
--- a/csharp/App/Backend/Model/Relations/Session.cs
+++ b/csharp/App/Backend/Model/Relations/Session.cs
--- a/csharp/App/Backend/Model/Relations/User2Folder.cs
+++ b/csharp/App/Backend/Model/Relations/User2Folder.cs
--- a/csharp/App/Backend/Model/Relations/User2Installation.cs
+++ b/csharp/App/Backend/Model/Relations/User2Installation.cs
--- a/csharp/App/Backend/Model/TreeNode.Equality.cs
+++ b/csharp/App/Backend/Model/TreeNode.Equality.cs
--- a/csharp/App/Backend/Model/TreeNode.cs
+++ b/csharp/App/Backend/Model/TreeNode.cs
--- a/csharp/App/Backend/Model/User.cs
+++ b/csharp/App/Backend/Model/User.cs
--- a/csharp/App/Backend/Program.cs
+++ b/csharp/App/Backend/Program.cs
--- a/csharp/App/Backend/Properties/launchSettings.json
+++ b/csharp/App/Backend/Properties/launchSettings.json
--- a/csharp/App/Backend/Utils/Crypto.cs
+++ b/csharp/App/Backend/Utils/Crypto.cs
--- a/csharp/App/Backend/Utils/Result.cs
+++ b/csharp/App/Backend/Utils/Result.cs
--- a/csharp/App/Backend/db.sqlite
+++ b/csharp/App/Backend/db.sqlite
--- a/csharp/App/BmsTunnel/BatteryConnection.cs
+++ b/csharp/App/BmsTunnel/BatteryConnection.cs
--- a/csharp/App/BmsTunnel/BmsTunnel.cs
+++ b/csharp/App/BmsTunnel/BmsTunnel.cs
--- a/csharp/App/BmsTunnel/BmsTunnel.csproj
+++ b/csharp/App/BmsTunnel/BmsTunnel.csproj
@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="../InnovEnergy.app.props" />
+    <Import Project="../InnovEnergy.App.props" />

    <ItemGroup>
        <PackageReference Include="CliWrap" Version="3.6.0" />
@ -7,7 +7,7 @@
    </ItemGroup>

    <ItemGroup>
-        <ProjectReference Include="../../lib/Utils/Utils.csproj" />
+        <ProjectReference Include="../../Lib/Utils/Utils.csproj" />
    </ItemGroup>

 </Project>
--- a/csharp/App/BmsTunnel/CliPrograms.cs
+++ b/csharp/App/BmsTunnel/CliPrograms.cs
--- a/csharp/App/BmsTunnel/Program.cs
+++ b/csharp/App/BmsTunnel/Program.cs
--- a/csharp/App/BmsTunnel/debug.sh
+++ b/csharp/App/BmsTunnel/debug.sh
--- a/csharp/App/BmsTunnel/parameters.txt
+++ b/csharp/App/BmsTunnel/parameters.txt
--- a/csharp/App/Collector/Collector.csproj
+++ b/csharp/App/Collector/Collector.csproj
@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="../InnovEnergy.app.props" />
+    <Import Project="../InnovEnergy.App.props" />

    <ItemGroup>
-      <ProjectReference Include="../../lib/Utils/Utils.csproj" />
-      <ProjectReference Include="../../lib/WebServer/WebServer.csproj" />
+      <ProjectReference Include="../../Lib/Utils/Utils.csproj" />
+      <ProjectReference Include="../../Lib/WebServer/WebServer.csproj" />
    </ItemGroup>

    <ItemGroup>
--- a/csharp/App/Collector/Collector.sln
+++ b/csharp/App/Collector/Collector.sln
--- a/csharp/App/Collector/src/BatteryDataParser.cs
+++ b/csharp/App/Collector/src/BatteryDataParser.cs
--- a/csharp/App/Collector/src/BatteryDataParserV4.cs
+++ b/csharp/App/Collector/src/BatteryDataParserV4.cs
--- a/csharp/App/Collector/src/Influx/FieldAttribute.cs
+++ b/csharp/App/Collector/src/Influx/FieldAttribute.cs
--- a/csharp/App/Collector/src/Influx/InfluxRecord.cs
+++ b/csharp/App/Collector/src/Influx/InfluxRecord.cs
--- a/csharp/App/Collector/src/Influx/LineProtocolSyntax.cs
+++ b/csharp/App/Collector/src/Influx/LineProtocolSyntax.cs
--- a/csharp/App/Collector/src/Influx/TagAttribute.cs
+++ b/csharp/App/Collector/src/Influx/TagAttribute.cs
--- a/csharp/App/Collector/src/Program.cs
+++ b/csharp/App/Collector/src/Program.cs
--- a/csharp/App/Collector/src/Records/Alarms.cs
+++ b/csharp/App/Collector/src/Records/Alarms.cs
--- a/csharp/App/Collector/src/Records/BatteryRecord.cs
+++ b/csharp/App/Collector/src/Records/BatteryRecord.cs
--- a/csharp/App/Collector/src/Records/BatteryStatus.cs
+++ b/csharp/App/Collector/src/Records/BatteryStatus.cs
--- a/csharp/App/Collector/src/Records/Error.cs
+++ b/csharp/App/Collector/src/Records/Error.cs
--- a/csharp/App/Collector/src/Records/InstallationStatus.cs
+++ b/csharp/App/Collector/src/Records/InstallationStatus.cs
--- a/csharp/App/Collector/src/Records/IoStatus.cs
+++ b/csharp/App/Collector/src/Records/IoStatus.cs
--- a/csharp/App/Collector/src/Records/Leds.cs
+++ b/csharp/App/Collector/src/Records/Leds.cs
--- a/csharp/App/Collector/src/Records/Temperatures.cs
+++ b/csharp/App/Collector/src/Records/Temperatures.cs
--- a/csharp/App/Collector/src/Records/Warnings.cs
+++ b/csharp/App/Collector/src/Records/Warnings.cs
--- a/csharp/App/Collector/src/Settings.cs
+++ b/csharp/App/Collector/src/Settings.cs
--- a/csharp/App/Collector/src/Utils/Extensions.cs
+++ b/csharp/App/Collector/src/Utils/Extensions.cs
--- a/csharp/App/Collector/src/Utils/Log.cs
+++ b/csharp/App/Collector/src/Utils/Log.cs
--- a/csharp/App/Collector/src/Utils/Property.cs
+++ b/csharp/App/Collector/src/Utils/Property.cs
--- a/csharp/App/Collector/src/Utils/ReadOnlyListExtensions.cs
+++ b/csharp/App/Collector/src/Utils/ReadOnlyListExtensions.cs
--- a/csharp/App/Collector/src/Utils/Utils.cs
+++ b/csharp/App/Collector/src/Utils/Utils.cs
--- a/csharp/App/EmuMeterDriver/Config.cs
+++ b/csharp/App/EmuMeterDriver/Config.cs
--- a/csharp/App/EmuMeterDriver/EmuMeterDriver.cs
+++ b/csharp/App/EmuMeterDriver/EmuMeterDriver.cs
--- a/csharp/App/EmuMeterDriver/EmuMeterDriver.csproj
+++ b/csharp/App/EmuMeterDriver/EmuMeterDriver.csproj
@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="../InnovEnergy.App.props" />
+
+    <ItemGroup>
+      <ProjectReference Include="../../Lib/Devices/EmuMeter/EmuMeter.csproj" />
+      <ProjectReference Include="../../Lib/Protocols/DBus/DBus.csproj" />
+      <ProjectReference Include="../../Lib/Protocols/Modbus/Modbus.csproj" />
+      <ProjectReference Include="../../Lib/Utils/Utils.csproj" />
+      <ProjectReference Include="../../Lib/Victron/VeDBus/VeDBus.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="CliWrap" Version="3.6.0" />
+    </ItemGroup>
+
+</Project>
--- a/csharp/App/EmuMeterDriver/Nic.cs
+++ b/csharp/App/EmuMeterDriver/Nic.cs
--- a/csharp/App/EmuMeterDriver/Program.cs
+++ b/csharp/App/EmuMeterDriver/Program.cs
--- a/csharp/App/EmuMeterDriver/Signal.cs
+++ b/csharp/App/EmuMeterDriver/Signal.cs
--- a/csharp/App/EmuMeterDriver/Utils.cs
+++ b/csharp/App/EmuMeterDriver/Utils.cs
--- a/csharp/App/EmuMeterDriver/debug.sh
+++ b/csharp/App/EmuMeterDriver/debug.sh
--- a/csharp/App/EmuMeterDriver/service/log/run
+++ b/csharp/App/EmuMeterDriver/service/log/run
--- a/csharp/App/EmuMeterDriver/service/run
+++ b/csharp/App/EmuMeterDriver/service/run
--- a/csharp/App/InnovEnergy.App.props
+++ b/csharp/App/InnovEnergy.App.props
--- a/csharp/App/OpenVpnCertificatesServer/Files.cs
+++ b/csharp/App/OpenVpnCertificatesServer/Files.cs
--- a/csharp/App/OpenVpnCertificatesServer/Http.cs
+++ b/csharp/App/OpenVpnCertificatesServer/Http.cs
--- a/csharp/App/OpenVpnCertificatesServer/OpenVpnCertificatesServer.csproj
+++ b/csharp/App/OpenVpnCertificatesServer/OpenVpnCertificatesServer.csproj
@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="../InnovEnergy.app.props" />
+    <Import Project="../InnovEnergy.App.props" />
    
    <ItemGroup>
      <PackageReference Include="BouncyCastle" Version="1.8.9" />
@ -8,8 +8,9 @@
    </ItemGroup>

    <ItemGroup>
-      <ProjectReference Include="../../lib/Protocols/DBus/DBus.csproj" />
-      <ProjectReference Include="../../lib/Victron/VictronVRM/VictronVRM.csproj" />
+      <ProjectReference Include="../../Lib/Protocols/DBus/DBus.csproj" />
+      <ProjectReference Include="../../Lib/Victron/VictronVRM/VictronVRM.csproj" />
+      <ProjectReference Include="../../Lib/Utils/Utils.csproj" />
    </ItemGroup>
    
 </Project>
--- a/csharp/App/OpenVpnCertificatesServer/OpenVpnCertificatesServer.sln
+++ b/csharp/App/OpenVpnCertificatesServer/OpenVpnCertificatesServer.sln
--- a/csharp/App/OpenVpnCertificatesServer/PKI/CertificateAuthority.cs
+++ b/csharp/App/OpenVpnCertificatesServer/PKI/CertificateAuthority.cs
--- a/csharp/App/OpenVpnCertificatesServer/PKI/Pem.cs
+++ b/csharp/App/OpenVpnCertificatesServer/PKI/Pem.cs
--- a/csharp/App/OpenVpnCertificatesServer/PKI/PwdFinder.cs
+++ b/csharp/App/OpenVpnCertificatesServer/PKI/PwdFinder.cs
--- a/csharp/App/OpenVpnCertificatesServer/Program.cs
+++ b/csharp/App/OpenVpnCertificatesServer/Program.cs
--- a/csharp/App/OpenVpnCertificatesServer/Utils.cs
+++ b/csharp/App/OpenVpnCertificatesServer/Utils.cs
--- a/csharp/App/RemoteSupportConsole/Login.cs
+++ b/csharp/App/RemoteSupportConsole/Login.cs
--- a/csharp/App/RemoteSupportConsole/ObservablePipeSource.cs
+++ b/csharp/App/RemoteSupportConsole/ObservablePipeSource.cs
--- a/csharp/App/RemoteSupportConsole/Program.cs
+++ b/csharp/App/RemoteSupportConsole/Program.cs
--- a/csharp/App/RemoteSupportConsole/RemoteSupportConsole.csproj
+++ b/csharp/App/RemoteSupportConsole/RemoteSupportConsole.csproj
@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="../InnovEnergy.app.props" />
+    <Import Project="../InnovEnergy.App.props" />

    <ItemGroup>
-        <ProjectReference Include="../../lib/Utils/Utils.csproj" />
-        <ProjectReference Include="../../lib/Victron/VictronVRM/VictronVRM.csproj" />
+        <ProjectReference Include="../../Lib/Utils/Utils.csproj" />
+        <ProjectReference Include="../../Lib/Victron/VictronVRM/VictronVRM.csproj" />
    </ItemGroup>

    <ItemGroup>
--- a/csharp/App/RemoteSupportConsole/RemoteSupportConsole.csproj.DotSettings
+++ b/csharp/App/RemoteSupportConsole/RemoteSupportConsole.csproj.DotSettings
--- a/csharp/App/RemoteSupportConsole/Ssh.cs
+++ b/csharp/App/RemoteSupportConsole/Ssh.cs
--- a/csharp/App/RemoteSupportConsole/VpnConnection.cs
+++ b/csharp/App/RemoteSupportConsole/VpnConnection.cs
--- a/csharp/App/RemoteSupportConsole/VpnInfo.cs
+++ b/csharp/App/RemoteSupportConsole/VpnInfo.cs
--- a/csharp/App/RemoteSupportConsole/VrmConnection.cs
+++ b/csharp/App/RemoteSupportConsole/VrmConnection.cs
--- a/csharp/App/RemoteSupportConsole/VrmInfo.cs
+++ b/csharp/App/RemoteSupportConsole/VrmInfo.cs
--- a/csharp/App/RemoteSupportConsole/VrmProxy.cs
+++ b/csharp/App/RemoteSupportConsole/VrmProxy.cs
--- a/csharp/App/SaliMax/SaliMax.csproj
+++ b/csharp/App/SaliMax/SaliMax.csproj
@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="../InnovEnergy.App.props" />
+
+    <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>
+        <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>
+
+
+</Project>
--- a/csharp/App/SaliMax/run
+++ b/csharp/App/SaliMax/run
--- a/csharp/App/SaliMax/src/AsciiArt.cs
+++ b/csharp/App/SaliMax/src/AsciiArt.cs
--- a/csharp/App/SaliMax/src/BusPort.cs
+++ b/csharp/App/SaliMax/src/BusPort.cs
--- a/csharp/App/SaliMax/src/Controller/AvgBatteriesStatus.cs
+++ b/csharp/App/SaliMax/src/Controller/AvgBatteriesStatus.cs
--- a/csharp/App/SaliMax/src/Controller/Control.cs
+++ b/csharp/App/SaliMax/src/Controller/Control.cs
--- a/csharp/App/SaliMax/src/Controller/ControlRecord.cs
+++ b/csharp/App/SaliMax/src/Controller/ControlRecord.cs
--- a/csharp/App/SaliMax/src/Controller/ControlTarget.cs
+++ b/csharp/App/SaliMax/src/Controller/ControlTarget.cs
--- a/Show More
+++ b/Show More