From eaeb63b0c3b3233423d2ce4a967732485d0a7383 Mon Sep 17 00:00:00 2001
From: lhiven <lhiven@163.com>
Date: Fri, 23 Aug 2024 07:56:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=9B=BA=E9=AB=98?=
 =?UTF-8?q?=E5=92=8CZTM=E5=85=B1=E5=90=8C=E5=AD=98=E5=9C=A8=E7=9A=84?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.DeweyTester/Commom/GlobalVar.cs | 11 +++++
 Rs.DeweyTester/Commom/Ops.cs       | 13 +++++-
 Rs.DeweyTester/Flow/AxisControl.cs | 65 ++++++++++++++++++++++++++----
 Rs.DeweyTester/Home.cs             |  5 +++
 4 files changed, 86 insertions(+), 8 deletions(-)

diff --git a/Rs.DeweyTester/Commom/GlobalVar.cs b/Rs.DeweyTester/Commom/GlobalVar.cs
index 9a21088..6e5693a 100644
--- a/Rs.DeweyTester/Commom/GlobalVar.cs
+++ b/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>
diff --git a/Rs.DeweyTester/Commom/Ops.cs b/Rs.DeweyTester/Commom/Ops.cs
index 57d6e81..b35cc68 100644
--- a/Rs.DeweyTester/Commom/Ops.cs
+++ b/Rs.DeweyTester/Commom/Ops.cs
@@ -53,9 +53,20 @@ 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
-                
+
                 #region 初始化IO
                 IoManager.Instance.Init();
                 #endregion
diff --git a/Rs.DeweyTester/Flow/AxisControl.cs b/Rs.DeweyTester/Flow/AxisControl.cs
index 14cecd6..7f69c39 100644
--- a/Rs.DeweyTester/Flow/AxisControl.cs
+++ b/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;
@@ -95,7 +96,14 @@ namespace Rs.MotionPlat.Flow
         {
             get
             {
-                return GugaoPulseCardManager.Instance.GetCard(0).GetAxis(nameof(StockZ1));
+                if (GlobalVar.CardMode == ECardMode.GG)
+                {
+                    return GugaoPulseCardManager.Instance.GetCard(0).GetAxis(nameof(StockZ1));
+                }
+                else
+                {
+                    return ZtmCardManager.Instance.GetCard(1).GetAxis(nameof(StockZ1));
+                }
             }
         }
 
@@ -106,7 +114,14 @@ namespace Rs.MotionPlat.Flow
         {
             get
             {
-                return GugaoPulseCardManager.Instance.GetCard(0).GetAxis(nameof(StockZ2));
+                if (GlobalVar.CardMode == ECardMode.GG)
+                {
+                    return GugaoPulseCardManager.Instance.GetCard(0).GetAxis(nameof(StockZ2));
+                }
+                else
+                {
+                    return ZtmCardManager.Instance.GetCard(1).GetAxis(nameof(StockZ2));
+                }
             }
         }
 
@@ -114,7 +129,14 @@ namespace Rs.MotionPlat.Flow
         {
             get
             {
-                return GugaoPulseCardManager.Instance.GetCard(0).GetAxis(nameof(StockZ3));
+                if (GlobalVar.CardMode == ECardMode.GG)
+                {
+                    return GugaoPulseCardManager.Instance.GetCard(0).GetAxis(nameof(StockZ3));
+                }
+                else
+                {
+                    return ZtmCardManager.Instance.GetCard(1).GetAxis(nameof(StockZ3));
+                }
             }
         }
         #endregion
@@ -124,28 +146,57 @@ namespace Rs.MotionPlat.Flow
         {
             get
             {
-                return GugaoPulseCardManager.Instance.GetCard(1).GetAxis(nameof(NozzleZ1));
+                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
             {
-                return GugaoPulseCardManager.Instance.GetCard(1).GetAxis(nameof(NozzleZ2));
+                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
             {
-                return GugaoPulseCardManager.Instance.GetCard(1).GetAxis(nameof(NozzleZ3));
+                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
             {
-                return GugaoPulseCardManager.Instance.GetCard(1).GetAxis(nameof(NozzleZ4));
+                if (GlobalVar.CardMode == ECardMode.GG)
+                {
+                    return GugaoPulseCardManager.Instance.GetCard(1).GetAxis(nameof(NozzleZ4));
+                }
+                else
+                {
+                    return ZtmCardManager.Instance.GetCard(0).GetAxis(nameof(NozzleZ4));
+                }
             }
         }
         
diff --git a/Rs.DeweyTester/Home.cs b/Rs.DeweyTester/Home.cs
index 16ef24a..c12bb58 100644
--- a/Rs.DeweyTester/Home.cs
+++ b/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;