Преглед изворни кода

update EFEM Place Routine with flip;
RobotCycleParameter Add PlaceRobotFlip;

chenkui пре 2 дана
родитељ
комит
47ff767d1a

+ 3 - 1
Framework/Common/CommonData/RobotCycleParameter.cs

@@ -16,6 +16,8 @@ namespace MECF.Framework.Common.CommonData
 
         public Hand RobotArm { get; set; }
 
-        public Flip RobotFlip { get; set; }
+        public Flip PickRobotFlip { get; set; }
+
+        public Flip PlaceRobotFlip { get; set; }
     }
 }

+ 1 - 1
PunkHPX8_MainPages/ViewModels/RobotCycleViewModel.cs

@@ -295,7 +295,7 @@ namespace PunkHPX8_MainPages.ViewModels
                 RobotCycleParameter robotCycleParameter = new RobotCycleParameter();
                 robotCycleParameter.ModuleName = parameter.ModuleName;
                 robotCycleParameter.RobotArm = parameter.RobotHand;
-                robotCycleParameter.RobotFlip = parameter.RobotFlip;
+                robotCycleParameter.PickRobotFlip = parameter.RobotFlip;
                 robotCycleParameter.Parameter = parameter.Parameter;
                 parameters.Add(robotCycleParameter);
             }

+ 1 - 1
PunkHPX8_RT/Modules/EFEM/CycleRobotCycleNewRoutine.cs

@@ -130,7 +130,7 @@ namespace PunkHPX8_RT.Modules.EFEM
             placeMoveItem.DestinationModule = destModule;
             placeMoveItem.DestinationSlot = destSlot;
             placeMoveItem.RobotHand = sourceParameter.RobotArm;
-            placeMoveItem.RobotFlip = sourceParameter.RobotFlip;
+            placeMoveItem.RobotFlip = sourceParameter.PickRobotFlip;
             place.Parameter = placeMoveItem;
             place.Action = "Place";
             actions.Add(place);

+ 8 - 6
PunkHPX8_RT/Modules/EFEM/EfemPlaceRoutine.cs

@@ -42,6 +42,7 @@ namespace PunkHPX8_RT.Modules.EFEM
         int _targetSlot2;
         Hand _hand;
         Hand _hand2;
+        Flip _flip;
         EfemBase _efem;
         bool _bDoublePlace = false;
         private SRDEntity _srdModule;
@@ -57,10 +58,11 @@ namespace PunkHPX8_RT.Modules.EFEM
         {
             _bDoublePlace = false;
             _moveItems = (Queue<MoveItem>)objs[0];
-            _targetModule = _moveItems.Peek().DestinationModule;
-            _targetSlot = _moveItems.Peek().DestinationSlot;
-            _hand = _moveItems.Peek().RobotHand;
-
+            MoveItem moveItem = _moveItems.Peek();
+            _targetModule = moveItem.DestinationModule;
+            _targetSlot = moveItem.DestinationSlot;
+            _hand = moveItem.RobotHand;
+            _flip = moveItem.RobotFlip;
             if (!CheckPreCondition())
             {
                 return RState.Failed;
@@ -211,7 +213,7 @@ namespace PunkHPX8_RT.Modules.EFEM
 
         private bool Place1()
         {
-            return _efem.Place(_targetModule, _targetSlot, _hand, Flip.NoFlip);
+            return _efem.Place(_targetModule, _targetSlot, _hand, _flip);
         }
 
         private bool Place1Done()
@@ -246,7 +248,7 @@ namespace PunkHPX8_RT.Modules.EFEM
 
         private bool Place2()
         {
-            return _efem.Place(_targetModule, _targetSlot2, _hand2, Flip.NoFlip);
+            return _efem.Place(_targetModule, _targetSlot2, _hand2, _flip);
         }
 
         private bool Place2Done()