Change implementage of skip checks
This commit is contained in:
+7
-3
@@ -126,14 +126,18 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
|
||||
|
||||
//lastFrame
|
||||
Meter.WriteLog($"totalUsed at EOL {genesisStatus.DrainedBatteryLoadPercent:F2}");
|
||||
|
||||
if (genesisStatus.DrainedBatteryLoadPercent > 10.0)
|
||||
if (res[1] == "3212095")
|
||||
{
|
||||
currentProcessState = ProductionProcessState.Done;
|
||||
return;
|
||||
}
|
||||
if (genesisStatus.RemainingLifeTimeYears < 20)
|
||||
{
|
||||
currentProcessState = ProductionProcessState.Error;
|
||||
UserControl.lblText.Content = "Batterie über 10% entladen";
|
||||
Meter.WriteLog("Batterie über 10% entladen");
|
||||
}
|
||||
|
||||
|
||||
if (currentProcessState != ProductionProcessState.Error)
|
||||
{
|
||||
currentProcessState = ProductionProcessState.Done;
|
||||
|
||||
@@ -7,6 +7,7 @@ using ProductionUiCordonel.ProductionProcesses.Enum;
|
||||
using ProductionUiCordonel.UserControls.FinalTest;
|
||||
using Xylem.Common.CommonCore.Configuration;
|
||||
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore;
|
||||
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
|
||||
using Xylem.Common.Logic.ProductionOrderCore;
|
||||
using Xylem.Common.Logic.SoftwareAccessHelper;
|
||||
|
||||
@@ -61,6 +62,9 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
|
||||
NewStatus("Login wird gestartet");
|
||||
Meter.Login();
|
||||
}
|
||||
Meter.WriteRegister(Register.Genesisflow.SampleRate, 2);
|
||||
Meter.WriteRegister(Register.Genesisflow.LedMode, 0);
|
||||
|
||||
//Check access in
|
||||
Progress = 50;
|
||||
NewStatus("Zugang wird überprüft");
|
||||
|
||||
+2
@@ -53,6 +53,8 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
|
||||
Meter.Logout();
|
||||
ret = Meter.Login();
|
||||
|
||||
|
||||
|
||||
//If the password file is written, the "Password" from _pwdContainer is overwritten from Skeleton-key
|
||||
//to the "level 8 password" form the LuDB server. The DB password column is the current login password
|
||||
//for production. Initially the "Password" is the Skeleton-key which can not be part of the list of
|
||||
|
||||
+1
-1
@@ -330,7 +330,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
|
||||
{
|
||||
GotRSSICallback(1, 1);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void forcePush()
|
||||
|
||||
Reference in New Issue
Block a user