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

delay beim versandfertigamchen

Browse Source
This commit is contained in:
Roland Drabesch
2022-12-09 16:58:08 +01:00
parent ef0d333d66
commit 2654f70bf2
7 changed files with 49 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessRadioCheck.cs
+4 -1
View File
@@ -317,7 +317,10 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
Thread.Sleep(5000);
//Meter.WriteRegister("SENSUSRADIO_SYSTEMSTATE", 0x01, true, false);
forcePush();
if (false)
{
GotRSSICallback(1, 1);
}
}
Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessShippingMode.cs
+36 -9
View File
@@ -66,15 +66,27 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
writeList.Add(Meter.WriteRegister("SENSUSRADIO_SystemState", 0xFF, true, false));
//Thread.Sleep(5000);
Meter.Logout();
Thread.Sleep(15000);
if (!Meter.Logout())
{
Thread.Sleep(15000);
if (!Meter.Logout())
{
Meter.WriteLog("logout failed");
}
}
Thread.Sleep(5000);
Meter.Login();
var radioResetSuccess = Meter.ReadRegister("SENSUSRADIO_SystemState");
var SENSUSRADIO_MainAlarmMask = Meter.ReadRegister("SENSUSRADIO_MainAlarmMask");
var SENSUSRADIO_ExtendedAlarmMask = Meter.ReadRegister("SENSUSRADIO_ExtendedAlarmMask");
if (radioResetSuccess[0] == 0x02 && writeList.All(a => a == true) && SENSUSRADIO_MainAlarmMask[0] != 0)
if (!Meter.Login())
{
Thread.Sleep(15000);
if (!Meter.Login())
{
Meter.WriteLog("Login failed");
}
}
if ( writeList.All(a => a == true) )
{
if (doRestart)
{
@@ -112,7 +124,22 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
if (rebootSucceeded && hasDiffrences.HasValue && !hasDiffrences.Value)
{
base.currentProcessState = ProductionProcessState.Done;
Meter.WriteRegister("SENSUSRADIO_SystemState", 0xFF, true, false);
Thread.Sleep(5000);
var SENSUSRADIO_MainAlarmMask = Meter.ReadRegister("SENSUSRADIO_MainAlarmMask");
var SENSUSRADIO_ExtendedAlarmMask = Meter.ReadRegister("SENSUSRADIO_ExtendedAlarmMask");
var SENSUSRADIO_SystemState = Meter.ReadRegister("SENSUSRADIO_SystemState");
if (SENSUSRADIO_SystemState[0] == 0x02 && SENSUSRADIO_MainAlarmMask[0] != 0)
{
base.currentProcessState = ProductionProcessState.Done;
}else
{
Meter.WriteLog("resetRadio Failed");
base.currentProcessState = ProductionProcessState.Error;
}
}
else
{