From dd84d3ff28816a22a911bb26b435026b728676db Mon Sep 17 00:00:00 2001
From: tao_z <tzj0429@163.com>
Date: Sun, 07 Aug 2022 21:42:44 +0800
Subject: [PATCH] 针对B41V修改
---
ShifterDefine.py | 136 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 125 insertions(+), 11 deletions(-)
diff --git a/ShifterDefine.py b/ShifterDefine.py
index b89e25e..9408d48 100644
--- a/ShifterDefine.py
+++ b/ShifterDefine.py
@@ -80,18 +80,43 @@
self.fun_rxId = 0
-class ShifterPosition(IntEnum):
- ShiftPosZero = 0
- ShiftPosX2 = 2
- ShiftPosX1 = 3
- ShiftPosY1 = 4
- ShiftPosY2 = 5
- ShiftPosNotInit = 8
- ShiftPosM_Minus = 0xc
- ShiftPosM_Plus = 0xd
- ShiftPosM = 0xe
- ShiftNotAvailable = 0xF
+# class ShifterPosition(IntEnum):
+# ShiftPosZero = 0
+# ShiftPosX2 = 2
+# ShiftPosX1 = 3
+# ShiftPosY1 = 4
+# ShiftPosY2 = 5
+# ShiftPosNotInit = 8
+# ShiftPosM_Minus = 0xc
+# ShiftPosM_Plus = 0xd
+# ShiftPosM = 0xe
+# ShiftNotAvailable = 0xF
+SA1_Status_ParkButtonReq_dic = {
+ 'No request': 0x0,
+ 'Driver request park button': 1,
+ 'Park button fault': 2,
+ 'Reserved': 3
+}
+SA1_Status_UnlockButtonReq_dic = {
+ 'No request': 0,
+ 'Driver request unlock button': 1
+}
+SA1_Status_GearShftPosReq_dic = {
+ 'Shifter position Zero': 0x0,
+ 'Reserved1': 0x1,
+ 'X2 forward twice': 0x2,
+ 'X1 forward once': 0x3,
+ 'Y1 backward once': 0x4,
+ 'Y2 backward twice': 0x5,
+ 'Reserved6': 0x6,
+ 'Reserved7': 0x7,
+ 'Shifter not initialized': 0x8,
+ 'M-': 0xC,
+ 'M+': 0xD,
+ 'M': 0xE,
+ 'Signal not available': 0xF
+}
DID_dic = {
"ProgrammingCounter": 0x2100,
@@ -126,3 +151,92 @@
"ReadFingerPrint": 0xf15b,
"IndicationLEDControl": 0x8101
}
+
+TCU2_ShiterLevel_dic = {
+ 'P': 0x0,
+ 'D': 0x1,
+ 'N': 0x2,
+ 'R': 0x3,
+ 'M': 0x4,
+ 'M+': 0x5,
+ 'M-': 0x6,
+ "Invalid": 7
+}
+
+GearShiftMap_dic = {
+ "P": {
+ 'X2 forward twice': 0x3,
+ 'X1 forward once': 2,
+ 'Shifter position Zero': 0x0,
+ 'Y1 backward once': 0x2,
+ 'Y2 backward twice': 1
+ },
+ "R": {
+ 'X2 forward twice': 0x3,
+ 'X1 forward once': 3,
+ 'Shifter position Zero': 0x3,
+ 'Y1 backward once': 0x2,
+ 'Y2 backward twice': 1
+ },
+ "N": {
+ 'X2 forward twice': 0x3,
+ 'X1 forward once': 3,
+ 'Shifter position Zero': 2,
+ 'Y1 backward once': 1,
+ 'Y2 backward twice': 1
+ },
+ "D": {
+ 'X2 forward twice': 0x3,
+ 'X1 forward once': 2,
+ 'Shifter position Zero': 1,
+ 'Y1 backward once': 1,
+ 'Y2 backward twice': 1
+ }
+}
+# 'X2 forward twice': 0x2,
+# 'X1 forward once': 0x3,
+# 'Y1 backward once': 0x4,
+# 'Y2 backward twice': 0x5,
+ShiftMaxPosMap_dic = {
+ 'Shifter position Zero': {
+ 0: 'Shifter position Zero',
+ 2: 'X2 forward twice',
+ 3: 'X1 forward once',
+ 4: 'Y1 backward once',
+ 5: 'Y2 backward twice'
+ },
+ 'X1 forward once': {
+ 0: 'X1 forward once',
+ 2: 'X2 forward twice',
+ 3: 'X1 forward once',
+ 4: 'Y1 backward once',
+ 5: 'Y2 backward twice'
+ },
+ 'X2 forward twice': {
+ 0: 'X2 forward twice',
+ 2: 'X2 forward twice',
+ 3: 'X2 forward twice',
+ 4: 'Y1 backward once',
+ 5: 'Y2 backward twice'
+ },
+ 'Y1 backward once': {
+ 0: 'Y1 backward once',
+ 2: 'X2 forward twice',
+ 3: 'X1 forward once',
+ 4: 'Y1 backward once',
+ 5: 'Y2 backward twice'
+ },
+ 'Y2 backward twice': {
+ 0: 'Y2 backward twice',
+ 2: 'X2 forward twice',
+ 3: 'X1 forward once',
+ 4: 'Y2 backward twice',
+ 5: 'Y2 backward twice'
+ }
+}
+
+# {GearDisplay_R, GearDisplay_R, GearDisplay_R, GearDisplay_R},
+# {GearDisplay_N, GearDisplay_R, GearDisplay_R, GearDisplay_N},
+# {GearDisplay_P, GearDisplay_R, GearDisplay_N, GearDisplay_D},
+# {GearDisplay_N, GearDisplay_N, GearDisplay_D, GearDisplay_D},
+# {GearDisplay_D, GearDisplay_D, GearDisplay_D, GearDisplay_D}
--
Gitblit v1.8.0