Selaa lähdekoodia

ui Module TM 名变TMRobot
传片获取配置文件 TMRobot写死改为TM

lixiang 1 vuosi sitten
vanhempi
commit
072e5d0d01

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

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

+ 4 - 4
Venus/Venus_MainPages/ViewModels/OperationOverViewModel.cs

@@ -221,8 +221,8 @@ namespace Venus_MainPages.ViewModels
             }
 
 
-            BladeAWafer = ModuleManager.ModuleInfos["TM"].WaferManager.Wafers[0];
-            BladeBWafer = ModuleManager.ModuleInfos["TM"].WaferManager.Wafers[1];
+            BladeAWafer = ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers[0];
+            BladeBWafer = ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers[1];
 
             RobotMoveInfo = (RobotMoveInfo)QueryDataClient.Instance.Service.GetData("TM.RobotMoveAction");
 
@@ -324,8 +324,8 @@ namespace Venus_MainPages.ViewModels
 
             }
             #endregion
-            arm1oldWaferStatus = ModuleManager.ModuleInfos["TM"].WaferManager.Wafers[0].WaferStatus;
-            arm2oldWaferStatus = ModuleManager.ModuleInfos["TM"].WaferManager.Wafers[1].WaferStatus;
+            arm1oldWaferStatus = ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers[0].WaferStatus;
+            arm2oldWaferStatus = ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers[1].WaferStatus;
 
         }
 

+ 7 - 7
Venus/Venus_MainPages/ViewModels/TMViewModel.cs

@@ -289,13 +289,13 @@ namespace Venus_MainPages.ViewModels
 
             }
             #endregion
-            arm1oldWaferStatus = ModuleManager.ModuleInfos["TM"].WaferManager.Wafers[0].WaferStatus;
-            arm2oldWaferStatus = ModuleManager.ModuleInfos["TM"].WaferManager.Wafers[1].WaferStatus;
+            arm1oldWaferStatus = ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers[0].WaferStatus;
+            arm2oldWaferStatus = ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers[1].WaferStatus;
         }
         private async void RobotActiont(string oldValue,string newValue)
         {
             
-            if (oldValue == "None" && newValue == "Placing" && ModuleManager.ModuleInfos["TM"].WaferManager.Wafers[0].WaferStatus==1)
+            if (oldValue == "None" && newValue == "Placing" && ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers[0].WaferStatus==1)
             {
                 var TMRobotMoveActionBladeTarget = QueryDataClient.Instance.Service.GetData("TM.RobotMoveAction.BladeTarget");
                 if (TMRobotMoveActionBladeTarget != null)
@@ -325,7 +325,7 @@ namespace Venus_MainPages.ViewModels
                     Robot2XAction = WaferRobotXAction.Extend;
                 }
             }
-            if (oldValue == "None" && newValue == "Placing" && ModuleManager.ModuleInfos["TM"].WaferManager.Wafers[1].WaferStatus == 1)
+            if (oldValue == "None" && newValue == "Placing" && ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers[1].WaferStatus == 1)
             {
                 var TMRobotMoveActionBladeTarget = QueryDataClient.Instance.Service.GetData("TM.RobotMoveAction.BladeTarget");
                 if (TMRobotMoveActionBladeTarget != null)
@@ -871,8 +871,8 @@ namespace Venus_MainPages.ViewModels
             }
 
 
-            BladeAWafer = ModuleManager.ModuleInfos["TM"].WaferManager.Wafers[0];
-            BladeBWafer = ModuleManager.ModuleInfos["TM"].WaferManager.Wafers[1];
+            BladeAWafer = ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers[0];
+            BladeBWafer = ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers[1];
 
             RtDataValues = QueryDataClient.Instance.Service.PollData(m_RtDataKeys);
 
@@ -880,7 +880,7 @@ namespace Venus_MainPages.ViewModels
             var TMRobotMoveActionArmTarget = QueryDataClient.Instance.Service.GetData("TM.RobotMoveAction.ArmTarget");
             if (TMRobotMoveActionArmTarget != null)
             {
-                RobotArm = ModuleManager.ModuleInfos["TM"].WaferManager.Wafers[0].WaferStatus.ToString();
+                RobotArm = ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers[0].WaferStatus.ToString();
             }
 
 

+ 0 - 1
Venus/Venus_RT/Config/System.sccfg

@@ -154,7 +154,6 @@
 			<config default="10" name="MfcWarningTime" nameView="MFC Warning Time" description="" max="60" min="0" paramter="" tag="" unit="second" type="Integer" />
 		</configs>
 	</configs>
-
 	<!--LLA-->
 	<configs name="LLA" nameView="LLA">
 		<config default="100" name="PumpBasePressure" nameView="Pump Base Pressure" description="" max="2000" min="0" paramter="" tag="" unit="mTorr" type="Double" />

+ 1 - 1
Venus/Venus_RT/Modules/TM/MFPMExtendRoutine.cs

@@ -85,7 +85,7 @@ namespace Venus_RT.Modules.TM
             }
 
             Reset();
-            _extendingTimeout = SC.GetValue<int>($"{Module}.ExtendTimeout") * 1000;
+            _extendingTimeout = SC.GetValue<int>("TM.ExtendTimeout") * 1000;
 
             return Runner.Start(Module, $"Extend to {_targetModule}");
         }

+ 1 - 1
Venus/Venus_RT/Modules/TM/MFPMPickRoutine.cs

@@ -82,7 +82,7 @@ namespace Venus_RT.Modules.TM
             LOG.Write(eEvent.INFO_TM_ROBOT, ModuleName.TMRobot, $"{wafer.WaferOrigin} will be move from {_targetModule} {_targetSlot + 1} to TM Robot {_hand}");
 
             Reset();
-            _pickingTimeout = SC.GetValue<int>($"{Module}.PickTimeout") * 1000;
+            _pickingTimeout = SC.GetValue<int>("TM.PickTimeout") * 1000;
             _pickDelayTime = SC.GetValue<int>($"{_targetModule}.PickDelayTime");
 
             return Runner.Start(Module, $"Pick from {_targetModule}");

+ 1 - 1
Venus/Venus_RT/Modules/TM/MFPMPlaceRoutine.cs

@@ -82,7 +82,7 @@ namespace Venus_RT.Modules.TM
             LOG.Write(eEvent.INFO_TM_ROBOT, ModuleName.TMRobot, $"{wafer.WaferOrigin} will be move from TM Robot {_hand}  to {_targetModule} {_targetSlot + 1}");
 
             Reset();
-            _placingTimeout = SC.GetValue<int>($"{Module}.PlaceTimeout") * 1000;
+            _placingTimeout = SC.GetValue<int>("TM.PlaceTimeout") * 1000;
             _placeDelayTime = SC.GetValue<int>($"{_targetModule}.PlaceDelayTime");
 
             return Runner.Start(Module, $"Place to {_targetModule}");

+ 1 - 1
Venus/Venus_RT/Modules/TM/MFPMSwapRoutine.cs

@@ -93,7 +93,7 @@ namespace Venus_RT.Modules.TM
             }
 
             Reset();
-            _swapingTimeout = SC.GetValue<int>($"{Module}.SwapTimeout") * 1000;
+            _swapingTimeout = SC.GetValue<int>($"TM.SwapTimeout") * 1000;
             _pickDelayTime = SC.GetValue<int>($"{_targetModule}.PickDelayTime");
             _placeDelayTime = SC.GetValue<int>($"{_targetModule}.PlaceDelayTime");
 

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

@@ -77,7 +77,7 @@ namespace Venus_RT.Modules.TM
             }
 
             Reset();
-            _pickingTimeout = SC.GetValue<int>($"{Module}.PickTimeout") * 1000;
+            _pickingTimeout = SC.GetValue<int>("TM.PickTimeout") * 1000;
 
             return Runner.Start(Module, $"Pick from {_targetModule}");
         }

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

@@ -77,7 +77,7 @@ namespace Venus_RT.Modules.TM
             }
 
             Reset();
-            _placingTimeout = SC.GetValue<int>($"{Module}.PlaceTimeout") * 1000;
+            _placingTimeout = SC.GetValue<int>($"TM.PlaceTimeout") * 1000;
 
             return Runner.Start(Module, $"Place to {_targetModule}");
         }

+ 1 - 1
Venus/Venus_RT/Modules/TM/MFSwapRoutine.cs

@@ -74,7 +74,7 @@ namespace Venus_RT.Modules.TM
             }
 
             Reset();
-            _swapTimeout = SC.GetValue<int>($"{Module}.SwapTimeout") * 1000;
+            _swapTimeout = SC.GetValue<int>($"TM.SwapTimeout") * 1000;
 
             return Runner.Start(Module, $"Swap with {_targetModule}");
         }