增加对固高和ZTM共同存在的支持

Rs.DeweyTester/Commom/GlobalVar.cs

@@ -13,10 +13,21 @@ using System.Windows.Forms;
 
 namespace Rs.Framework
 {
+    public enum ECardMode
+    {
+        GG,
+        GGANDZTM
+    }
     public static class GlobalVar
     {
         #region newpro
 
+        public static ECardMode CardMode
+        {
+            get;
+            set;
+        } = ECardMode.GG;
+
         /// <summary>
         /// REL Category
         /// </summary>

Rs.DeweyTester/Commom/Ops.cs

@@ -53,6 +53,17 @@ namespace Rs.MotionPlat.Commom
                 else
                 {
                     MessageQueue.Instance.Insert("Gugao motion card load success");
+                    errCode = ZtmCardManager.Instance.Init();
+                    if (errCode > ErrorCode.Ok)
+                    {
+                        errNum++;
+                        MessageQueue.Instance.Warn($"ztm motion card load fail {errCode}");
+                        LogHelper.Debug($"ztm motion card load fail {errCode}");
+                    }
+                    else
+                    {
+                        MessageQueue.Instance.Insert("ztm motion card load success");
+                    }
                 }
                 #endregion
 

Rs.DeweyTester/Flow/AxisControl.cs

@@ -1,4 +1,5 @@
 using log4net.Util;
+using Rs.Framework;
 using Rs.Motion.Base;
 using Rs.Motion.GugaoEcat;
 using Rs.Motion.GugaoPulse;
@@ -94,9 +95,16 @@ namespace Rs.MotionPlat.Flow
         public static IAxis StockZ1
         {
             get
+            {
+                if (GlobalVar.CardMode == ECardMode.GG)
                 {
                     return GugaoPulseCardManager.Instance.GetCard(0).GetAxis(nameof(StockZ1));
                 }
+                else
+                {
+                    return ZtmCardManager.Instance.GetCard(1).GetAxis(nameof(StockZ1));
+                }
+            }
         }
 
         /// <summary>
@@ -105,17 +113,31 @@ namespace Rs.MotionPlat.Flow
         public static IAxis StockZ2
         {
             get
+            {
+                if (GlobalVar.CardMode == ECardMode.GG)
                 {
                     return GugaoPulseCardManager.Instance.GetCard(0).GetAxis(nameof(StockZ2));
                 }
+                else
+                {
+                    return ZtmCardManager.Instance.GetCard(1).GetAxis(nameof(StockZ2));
+                }
+            }
         }
 
         public static IAxis StockZ3
         {
             get
+            {
+                if (GlobalVar.CardMode == ECardMode.GG)
                 {
                     return GugaoPulseCardManager.Instance.GetCard(0).GetAxis(nameof(StockZ3));
                 }
+                else
+                {
+                    return ZtmCardManager.Instance.GetCard(1).GetAxis(nameof(StockZ3));
+                }
+            }
         }
         #endregion
 
@@ -123,30 +145,59 @@ namespace Rs.MotionPlat.Flow
         public static IAxis NozzleZ1
         {
             get
+            {
+                if(GlobalVar.CardMode== ECardMode.GG)
                 {
                     return GugaoPulseCardManager.Instance.GetCard(1).GetAxis(nameof(NozzleZ1));
                 }
+                else
+                {
+                    return ZtmCardManager.Instance.GetCard(0).GetAxis(nameof(NozzleZ1));
+                }
+                
+            }
         }
         public static IAxis NozzleZ2
         {
             get
+            {
+                if (GlobalVar.CardMode == ECardMode.GG)
                 {
                     return GugaoPulseCardManager.Instance.GetCard(1).GetAxis(nameof(NozzleZ2));
                 }
+                else
+                {
+                    return ZtmCardManager.Instance.GetCard(0).GetAxis(nameof(NozzleZ2));
+                }
+            }
         }
         public static IAxis NozzleZ3
         {
             get
+            {
+                if (GlobalVar.CardMode == ECardMode.GG)
                 {
                     return GugaoPulseCardManager.Instance.GetCard(1).GetAxis(nameof(NozzleZ3));
                 }
+                else
+                {
+                    return ZtmCardManager.Instance.GetCard(0).GetAxis(nameof(NozzleZ3));
+                }
+            }
         }
         public static IAxis NozzleZ4
         {
             get
+            {
+                if (GlobalVar.CardMode == ECardMode.GG)
                 {
                     return GugaoPulseCardManager.Instance.GetCard(1).GetAxis(nameof(NozzleZ4));
                 }
+                else
+                {
+                    return ZtmCardManager.Instance.GetCard(0).GetAxis(nameof(NozzleZ4));
+                }
+            }
         }
         
 

Rs.DeweyTester/Home.cs

@@ -339,6 +339,11 @@ namespace Rs.MotionPlat
 
         private void Home2_Load(object sender, EventArgs e)
         {
+            string cardMode = File.ReadAllText("CardMode.txt");
+            if (Enum.TryParse(cardMode, out ECardMode mode))
+            {
+                GlobalVar.CardMode=mode;
+            }
             lblDischargeFlow.Visible = false;
             lblStockLoadProductFlow.Visible = false;
             lblStockPlaceFlow.Visible = false;