From 989919a73c5ebd46368991b6c3ff6959e32490b6 Mon Sep 17 00:00:00 2001
From: tao_z <tzj0429@163.com>
Date: Tue, 23 Aug 2022 22:06:32 +0800
Subject: [PATCH] 完善did读取显示

---
 widgets/ShifterTool.py |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/widgets/ShifterTool.py b/widgets/ShifterTool.py
index 3d5513d..7d869d8 100644
--- a/widgets/ShifterTool.py
+++ b/widgets/ShifterTool.py
@@ -1,4 +1,5 @@
 from ast import Not, Pass
+from asyncio.windows_events import NULL
 from concurrent.futures import thread
 from curses import flash
 from logging import exception
@@ -612,7 +613,7 @@
                     TIMING_DICT.keys())[self.devicedescription.baudrate]
                 self._usbcan = USBCAN(device_type=4,
                                       device_index=0,
-                                      can_index=0,
+                                      can_index=self.devicedescription.channel,
                                       bitrate=bitrate,
                                       can_filters=can_filters)
                 if not self._usbcan.InitAndStart():
@@ -750,7 +751,6 @@
         pass
 
     def TestPresentEvent(self):
-        self.udsclient.
         if self.UI.radioButton.isChecked():
             self.TestPresentTimer.start(3000)
         else:
@@ -834,8 +834,11 @@
         self.UI.lineEdit_2.clear()
         data = self.ReadByDID(tempdid)
         if data is not None and len(str(data[tempdid])):
-            # print(data[tempdid])
-            self.UI.lineEdit_2.setText(data[tempdid])
+            if '\x00' in data[tempdid]:
+                out1, out2 = data[tempdid].split('\x00', 1)
+                self.UI.lineEdit_2.setText(out1)
+            else:
+                self.UI.lineEdit_2.setText(data[tempdid])
 
     def WriteDataByID(self):
         tempdid = DID_dic[self.UI.comboBox_6.currentText()]

--
Gitblit v1.8.0