Bladeren bron

1. 调整Revtec match部分 与Adtec match代码保持一致
2. 修改HongHuVCE的msg处理部分存在的无效分割问题

zhouhr 2 maanden geleden
bovenliggende
commit
fb79b088ce

+ 2 - 2
JetVirgoPM/Devices/JetDualPM.cs

@@ -1390,7 +1390,7 @@ namespace JetVirgoPM.Devices
         {
             if (_BiasMatch1 != null)
             {
-                _BiasMatch1.SetMatchMode(val ? EnumRfMatchTuneMode.Auto.ToString() : EnumRfMatchTuneMode.Manual.ToString(), out _);
+                _BiasMatch1.SetMatchMode(true ? EnumRfMatchTuneMode.Auto.ToString() : EnumRfMatchTuneMode.Manual.ToString(), out _);
                 return true;
             }
 
@@ -1404,7 +1404,7 @@ namespace JetVirgoPM.Devices
         {
             if (_BiasMatch2 != null)
             {
-                _BiasMatch2.SetMatchMode(val ? EnumRfMatchTuneMode.Auto.ToString(): EnumRfMatchTuneMode.Manual.ToString(), out _);
+                _BiasMatch2.SetMatchMode(true ? EnumRfMatchTuneMode.Auto.ToString(): EnumRfMatchTuneMode.Manual.ToString(), out _);
                 return true;
             }
 

+ 8 - 8
JetVirgoPM/Devices/RevtechMatch.cs

@@ -250,9 +250,9 @@ namespace JetVirgoPM.Devices
         {
             base.SetMatchPositionC1(c1, out reason);
 
-            SetWorkMode(EnumRfMatchTuneMode.Manual);
-            c1SetPoint = c1;
-            SetPointCommandQueue.Add($"{RevtechMatchMessage.SET_C1_POS} {c1}\n");
+            //SetWorkMode(EnumRfMatchTuneMode.Manual);
+            //c1SetPoint = c1;
+            //SetPointCommandQueue.Add($"{RevtechMatchMessage.SET_C1_POS} {c1}\n");
         }
 
 
@@ -280,11 +280,11 @@ namespace JetVirgoPM.Devices
         public override bool SetMatchMode(string mode, out string reason)
         {
             reason = string.Empty;
-            if (!Enum.TryParse<EnumRfMatchTuneMode>(mode,out EnumRfMatchTuneMode enumRfMatchTuneMode))
-            {
-                return false;
-            }
-            SetWorkMode(enumRfMatchTuneMode);
+            //if (!Enum.TryParse<EnumRfMatchTuneMode>(mode,out EnumRfMatchTuneMode enumRfMatchTuneMode))
+            //{
+            //    return false;
+            //}
+            SetWorkMode(EnumRfMatchTuneMode.Auto);
             return true;
         }
 

+ 12 - 12
JetVirgoPM/PMs/RecipeExecutors/Recipe.cs

@@ -167,12 +167,12 @@ namespace JetVirgoPM.PMs.RecipeExecutors
 
                         if (SC.GetValue<bool>($"{chamberId}.IgnoreBiasMatch"))
                         {
-                            if(dic.ContainsKey("BiasRf1.SetMatchProcessMode"))
-                                dic.Remove("BiasRf1.SetMatchProcessMode");
-                            if (dic.ContainsKey("BiasRf1.SetMatchPositionC1"))
-                                dic.Remove("BiasRf1.SetMatchPositionC1");
-                            if (dic.ContainsKey("BiasRf1.SetMatchPositionC2"))
-                                dic.Remove("BiasRf1.SetMatchPositionC2");
+                            if(dic.ContainsKey("BiasRf1Match.SetMatchProcessMode"))
+                                dic.Remove("BiasRf1Match.SetMatchProcessMode");
+                            if (dic.ContainsKey("BiasRf1Match.SetMatchPositionC1"))
+                                dic.Remove("BiasRf1Match.SetMatchPositionC1");
+                            if (dic.ContainsKey("BiasRf1Match.SetMatchPositionC2"))
+                                dic.Remove("BiasRf1Match.SetMatchPositionC2");
                         }
 
                     }
@@ -206,12 +206,12 @@ namespace JetVirgoPM.PMs.RecipeExecutors
 
                         if (SC.GetValue<bool>($"{chamberId}.IgnoreBiasMatch"))
                         {
-                            if (dic.ContainsKey("BiasRf2.SetMatchProcessMode"))
-                                dic.Remove("BiasRf2.SetMatchProcessMode");
-                            if (dic.ContainsKey("BiasRf2.SetMatchPositionC1"))
-                                dic.Remove("BiasRf2.SetMatchPositionC1");
-                            if (dic.ContainsKey("BiasRf1.SetMatchPositionC2"))
-                                dic.Remove("BiasRf2.SetMatchPositionC2");
+                            if (dic.ContainsKey("BiasRf2Match.SetMatchProcessMode"))
+                                dic.Remove("BiasRf2Match.SetMatchProcessMode");
+                            if (dic.ContainsKey("BiasRf2Match.SetMatchPositionC1"))
+                                dic.Remove("BiasRf2Match.SetMatchPositionC1");
+                            if (dic.ContainsKey("BiasRf1Match.SetMatchPositionC2"))
+                                dic.Remove("BiasRf2Match.SetMatchPositionC2");
                         }
 
                     }

+ 1 - 1
JetVirgoPM/PMs/Routines/RfPowerRoutine.cs

@@ -185,9 +185,9 @@ namespace JetVirgoPM.PMs.Routines
                     _chamber.GeneratorBias2Setpower((float)_rf2PowerBias);
                     if (_match2Mode == BiasRfMatchMode.Preset)
                     {
+                        _chamber.GeneratorBias2SetMatchMode(true);
                         Notify($"Bias RF 2 Match C1设定值 {_match2C1}, Bias RF 2 Match C2设定值 {_match2C2}");
                         _chamber.SetBias2MatchPosition((float)_match2C1, (float)_match2C2);
-                        _chamber.GeneratorBias2SetMatchMode(true);
                     }
                     else if (_match2Mode == BiasRfMatchMode.Hold)
                     {

+ 1 - 1
Mars/JetMainframe/Devices/HongHuVCE.cs

@@ -377,7 +377,7 @@ namespace JetMainframe.Devices
                         string _needHandle = _lstAsciiMsgs.First.Value;
                         foreach (string singlemsg in _needHandle.Split('\n'))
                         {
-                            HandleSingleMsg(_needHandle);
+                            HandleSingleMsg(singlemsg);
                         }
                         _lstAsciiMsgs.RemoveFirst();
                     }