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

Common: - genesis error code moved from WaterMeterCore to GenesisCore

Browse Source
This commit is contained in:
Thomas Wiedebusch
2023-06-02 11:32:01 +02:00
parent 9fbcecdfb9
commit 216886d7ec
20 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/CordonelAssemblyLine/Model/LeakViewModel.cs
+7 -5
View File
@@ -12,8 +12,10 @@ using System.Threading.Tasks;
using System.Timers;
using Xylem.Common.CommonCore.Configuration;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Consts;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts;
using Xylem.Common.Logic.ProductionOrderCore.TestResults;
using Xylem.Common.Logic.SoftwareAccessHelper;
using Xylem.Common.Utils.Logging;
@@ -338,10 +340,10 @@ namespace CordonelAssemblyLine.Model
{
var url = ServiceUrls.MeterProcessStateUrl();
var status = Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts.DisplayCodes.PressureTestedFailed;
var status = DisplayCodes.PressureTestedFailed;
if (successfull)
{
status = Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts.DisplayCodes.PressureTested;
status = DisplayCodes.PressureTested;
}
try
{
@@ -354,7 +356,7 @@ namespace CordonelAssemblyLine.Model
if (!isStored)
{
OnStoreDone?.Invoke(null, new StringArgs("Kann nicht gespeichert werden"));
status = Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts.DisplayCodes.PressureTestedFailed;
status = DisplayCodes.PressureTestedFailed;
}
@@ -365,12 +367,12 @@ namespace CordonelAssemblyLine.Model
catch (Exception ex)
{
Log(ex.Message);
status = Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts.DisplayCodes.PressureTestedFailed;
status = DisplayCodes.PressureTestedFailed;
OnStoreDone?.Invoke(null, new StringArgs($"Kann nicht gespeichert werden.Fehler: {ex.Message}"));
}
if (status == Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts.DisplayCodes.PressureTested)
if (status == DisplayCodes.PressureTested)
{
OnStoreDone?.Invoke(null, new StringArgs("Ergebnis gespeichert der Zähler weiter bearbeitet werden."));
return;
Common/CordonelAssemblyLine/Model/MarriageViewModel.cs
+1
View File
@@ -13,6 +13,7 @@ using System.Threading;
using System.Threading.Tasks;
using Xylem.Common.CommonCore.Configuration;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Consts;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts;
Common/CordonelAssemblyLine/Model/PickingModel.cs
+5 -3
View File
@@ -11,10 +11,12 @@ using System.Threading;
using System.Threading.Tasks;
using Xylem.Common.CommonCore.Configuration;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Consts;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisStatus;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts;
using Xylem.Common.Logic.SoftwareAccessHelper;
using static Ui.ProductionControls.ctlPictureProgressBar;
@@ -564,7 +566,7 @@ namespace CordonelAssemblyLine.Model
if (meter.Login())
{
meter.SetProcessState(Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts.DisplayCodes.PickingStarted);
meter.SetProcessState(DisplayCodes.PickingStarted);
var ret = RunCheck(checkAppsIdVersion, frequency, meterSize, pressurePresent, meter);
lblS08Color = _progressWaiting;
if (ret)
@@ -710,7 +712,7 @@ namespace CordonelAssemblyLine.Model
{
meter.ReLogin();
}
meter.SetProcessState(Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts.DisplayCodes.PickingTested);
meter.SetProcessState(DisplayCodes.PickingTested);
var url = $"{ServiceUrls.MeterProcessStateUrl()}SetPickingState?PcbID={meter.PcbId}&FertigungsauftragsNr={_order}";
var retString = LocalWebRequest.PostRequestAsyncAndGetContent(url);
@@ -722,7 +724,7 @@ namespace CordonelAssemblyLine.Model
}
else
{
meter.SetProcessState(Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts.DisplayCodes.PickingFailed);
meter.SetProcessState(DisplayCodes.PickingFailed);
}
}
}
Common/CordonelPreadjustmentUi/PreAdjustmentControl.cs
+3 -1
View File
@@ -11,7 +11,9 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Consts;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts;
using Xylem.Common.Logic.ProductionOrderCore.OrderData;
using Xylem.Common.Ui.CordonelPreadjustmentUi.Parameters;
@@ -1864,7 +1866,7 @@ namespace CordonelPreadjustmentUi
{
if (!pp.IsAutomaticMode)
{
checkMeterForFailed.Meter.SetProcessState(Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts.DisplayCodes.ZeroFlowFailed);
checkMeterForFailed.Meter.SetProcessState(DisplayCodes.ZeroFlowFailed);
}
}
Common/CordonelPreadjustmentUi/Processes/Actions/CompletionProcess.cs
+3 -1
View File
@@ -6,7 +6,9 @@ using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using Xylem.Common.CommonCore.Configuration;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Consts;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts;
using Xylem.Common.Logic.SoftwareAccessHelper;
using static CordonelPreadjustmentUi.PreAdjustmentControl;
@@ -151,7 +153,7 @@ namespace CordonelPreadjustmentUi.Processes.Actions
{
if (pp.IsAutomaticMode)
{
meterctl.Meter.SetProcessState(Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts.DisplayCodes.ZeroFlowFailed);
meterctl.Meter.SetProcessState(DisplayCodes.ZeroFlowFailed);
}
pp.DebugMessage($"{ProcessName} procedure failed", meterctl.Slot, "APP", meterctl.Meter.PcbId);
pp.GenerateReturnNote(PredefinedMessages.CompletionFailed(pp.Setting.Culture), meterctl);
Common/CordonelPreadjustmentUi/Processes/ProcessProgress.cs
-1
View File
@@ -4,7 +4,6 @@ using System.Globalization;
using System.Threading;
using Logic.ProductionToProductMapper.Cordonel;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Consts;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts;
using Xylem.Common.Ui.CordonelPreadjustmentUi;
using System.Collections.Generic;
using Xylem.Common.Logic.ProductionOrderCore.OrderData;
Common/Hardware/WaterMeter/WaterMeterCore/Consts/ErrorState.cs → Common/Hardware/WaterMeter/Genesis/GenesisCore/Consts/ErrorState.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using System;
namespace Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts
namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Consts
{
/// <summary>
/// Common definition for Meter handling in production and on test benches
Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisCore.csproj
+1
View File
@@ -219,6 +219,7 @@
<Compile Include="..\..\..\..\.shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Consts\ErrorState.cs" />
<Compile Include="Consts\LedMode.cs" />
<Compile Include="GenesisMeter.cs" />
<Compile Include="CalibFactor.cs" />
Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs
+1
View File
@@ -28,6 +28,7 @@ using Xylem.Common.Hardware.WaterMeter.Genesis.DataPackages;
using Xylem.Common.Hardware.WaterMeter.Genesis.DataPackages.EventArguments;
using Xylem.Common.Hardware.WaterMeter.Genesis.DataPackages.MeasurementRecords;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Consts;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisPwd;
using Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.RequestProtocol;
using Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.RequestProtocol.Consts;
Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxCore.csproj
+4
View File
@@ -104,6 +104,10 @@
<Project>{63e0ac5e-b7c8-4363-a2fe-be489e648ff0}</Project>
<Name>TransmitProtocol</Name>
</ProjectReference>
<ProjectReference Include="..\..\Genesis\GenesisCore\GenesisCore.csproj">
<Project>{04201E95-90A0-4B73-A72F-379739B2A3AE}</Project>
<Name>GenesisCore</Name>
</ProjectReference>
<ProjectReference Include="..\..\WaterMeterCore\WaterMeterCore.csproj">
<Project>{8203abb8-38e5-472e-a742-33f38b7a74a6}</Project>
<Name>WaterMeterCore</Name>
Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxMeter.cs
+1 -7
View File
@@ -12,6 +12,7 @@ using Xylem.Common.Hardware.Interfaces.Ports.SerialPorts;
using Xylem.Common.Hardware.Interfaces.Protocols.ProtocolCore;
using Xylem.Common.Hardware.Interfaces.Protocols.ProtocolCore.EventArguments;
using Xylem.Common.Hardware.Interfaces.Protocols.TransmitProtocol;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Consts;
using Xylem.Common.Hardware.WaterMeter.MagFlux.DataPackages.DataTypes;
using Xylem.Common.Hardware.WaterMeter.MagFlux.Protocols.StreamingProtocol;
using Xylem.Common.Hardware.WaterMeter.MagFlux.DataPackages.EventArguments;
@@ -230,13 +231,6 @@ namespace Xylem.Common.Hardware.WaterMeter.MagFlux.MagFluxCore
get;
}
/// <inheritdoc />
public ErrorState ErrorStatus
{
private set;
get;
} = ErrorState.None;
/// <inheritdoc />
public Int32 Slot
{
Common/Hardware/WaterMeter/WaterMeterCore/IMeter.cs
-6
View File
@@ -75,17 +75,11 @@ namespace Xylem.Common.Hardware.WaterMeter.WaterMeterCore
/// </summary>
ProcessState ProcessStatus { get; }
/// <summary>
/// read-only to see current Error state <see cref="ErrorState" />
/// </summary>
ErrorState ErrorStatus { get; }
/// <summary>
/// the current slot in test-bench
/// </summary>
Int32 Slot { get; set; }
/// <summary>
/// Setup of intermediate update time for measurement updates and overflow detections,
/// has to be calculated depending on flow-rate and nominal diameter (DN)
Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterCore.csproj
+1 -1
View File
@@ -256,7 +256,6 @@
<Compile Include="BatchActions\BatchCallStopCalibration.cs" />
<Compile Include="BatchActions\BatchCallStopMeasurement.cs" />
<Compile Include="Consts\DisplayCodes.cs" />
<Compile Include="Consts\ErrorState.cs" />
<Compile Include="DataPackages\FlowDeviations.cs" />
<Compile Include="IMeterBatch.cs" />
<Compile Include="MeterBatch.cs" />
@@ -291,6 +290,7 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Common/ProductionUiCordonel/Model/MarriageMultiModeViewModel.cs
+1
View File
@@ -4,6 +4,7 @@ using System.Net;
using System.Threading.Tasks;
using System.Windows;
using Xylem.Common.CommonCore.Configuration;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Consts;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts;
using Xylem.Common.Logic.SoftwareAccessHelper;
Common/ProductionUiCordonel/Model/MultiModeMasterViewModel.cs
+1
View File
@@ -11,6 +11,7 @@ using Logic.ProductionToProductMapper.Cordonel;
using Newtonsoft.Json;
using Xylem.Common.CommonCore.Configuration;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Consts;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts;
Common/ProductionUiCordonel/Model/PickingMultiModeViewModel.cs
+1
View File
@@ -12,6 +12,7 @@ using Newtonsoft.Json;
using ProductionUiCordonel.Data;
using Xylem.Common.CommonCore.Configuration;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Consts;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts;
using Xylem.Common.Logic.ProductionOrderCore.OrderData;
using Xylem.Common.Logic.SoftwareAccessHelper;
Common/ProductionUiCordonel/Model/PickingViewModel.cs
+1
View File
@@ -9,6 +9,7 @@ using Logic.ProductionToProductMapper.Cordonel;
using ProductionUiCordonel.Data;
using Xylem.Common.CommonCore.Configuration;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Consts;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts;
using Xylem.Common.Logic.SoftwareAccessHelper;
Common/ProductionUiCordonel/Model/PressureMultiModeViewModel.cs
+1
View File
@@ -8,6 +8,7 @@ using Newtonsoft.Json;
using ProductionUiCordonel.Data;
using ProductionUiCordonel.Event;
using Xylem.Common.CommonCore.Configuration;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Consts;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts;
using Xylem.Common.Logic.ProductionOrderCore.ProcessState;
using Xylem.Common.Logic.ProductionOrderCore.TestResults;
Common/Service/MeterProcessState/Controllers/ProccesStateController.cs
+1
View File
@@ -8,6 +8,7 @@ using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using System.Web.Http;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Consts;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisStatus;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts;
using Xylem.Common.Logic.ProductionOrderCore.ProcessState;
Common/Ui/LegacyGenesisControl/ctlBatch.cs
+4 -2
View File
@@ -18,9 +18,11 @@ using System.Threading.Tasks;
using System.Windows.Forms;
using Xylem.Common.CommonCore.Configuration;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Consts;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
using Xylem.Common.Hardware.WaterMeter.MagFlux.MagFluxCore;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore;
using Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts;
using Xylem.Common.Logic.SoftwareAccessHelper;
using Xylem.Common.Metrology.Measurements;
using Xylem.Common.Metrology.Measurements.Consts;
@@ -988,7 +990,7 @@ namespace XylemCommonUiLegacyGenCtl
{
//FF-55-00-00
var meter = batch.ListOfMeters.First(f => f.Slot == slot);
var state = Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts.DisplayCodes.FlowTested;
var state = DisplayCodes.FlowTested;
if (meter is MagFluxMeter mag)
@@ -1024,7 +1026,7 @@ namespace XylemCommonUiLegacyGenCtl
if (displayStateString.Substring(0, 2) != "FF")
{
state = Xylem.Common.Hardware.WaterMeter.WaterMeterCore.Consts.DisplayCodes.FlowTestFailed;
state = DisplayCodes.FlowTestFailed;
}
else