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

Fix magflux zeroflow bug

Browse Source
This commit is contained in:
Roland Drabesch
2023-06-01 10:23:09 +02:00
parent 9f4445b715
commit b2b6bd4a59
3 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/CordonelPreadjustmentUi/PreAdjustmentControl.cs
+1 -4
View File
@@ -1676,10 +1676,7 @@ namespace CordonelPreadjustmentUi
List<IProcess> listOfProgrammParts = new List<IProcess>(); List<IProcess> listOfProgrammParts = new List<IProcess>();
if ()
{
}
listOfProgrammParts.Add(new PrepareTestProcess("PrepareTest", StatusPanelItems.Detect, string.Empty, string.Empty, 1 * 60)); listOfProgrammParts.Add(new PrepareTestProcess("PrepareTest", StatusPanelItems.Detect, string.Empty, string.Empty, 1 * 60));
Common/CordonelPreadjustmentUi/Processes/Actions/MagFluxZeroFlow.cs
+40 -40
View File
@@ -1,62 +1,62 @@
using CordonelPreadjustmentUi.Processes; //using CordonelPreadjustmentUi.Processes;
using CordonelPreadjustmentUi.Processes.Itinerary; //using CordonelPreadjustmentUi.Processes.Itinerary;
using System; //using System;
using System.Collections.Generic; //using System.Collections.Generic;
using System.Linq; //using System.Linq;
using System.Threading.Tasks; //using System.Threading.Tasks;
using static CordonelPreadjustmentUi.PreAdjustmentControl; //using static CordonelPreadjustmentUi.PreAdjustmentControl;
namespace Xylem.Common.Ui.CordonelPreadjustmentUi.Processes.Actions //namespace Xylem.Common.Ui.CordonelPreadjustmentUi.Processes.Actions
{ //{
public class MagFluxZeroFlowProcess : BaseProcess // public class MagFluxZeroFlowProcess : BaseProcess
{ // {
public MagFluxZeroFlowProcess(string processName, StatusPanelItems panelState, string performMessage, string failedMessage, int? expectedTimeS) : base(processName, panelState, performMessage, failedMessage, expectedTimeS) // public MagFluxZeroFlowProcess(string processName, StatusPanelItems panelState, string performMessage, string failedMessage, int? expectedTimeS) : base(processName, panelState, performMessage, failedMessage, expectedTimeS)
{ // {
} // }
public override List<Task> StartWork() // public override List<Task> StartWork()
{ // {
return doWorkProcess(base.CurrentProcessProgress); // return doWorkProcess(base.CurrentProcessProgress);
} // }
private List<Task> doWorkProcess(ProcessProgress currentProcessProgress) // private List<Task> doWorkProcess(ProcessProgress currentProcessProgress)
{ // {
private List<Task> doWorkProcess(ProcessProgress pp) // private List<Task> doWorkProcess(ProcessProgress pp)
{ // {
var MetersToProcess = MeterStateCtls.Where(e => e.IsEnabled).ToList(); // var MetersToProcess = MeterStateCtls.Where(e => e.IsEnabled).ToList();
var listOfProcessTask = new List<Task>(); // var listOfProcessTask = new List<Task>();
listOfProcessTask.Add(new Task<bool>(() => // listOfProcessTask.Add(new Task<bool>(() =>
{ // {
pp.DebugMessage($"Performing {ProcessName} procedure", null, "APP"); // pp.DebugMessage($"Performing {ProcessName} procedure", null, "APP");
var ZeroOffsetTime = DateTimeOffset.UtcNow.AddMinutes(2); // var ZeroOffsetTime = DateTimeOffset.UtcNow.AddMinutes(2);
var MetersToProcess = MeterStateCtls.Where(e => e.IsEnabled).ToList(); // var MetersToProcess = MeterStateCtls.Where(e => e.IsEnabled).ToList();
while (FlushTime > DateTimeOffset.UtcNow) // while (ZeroOffsetTime > DateTimeOffset.UtcNow)
{ // {
Thread.Sleep(1000); // Thread.Sleep(1000);
} // }
return true; // return true;
})); // }));
return listOfProcessTask; // return listOfProcessTask;
} // }
} // }
} // }
} //}
Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionCheckShippingState.cs
+1 -1
View File
@@ -135,7 +135,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
if (genesisStatus.RemainingLifeTimeYears < 20) if (genesisStatus.RemainingLifeTimeYears < 20)
{ {
if (genesisStatus.DrainedBatteryLoadPercent > 1.5) if (genesisStatus.DrainedBatteryLoadPercent > 8)
{ {
currentProcessState = ProductionProcessState.Error; currentProcessState = ProductionProcessState.Error;
UserControl.lblText.Content = "Batterie über 10% entladen"; UserControl.lblText.Content = "Batterie über 10% entladen";