From 813f41017e700879e6abab1b82be55a673970ceb Mon Sep 17 00:00:00 2001
From: CPL <1179393954@qq.com>
Date: Wed, 13 Mar 2024 11:12:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC-v1.2.4=20=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .tgitconfig                                   |  0
 .../AssistClient/Device/IOCardDev.cs          |  3 +-
 .../AssistClient/FrmMain.cs                   | 36 +++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 .tgitconfig

diff --git a/.tgitconfig b/.tgitconfig
new file mode 100644
index 0000000..e69de29
diff --git a/halftoneproject-master/AssistClient/Device/IOCardDev.cs b/halftoneproject-master/AssistClient/Device/IOCardDev.cs
index 4fb6348..ddda873 100644
--- a/halftoneproject-master/AssistClient/Device/IOCardDev.cs
+++ b/halftoneproject-master/AssistClient/Device/IOCardDev.cs
@@ -244,6 +244,7 @@ namespace AssistClient.Device
                 //errorCode = instantDiCtrl.ReadBit(startPort, bit, out data);
                 if (BioFailed(result))
                 {
+                    INEvent?.Invoke(999, 0xff);
                     //throw new Exception();
                     continue;
                 }
@@ -255,7 +256,7 @@ namespace AssistClient.Device
                         INEvent?.Invoke(i, DIData[i]);
                     }
                 }
-                Thread.Sleep(10);
+                Thread.Sleep(100);
             } while (IsInit);
         }
 
diff --git a/halftoneproject-master/AssistClient/FrmMain.cs b/halftoneproject-master/AssistClient/FrmMain.cs
index 45b28a5..4a51ee9 100644
--- a/halftoneproject-master/AssistClient/FrmMain.cs
+++ b/halftoneproject-master/AssistClient/FrmMain.cs
@@ -1584,23 +1584,59 @@ namespace AssistClient
         {
             AddTextEvent("中断命令", $"{portIndex}-HEX:{Convert.ToString(data, 16)}");
             if (compareIOInput(CMDName.启动按钮) && this.tsbtnStart.Enabled)
+            {
+                AddTextEvent("中断命令", $"启动-按钮");
                 startCommand();
+                AddTextEvent("中断命令", $"启动-完成");
+            }
             else if (compareIOInput(CMDName.暂停按钮) && this.tsbtnPause.Enabled)
+            {
+                AddTextEvent("中断命令", $"暂停-按钮");
                 warning(WarningEnum.Low, false);
+                AddTextEvent("中断命令", $"暂停-完成");
+            }
             else if (compareIOInput(CMDName.完成下料) && this.tsbtnGoDownPT.Enabled)
+            {
+                AddTextEvent("中断命令", $"完成-按钮");
                 gotoDownPT();
+                AddTextEvent("中断命令", $"完成-完成");
+            }
             else if (compareIOInput(CMDName.下光源按钮))
+            {
+                AddTextEvent("中断命令", $"下光源-按钮");
                 openLowerLight();
+                AddTextEvent("中断命令", $"下光源-完成");
+            }
             else if (compareIOInput(CMDName.上一张图) && currentState == CurrentStateEnum.打标中 && currDefectIndex > 0)
+            {
+                AddTextEvent("中断命令", $"上一张图-按钮");
                 gotoPrePic();
+                AddTextEvent("中断命令", $"上一张图-完成");
+            }
             else if (compareIOInput(CMDName.下一张图) && currentState == CurrentStateEnum.打标中 && currDefectIndex < defectList.Count - 1)
+            {
+                AddTextEvent("中断命令", $"下一张图-按钮");
                 gotoNextPic();
+                AddTextEvent("中断命令", $"下一张图-完成");
+            }
             else if (compareIOInput(CMDName.上一缺陷) && currentState == CurrentStateEnum.打标中 && currDefectIndex > 0)
+            {
+                AddTextEvent("中断命令", $"上一缺陷-按钮");
                 gotoDefctListIndex(--currDefectIndex, currDefectIndex + 1);
+                AddTextEvent("中断命令", $"上一缺陷-完成");
+            }
             else if (compareIOInput(CMDName.下一缺陷) && currentState == CurrentStateEnum.打标中 && currDefectIndex < defectList.Count - 1)
+            {
+                AddTextEvent("中断命令", $"下一缺陷-按钮");
                 gotoDefctListIndex(++currDefectIndex, currDefectIndex - 1);
+                AddTextEvent("中断命令", $"下一缺陷-完成");
+            }
             else if (compareIOInput(CMDName.复位按钮) && this.tsbtnReset.Enabled)
+            {
+                AddTextEvent("中断命令", $"复位-按钮");
                 resetCommand();
+                AddTextEvent("中断命令", $"复位-完成");
+            }
          
             //
             if (devContainer.state && warningLevel == WarningEnum.Normal