|
|
@ -15,7 +15,7 @@ class CarState(CarStateBase): |
|
|
|
super().__init__(CP) |
|
|
|
super().__init__(CP) |
|
|
|
can_define = CANDefine(DBC[CP.carFingerprint]["pt"]) |
|
|
|
can_define = CANDefine(DBC[CP.carFingerprint]["pt"]) |
|
|
|
if CP.transmissionType == TransmissionType.automatic: |
|
|
|
if CP.transmissionType == TransmissionType.automatic: |
|
|
|
self.shifter_values = can_define.dv["Gear_Shift_by_Wire_FD1"]["TrnRng_D_RqGsm"] |
|
|
|
self.shifter_values = can_define.dv["PowertrainData_10"]["TrnRng_D_Rq"] |
|
|
|
|
|
|
|
|
|
|
|
self.vehicle_sensors_valid = False |
|
|
|
self.vehicle_sensors_valid = False |
|
|
|
|
|
|
|
|
|
|
@ -69,7 +69,7 @@ class CarState(CarStateBase): |
|
|
|
|
|
|
|
|
|
|
|
# gear |
|
|
|
# gear |
|
|
|
if self.CP.transmissionType == TransmissionType.automatic: |
|
|
|
if self.CP.transmissionType == TransmissionType.automatic: |
|
|
|
gear = self.shifter_values.get(cp.vl["Gear_Shift_by_Wire_FD1"]["TrnRng_D_RqGsm"]) |
|
|
|
gear = self.shifter_values.get(cp.vl["PowertrainData_10"]["TrnRng_D_Rq"]) |
|
|
|
ret.gearShifter = self.parse_gear_shifter(gear) |
|
|
|
ret.gearShifter = self.parse_gear_shifter(gear) |
|
|
|
elif self.CP.transmissionType == TransmissionType.manual: |
|
|
|
elif self.CP.transmissionType == TransmissionType.manual: |
|
|
|
ret.clutchPressed = cp.vl["Engine_Clutch_Data"]["CluPdlPos_Pc_Meas"] > 0 |
|
|
|
ret.clutchPressed = cp.vl["Engine_Clutch_Data"]["CluPdlPos_Pc_Meas"] > 0 |
|
|
@ -139,7 +139,7 @@ class CarState(CarStateBase): |
|
|
|
|
|
|
|
|
|
|
|
if CP.transmissionType == TransmissionType.automatic: |
|
|
|
if CP.transmissionType == TransmissionType.automatic: |
|
|
|
messages += [ |
|
|
|
messages += [ |
|
|
|
("Gear_Shift_by_Wire_FD1", 10), |
|
|
|
("PowertrainData_10", 10), |
|
|
|
] |
|
|
|
] |
|
|
|
elif CP.transmissionType == TransmissionType.manual: |
|
|
|
elif CP.transmissionType == TransmissionType.manual: |
|
|
|
messages += [ |
|
|
|
messages += [ |
|
|
|