Browse Source

拉取代码软件报警,去除默认Aligner1

lixiang 11 months ago
parent
commit
9faf7dc26a

+ 1 - 1
Venus/Venus_MainPages/Unity/ModuleManager.cs

@@ -22,7 +22,7 @@ namespace Venus_MainPages.Unity
         /// </summary>
         public static readonly List<string> ModulesID = new List<string>()
         {
-             "LLA","LLB","TMRobot","LP1","LP2","LP3","EfemRobot","Aligner1"
+             "LLA","LLB","TMRobot","LP1","LP2","LP3","EfemRobot"
         };
 
         public static Dictionary<string, ModuleInfo> ModuleInfos { get; private set; } = new Dictionary<string, ModuleInfo>();

+ 1 - 1
Venus/Venus_RT/App.config

@@ -28,7 +28,7 @@
 	<connectionStrings>
 		<add name="PostgreSQL"   connectionString="Server=localhost;Port=5432;User Id=postgres;Password=123456;Database=postgres;Enlist=true;Preload Reader=true;" />
 		<!--0是other,1是kepler2300,2是Kepler2200,3是VenusSE,4是VenusDE-->
-		<add name="ConfigType"   connectionString="3"/>
+		<add name="ConfigType"   connectionString="2"/>
 	</connectionStrings>
 	<system.serviceModel>
 		<!--<diagnostics>

+ 2 - 1
Venus/Venus_RT/Devices/IODevices/IoHeartbeat.cs

@@ -51,7 +51,8 @@ namespace Venus_RT.Devices.IODevices
         {
             if (Math.Abs(_prevAiValue - _GetRealFloat(_ai)) > 0.01)
             {
-                _connectTimer.Start(PLC_Heart_Beat_Timeout_ms);
+                //_connectTimer.Start(PLC_Heart_Beat_Timeout_ms);
+                Reset();
             }
 
             _trigConnectionLost.CLK = _connectTimer.IsTimeout();

+ 4 - 4
Venus/Venus_RT/Modules/TM/MFPickRoutine.cs

@@ -128,10 +128,10 @@ namespace Venus_RT.Modules.TM
             Runner.Wait(PickStep.WaitModuleReady,     () => _llModule.IsIdle,     _delay_60s)
                 .Run(PickStep.ModulePrepare,          ModulePrepare,              IsModulePrepareReady)
                 .Wait(PickStep.WaitPressreStable,     TMLLPressureIsOK,           _delay_60s)
-                .Run(PickStep.OpenSlitDoor,           OpenSlitDoor,               IsSlitDoorOpen)
-                .Run(PickStep.Picking,                Picking,                    WaitPickDone)
-                .Run(PickStep.QueryAwc,               QueryAwc,                   WaitQueryDoneAndRecord)
-                .Run(PickStep.CloseSlitDoor,          CloseSlitDoor,              IsSlitDoorClosed)
+                .Run(PickStep.OpenSlitDoor,           OpenSlitDoor,               IsSlitDoorOpen, _delay_30s)
+                .Run(PickStep.Picking,                Picking,                    WaitPickDone, _delay_30s)
+                .Run(PickStep.QueryAwc,               QueryAwc,                   WaitQueryDoneAndRecord, _delay_30s)
+                .Run(PickStep.CloseSlitDoor,          CloseSlitDoor,              IsSlitDoorClosed, _delay_30s)
                 //.Run(PickStep.CheckAwc,               CheckAwc                                    )
 
                 .End(PickStep.NotifyDone,             NotifyLLDone,               _delay_50ms);         

+ 8 - 8
Venus/Venus_RT/Modules/TM/MFPlaceRoutine.cs

@@ -115,15 +115,15 @@ namespace Venus_RT.Modules.TM
 
         public RState Monitor()
         {
-            Runner.Wait(PlaceStep.WaitModuleReady,     () => _llModule.IsIdle,      _delay_60s)
-                .RunIf(PlaceStep.PreRotation,          _JetTM.PreRotateModules.ContainsKey(_targetModule),      RotateArm,      WaitRotateDone)
+          Runner.Wait(PlaceStep.WaitModuleReady,      () => _llModule.IsIdle,      _delay_60s)
+                .RunIf(PlaceStep.PreRotation,          _JetTM.PreRotateModules.ContainsKey(_targetModule),      RotateArm,      WaitRotateDone, _delay_30s)
                 .Run(PlaceStep.ModulePrepare,          ModulePrepare,               IsModulePrepareReady)
-                .Wait(PlaceStep.WaitPressreDifference, TMLLPressureIsOK, _delay_60s)
-                .Run(PlaceStep.OpenSlitDoor,           OpenSlitDoor,                IsSlitDoorOpen)
-                .Run(PlaceStep.Placing,                Placing,                     WaitPlaceDone)
-                .Run(PlaceStep.QueryAwc,               QueryAwc,                    WaitQueryDoneAndRecord)
-                .Run(PlaceStep.CloseSlitDoor,          CloseSlitDoor,               IsSlitDoorClosed)
-                .End(PlaceStep.NotifyDone,             NotifyLLDone,                _delay_50ms);          
+                .Wait(PlaceStep.WaitPressreDifference, TMLLPressureIsOK,                                   _delay_60s)
+                .Run(PlaceStep.OpenSlitDoor,           OpenSlitDoor,                IsSlitDoorOpen, _delay_30s)
+                .Run(PlaceStep.Placing,                Placing,                     WaitPlaceDone, _delay_30s)
+                .Run(PlaceStep.QueryAwc,               QueryAwc,                    WaitQueryDoneAndRecord, _delay_30s)
+                .Run(PlaceStep.CloseSlitDoor,          CloseSlitDoor,               IsSlitDoorClosed, _delay_30s)
+                .End(PlaceStep.NotifyDone,             NotifyLLDone,                                         _delay_50ms);          
             return Runner.Status;
         }