Ver código fonte

兼容 两种 endpoint, 未完成

sangwq 1 ano atrás
pai
commit
aaf8372896

+ 4 - 4
Venus/Venus_RT/Devices/EPD/EPDClient.cs

@@ -97,25 +97,25 @@ namespace Venus_RT.Devices.EPD
             _socketClient.Disconnect();
         }
 
-        public void RecipeStart()
+        public override void RecipeStart(string recipe)
         {
             _socketClient.RecipeStart(_channel, "");
             Status = EDPStatus.Running;
         }
 
-        public void RecipeStop()
+        public override void RecipeStop()
         {
             _socketClient.RecipeStop(_channel);
             Status = EDPStatus.Idle;
         }
 
-        public void StepStart(string cfgName)
+        public override void StepStart(string cfgName, int Index)
         {
             _socketClient.Start((byte)_channel, cfgName);
             Status = EDPStatus.Running;
         }
 
-        public void StepStop()
+        public override void StepStop()
         {
             _socketClient.Stop((byte)_channel);
         }

+ 4 - 4
Venus/Venus_RT/Devices/EPDs/EPDDevice.cs

@@ -91,7 +91,7 @@ namespace Aitex.RT.Device.Custom
             return true;
         }
 
-        public void RecipeStart(string recipeName)
+        public override void RecipeStart(string recipeName)
         {
             if (!IsConnected)
             {
@@ -103,7 +103,7 @@ namespace Aitex.RT.Device.Custom
             EPDClient.Instance.Service.RecipeStart(_channel, recipeName);
         }
 
-        public void RecipeStop()
+        public override void RecipeStop()
         {
             if (!IsConnected)
             {
@@ -124,7 +124,7 @@ namespace Aitex.RT.Device.Custom
          * EnablePostponePercent=True;EnableCriterialPercent=True;
          * TriggerMode=System.Windows.Controls.ComboBoxItem: Event;IsFaultIfNoTrigger=True;
          */
-        public void StepStart(string config, int index)
+        public override  void StepStart(string config, int index)
         {
             if (!IsConnected)
             {
@@ -268,7 +268,7 @@ namespace Aitex.RT.Device.Custom
             return AlgorithmType.ALG_NONE;
         }
 
-        public void StepStop()
+        public override void StepStop()
         {
             if (!IsConnected)
             {

+ 5 - 0
Venus/Venus_RT/Devices/JetEPDBase.cs

@@ -14,5 +14,10 @@ namespace Venus_RT.Devices
         public abstract void Terminate();
 
         public abstract void Reset();
+
+        public abstract void RecipeStart(string recipeName);
+        public abstract void RecipeStop();
+        public abstract void StepStart(string config, int index);
+        public abstract void StepStop();
     }
 }

+ 4 - 4
Venus/Venus_RT/Devices/JetKepler2300PM.cs

@@ -925,9 +925,9 @@ namespace Venus_RT.Devices
 
 
         #region EndPoint
-        public override void EPDRecipeStart()
+        public override void EPDRecipeStart(string recipe)
         {
-            _epdClient.RecipeStart();
+            _epdClient.RecipeStart(recipe);
         }
 
         public override void EPDRecipeStop()
@@ -935,9 +935,9 @@ namespace Venus_RT.Devices
             _epdClient.RecipeStop();
         }
 
-        public override void EPDStepStart(string cfgName)
+        public override void EPDStepStart(string cfgName, int step)
         {
-            _epdClient.StepStart(cfgName);
+            _epdClient.StepStart(cfgName, step);
         }
 
         public override void EPDStepStop()

+ 2 - 2
Venus/Venus_RT/Devices/JetPMBase.cs

@@ -374,11 +374,11 @@ namespace Venus_RT.Devices
 
 
         #region EndPoint
-        public  abstract void EPDRecipeStart();
+        public  abstract void EPDRecipeStart(string recipe);
 
         public abstract void EPDRecipeStop();
 
-        public abstract void EPDStepStart(string cfgName);
+        public abstract void EPDStepStart(string cfgName, int step);
 
         public abstract void EPDStepStop();
 

+ 4 - 4
Venus/Venus_RT/Devices/JetVenusPM.cs

@@ -911,9 +911,9 @@ namespace Venus_RT.Devices
 
 
         #region EndPoint
-        public override void EPDRecipeStart()
+        public override void EPDRecipeStart(string recipe)
         {
-            _epdClient.RecipeStart();
+            _epdClient.RecipeStart(recipe);
         }
 
         public override void EPDRecipeStop()
@@ -921,9 +921,9 @@ namespace Venus_RT.Devices
             _epdClient.RecipeStop();
         }
 
-        public override void EPDStepStart(string cfgName)
+        public override void EPDStepStart(string cfgName, int step)
         {
-            _epdClient.StepStart(cfgName);
+            _epdClient.StepStart(cfgName, step);
         }
 
         public override void EPDStepStop()

+ 1 - 1
Venus/Venus_RT/Modules/PMs/ProcessDefine.cs

@@ -331,7 +331,7 @@ namespace Venus_RT.Modules.PMs
             switch (step.Type)
             {
                 case StepType.EndPoint:
-                    Chamber.EPDStepStart(step.EPDConfigName);
+                    Chamber.EPDStepStart(step.EPDConfigName, step.StepNo);
                     break;
             }
             return RState.Running;