From 501e0dca47fe2f1cfdd6f9c36881223495240863 Mon Sep 17 00:00:00 2001
From: ranchuan <rd05cqmcloud.com>
Date: Tue, 31 Oct 2023 18:10:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E7=A0=81=E5=B7=A5=E5=85=B7=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=BF=BD=E7=95=A5=E6=8E=A5=E8=A7=A6=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ReadMe.txt              |  3 +++
 coder_2ch/coder_main.py | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/ReadMe.txt b/ReadMe.txt
index b8c3b87..e8a0778 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -100,4 +100,7 @@
     使用选项卡来选择两种升级方式
 2023.10.30
     prottcp 方案生成字节数据添加减少内存占用的转化函数，与此日期之前的MCU程序不兼容
+2023.10.31
+    注码工具添加忽略接触异常按钮
+
 
diff --git a/coder_2ch/coder_main.py b/coder_2ch/coder_main.py
index 9e6377b..1ce2dfe 100644
--- a/coder_2ch/coder_main.py
+++ b/coder_2ch/coder_main.py
@@ -55,6 +55,7 @@ class coder(QObject):
         self.ser_is_open = False
         self.recv_handler=None
         self.autoinc_id=False
+        self.openignore_flag=False
         self.autotest_is_open=0
         self.uid_length=16
         self.code_list_backcolor=False
@@ -78,6 +79,7 @@ class coder(QObject):
         self.stop_but_init()
         self.code_but_init()
         self.moterdown_init()
+        self.openignore_init()
         self.recv_handler_table_init()
         self.device_type_init()
         self.widget.destroyed.connect(self.quit)
@@ -272,6 +274,14 @@ class coder(QObject):
         self.moterdown.setText("电机下降")
         self.moterdown.clicked.connect(self.cmd_moter_down)
 
+        # 忽略接触异常
+    def openignore_init(self):
+        self.openignore=QPushButton(self.widget)
+        self.openignore.setObjectName(u"moteerup")
+        self.openignore.setGeometry(QRect(1250, 410, 93, 28))
+        self.openignore.clicked.connect(self.openignore_clicked)
+        self.openignore_clicked()
+
         # 初始化设备类型选择框
     def device_type_init(self):
         self.device_type_list = QComboBox(self.widget)
@@ -348,6 +358,16 @@ class coder(QObject):
             self.autoinc.setText("关闭ID自增")
             self.set_infotext("已打开ID自增")
 
+    def openignore_clicked(self):
+        if(self.openignore_flag==False):
+            self.openignore_flag=True
+            self.openignore.setText("拦截接触异常")
+            self.set_infotext("当前为忽略接触异常，接触异常时也会跑码。")
+        else:
+            self.openignore_flag=False
+            self.openignore.setText("忽略接触异常")
+            self.set_infotext("当前为拦截接触异常，接触异常时不会跑码。")
+
     def check_but_clicked(self):
         print("send start check cmd.")
         self.cmd_user(0x90,bytearray([2]))
@@ -631,6 +651,8 @@ class coder(QObject):
                 # 接触异常则忽略
                 if(ack_i!=3):
                     ack=False
+                elif(self.openignore_flag==False):
+                    ack=False
                 str_start=STR_RED
             print(str_start+"addr:",int(data[6*i+2]),"ack:",ack_i,STR_END)
             acks_list.append(str(ack_i))
@@ -694,6 +716,8 @@ class coder(QObject):
                 # 接触异常则忽略
                 if((ack_i!=3) and (ack_i!=200)):
                     ack=False
+                elif(self.openignore_flag==False):
+                    ack=False
                 str_start=STR_RED
             print(str_start+"addr:",i[0],"ack:",ack_i,STR_END)
             print("\t","shell_code:",i[2])