marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Dev_MagFlux'

Browse Source
This commit is contained in:
Roland Drabesch
2023-05-08 14:49:41 +02:00
parent a74419c1f0 23c9a61370
commit 1ca0205e20
111 changed files with 6161 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/ProductionUiCordonel/FinalTest.xaml.cs
+1
View File
@@ -20,6 +20,7 @@ using System.Windows.Input;
using System.Windows.Threading;
using Xylem.Common.CommonCore.Configuration;
using Xylem.Common.CommonCore.Consts;
using Xylem.Common.Hardware.Interfaces.Ports.PortCore;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore;
Common/ProductionUiCordonel/MainWindow.xaml.cs
+1
View File
@@ -12,6 +12,7 @@ using Newtonsoft.Json;
using ProductionUiCordonel.Model;
using Xylem.Common.CommonCore.Configuration;
using Xylem.Common.CommonCore.Consts;
using Xylem.Common.Hardware.Interfaces.Ports.PortCore;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore;
Common/ProductionUiCordonel/ProductionUiCordonel.csproj
+4
View File
@@ -315,6 +315,10 @@
<Project>{1B02C79E-0B19-43E2-8F6B-71EF0C786C97}</Project>
<Name>CommonCore</Name>
</ProjectReference>
<ProjectReference Include="..\Hardware\Interfaces\Ports\PortCore\PortCore.csproj">
<Project>{2E139F63-B6FE-4EA9-A098-85364FE9B26C}</Project>
<Name>PortCore</Name>
</ProjectReference>
<ProjectReference Include="..\Hardware\WaterMeter\Genesis\Applications\Applications.csproj">
<Project>{315E94B8-B82F-4B25-B5BD-297DF3BC1D54}</Project>
<Name>Applications</Name>