From a1a1c89b91fc9476c51981699aaa7c2bccdd8570 Mon Sep 17 00:00:00 2001
From: tao_z <tzj0429@163.com>
Date: Sun, 07 Aug 2022 14:19:02 +0800
Subject: [PATCH] SX7H初步完成
---
widgets/ShifterTool.py | 3 +--
Shifter.py | 4 ++++
ShifterDefine.py | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Shifter.py b/Shifter.py
index 8fb5efa..48472d0 100644
--- a/Shifter.py
+++ b/Shifter.py
@@ -292,6 +292,9 @@
reqpos = TCU2_ShiterLevel_dic['M']
self.pre_ShiftLeverPos = "P"
self.max_pos = 'Shifter position Zero'
+ elif shift.position is SA1_Status_GearShftPosReq_dic[
+ 'Shifter not initialized']:
+ pass
else:
if shift.position is not SA1_Status_GearShftPosReq_dic[
'Shifter position Zero']:
@@ -303,5 +306,6 @@
self.pre_ShiftLeverPos = [
k for k, v in TCU2_ShiterLevel_dic.items() if v == reqpos
][0]
+
data = self.pack_TCU2(reqpos)
return data
diff --git a/ShifterDefine.py b/ShifterDefine.py
index b279f6d..9408d48 100644
--- a/ShifterDefine.py
+++ b/ShifterDefine.py
@@ -94,7 +94,7 @@
SA1_Status_ParkButtonReq_dic = {
'No request': 0x0,
'Driver request park button': 1,
- 'Park Button fault': 2,
+ 'Park button fault': 2,
'Reserved': 3
}
SA1_Status_UnlockButtonReq_dic = {
diff --git a/widgets/ShifterTool.py b/widgets/ShifterTool.py
index 3d5513d..d357388 100644
--- a/widgets/ShifterTool.py
+++ b/widgets/ShifterTool.py
@@ -612,7 +612,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 +750,6 @@
pass
def TestPresentEvent(self):
- self.udsclient.
if self.UI.radioButton.isChecked():
self.TestPresentTimer.start(3000)
else:
--
Gitblit v1.8.0