delay beim versandfertigamchen

2022-12-09 16:58:08 +01:00
parent ef0d333d66
commit 2654f70bf2
7 changed files with 49 additions and 16 deletions
@@ -155,7 +155,7 @@
 			</site>
            <site name="MeterProcessState" id="2">
                <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="D:\Projekte\SENSUS_GitLab\laa_production\Common\Service\MeterProcessState" />
+                    <virtualDirectory path="/" physicalPath="C:\Users\drabesch_ro\Repo\lab\la_operations\laa_production\Common\Service\MeterProcessState" />
                </application>
                <bindings>
                    <binding protocol="http" bindingInformation="*:56011:localhost" />
@@ -789,6 +789,7 @@ namespace CordonelAssemblyLine.Model
                    SetState("Pcb mit Drucksensor. Laut Auftrag keiner verbaut");
                    lblS05Text = "Drucksensor vorhanden!";
                    meter.WriteLog(State);
+               
                }
                else
                {
@@ -797,6 +798,7 @@ namespace CordonelAssemblyLine.Model
                    meter.WriteLog(State);
                }
                lblS05Color = _progressError;
+                return false;
            }

            if (_skipProcessSteps == null || !_skipProcessSteps.SkipFWCheck)
@@ -276,7 +276,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile
            {
                MeterResetPsuStateMachine();
            }
-
+            Thread.Sleep(20000);
            return ExitPreparation(true);
        }

@@ -451,8 +451,8 @@ namespace ProductionUiCordonel
            //pc.Processes.Add(new ProductionProcessFinalParameterizationFix()); //[x] [x] []
            pc.Processes.Add(new ProductionProcessFinalParameterizationVakoCsd(connectProcess, RadioAdress != 0)); //[x] [x] []

-            if (RadioAdress != 0)
-            {
+            //if (RadioAdress != 0)
+            //{

                var radioCheck = new ProductionProcessRadioCheck();

@@ -461,7 +461,7 @@ namespace ProductionUiCordonel
                    radioCheck.Ordernumber = ((ProductionProcessCheckOrderNumber)sender).Ordernumber;
                };
                pc.Processes.Add(radioCheck);            //[] [] []
-            }
+            //}

            //pc.Processes.Add(new ProductionProcessSpecialConfig());         //[x] [x] []
            pc.Processes.Add(new ProductionProcessShippingMode(true, RadioAdress != 0));          //[] [] []
@@ -738,6 +738,7 @@ namespace ProductionUiCordonel

                CurrentGenesisMeter.SerialNumber = SerialNumber;
                CurrentProcess = "gestartet";
+                SetUpBlank(false);
                pc.Start(CurrentGenesisMeter);
            }
        }
@@ -317,7 +317,10 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
            Thread.Sleep(5000);
            //Meter.WriteRegister("SENSUSRADIO_SYSTEMSTATE", 0x01, true, false);
            forcePush();
-
+            if (false)
+            {
+                GotRSSICallback(1, 1);
+            }

        }

@@ -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)
                        {
@@ -111,8 +123,23 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
                            }

                            if (rebootSucceeded && hasDiffrences.HasValue && !hasDiffrences.Value)
+                            {
+                                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
                            {
@@ -1 +1 @@
-f64d563def603c89cafafa61a3219ba97e1e344c
+0d85a5b3a7561b41163c20e5dc7713bcd0d65555