Merge Accord trims (#21105)
* Merge unique Accord 1.5 fw versions * remove all instances of ACCORD_15 * bump opendbc and update dbcs * Switch between gearbox messages by detecting presence of gearbox msg * both accord (2t) and accord hybrid use the same gearbox, 1.5t is the outlier * default to GEARBOX * add old name to migration * bump opendbc * update refs * change msg name, bump cereal * Update selfdrive/test/test_routes.py * update ref Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com> Co-authored-by: Willem Melching <willem.melching@gmail.com>pull/21121/head
parent
73ce8f4c18
commit
e9e197eb3c
2
opendbc
2
opendbc
|
@ -1 +1 @@
|
|||
Subproject commit e3cb276afe07344303a7abc6fa05b06990dcb586
|
||||
Subproject commit 570325e2fcd40d26e5d6a4087711449dec24510a
|
|
@ -553,8 +553,7 @@ opendbc/gm_global_a_chassis.dbc
|
|||
opendbc/ford_fusion_2018_pt.dbc
|
||||
opendbc/ford_fusion_2018_adas.dbc
|
||||
|
||||
opendbc/honda_accord_s2t_2018_can_generated.dbc
|
||||
opendbc/honda_accord_lx15t_2018_can_generated.dbc
|
||||
opendbc/honda_accord_2018_can_generated.dbc
|
||||
opendbc/acura_ilx_2016_can_generated.dbc
|
||||
opendbc/acura_rdx_2018_can_generated.dbc
|
||||
opendbc/acura_rdx_2020_can_generated.dbc
|
||||
|
|
|
@ -7,6 +7,9 @@ from selfdrive.config import Conversions as CV
|
|||
from selfdrive.car.interfaces import CarStateBase
|
||||
from selfdrive.car.honda.values import CAR, DBC, STEER_THRESHOLD, SPEED_FACTOR, HONDA_BOSCH, HONDA_BOSCH_ALT_BRAKE_SIGNAL
|
||||
|
||||
TransmissionType = car.CarParams.TransmissionType
|
||||
|
||||
|
||||
def calc_cruise_offset(offset, speed):
|
||||
# euristic formula so that speed is controlled to ~ 0.3m/s below pid_speed
|
||||
# constraints to solve for _K0, _K1, _K2 are:
|
||||
|
@ -19,7 +22,7 @@ def calc_cruise_offset(offset, speed):
|
|||
return min(_K0 + _K1 * speed + _K2 * speed * offset, 0.)
|
||||
|
||||
|
||||
def get_can_signals(CP):
|
||||
def get_can_signals(CP, gearbox_msg="GEARBOX"):
|
||||
# this function generates lists for signal, messages and initial values
|
||||
signals = [
|
||||
("XMISSION_SPEED", "ENGINE_DATA", 0),
|
||||
|
@ -33,7 +36,7 @@ def get_can_signals(CP):
|
|||
("STEER_TORQUE_SENSOR", "STEER_STATUS", 0),
|
||||
("LEFT_BLINKER", "SCM_FEEDBACK", 0),
|
||||
("RIGHT_BLINKER", "SCM_FEEDBACK", 0),
|
||||
("GEAR", "GEARBOX", 0),
|
||||
("GEAR", gearbox_msg, 0),
|
||||
("SEATBELT_DRIVER_LAMP", "SEATBELT_STATUS", 1),
|
||||
("SEATBELT_DRIVER_LATCHED", "SEATBELT_STATUS", 0),
|
||||
("BRAKE_PRESSED", "POWERTRAIN_DATA", 0),
|
||||
|
@ -43,7 +46,7 @@ def get_can_signals(CP):
|
|||
("USER_BRAKE", "VSA_STATUS", 0),
|
||||
("BRAKE_HOLD_ACTIVE", "VSA_STATUS", 0),
|
||||
("STEER_STATUS", "STEER_STATUS", 5),
|
||||
("GEAR_SHIFTER", "GEARBOX", 0),
|
||||
("GEAR_SHIFTER", gearbox_msg, 0),
|
||||
("PEDAL_GAS", "POWERTRAIN_DATA", 0),
|
||||
("CRUISE_SETTING", "SCM_BUTTONS", 0),
|
||||
("ACC_STATUS", "POWERTRAIN_DATA", 0),
|
||||
|
@ -74,11 +77,11 @@ def get_can_signals(CP):
|
|||
|
||||
if CP.carFingerprint in (CAR.CRV_HYBRID, CAR.CIVIC_BOSCH_DIESEL, CAR.ACURA_RDX_3G):
|
||||
checks += [
|
||||
("GEARBOX", 50),
|
||||
(gearbox_msg, 50),
|
||||
]
|
||||
else:
|
||||
checks += [
|
||||
("GEARBOX", 100),
|
||||
(gearbox_msg, 100),
|
||||
]
|
||||
|
||||
if CP.carFingerprint in HONDA_BOSCH_ALT_BRAKE_SIGNAL:
|
||||
|
@ -118,7 +121,7 @@ def get_can_signals(CP):
|
|||
else:
|
||||
checks += [("CRUISE_PARAMS", 50)]
|
||||
|
||||
if CP.carFingerprint in (CAR.ACCORD, CAR.ACCORD_15, CAR.ACCORDH, CAR.CIVIC_BOSCH, CAR.CIVIC_BOSCH_DIESEL, CAR.CRV_HYBRID, CAR.INSIGHT, CAR.ACURA_RDX_3G):
|
||||
if CP.carFingerprint in (CAR.ACCORD, CAR.ACCORDH, CAR.CIVIC_BOSCH, CAR.CIVIC_BOSCH_DIESEL, CAR.CRV_HYBRID, CAR.INSIGHT, CAR.ACURA_RDX_3G):
|
||||
signals += [("DRIVERS_DOOR_OPEN", "SCM_FEEDBACK", 1)]
|
||||
elif CP.carFingerprint == CAR.ODYSSEY_CHN:
|
||||
signals += [("DRIVERS_DOOR_OPEN", "SCM_BUTTONS", 1)]
|
||||
|
@ -196,7 +199,11 @@ class CarState(CarStateBase):
|
|||
def __init__(self, CP):
|
||||
super().__init__(CP)
|
||||
can_define = CANDefine(DBC[CP.carFingerprint]["pt"])
|
||||
self.shifter_values = can_define.dv["GEARBOX"]["GEAR_SHIFTER"]
|
||||
self.gearbox_msg = "GEARBOX"
|
||||
if CP.carFingerprint == CAR.ACCORD and CP.transmissionType == TransmissionType.cvt:
|
||||
self.gearbox_msg = "GEARBOX_15T"
|
||||
|
||||
self.shifter_values = can_define.dv[self.gearbox_msg]["GEAR_SHIFTER"]
|
||||
self.steer_status_values = defaultdict(lambda: "UNKNOWN", can_define.dv["STEER_STATUS"]["STEER_STATUS"])
|
||||
|
||||
self.user_gas, self.user_gas_pressed = 0., 0
|
||||
|
@ -219,7 +226,7 @@ class CarState(CarStateBase):
|
|||
|
||||
# ******************* parse out can *******************
|
||||
# TODO: find wheels moving bit in dbc
|
||||
if self.CP.carFingerprint in (CAR.ACCORD, CAR.ACCORD_15, CAR.ACCORDH, CAR.CIVIC_BOSCH, CAR.CIVIC_BOSCH_DIESEL, CAR.CRV_HYBRID, CAR.INSIGHT, CAR.ACURA_RDX_3G):
|
||||
if self.CP.carFingerprint in (CAR.ACCORD, CAR.ACCORDH, CAR.CIVIC_BOSCH, CAR.CIVIC_BOSCH_DIESEL, CAR.CRV_HYBRID, CAR.INSIGHT, CAR.ACURA_RDX_3G):
|
||||
ret.standstill = cp.vl["ENGINE_DATA"]["XMISSION_SPEED"] < 0.1
|
||||
ret.doorOpen = bool(cp.vl["SCM_FEEDBACK"]["DRIVERS_DOOR_OPEN"])
|
||||
elif self.CP.carFingerprint == CAR.ODYSSEY_CHN:
|
||||
|
@ -268,7 +275,7 @@ class CarState(CarStateBase):
|
|||
ret.rightBlinker = cp.vl["SCM_FEEDBACK"]["RIGHT_BLINKER"] != 0
|
||||
self.brake_hold = cp.vl["VSA_STATUS"]["BRAKE_HOLD_ACTIVE"]
|
||||
|
||||
if self.CP.carFingerprint in (CAR.CIVIC, CAR.ODYSSEY, CAR.CRV_5G, CAR.ACCORD, CAR.ACCORD_15, CAR.ACCORDH, CAR.CIVIC_BOSCH,
|
||||
if self.CP.carFingerprint in (CAR.CIVIC, CAR.ODYSSEY, CAR.CRV_5G, CAR.ACCORD, CAR.ACCORDH, CAR.CIVIC_BOSCH,
|
||||
CAR.CIVIC_BOSCH_DIESEL, CAR.CRV_HYBRID, CAR.INSIGHT, CAR.ACURA_RDX_3G):
|
||||
self.park_brake = cp.vl["EPB_STATUS"]["EPB_STATE"] != 0
|
||||
main_on = cp.vl["SCM_FEEDBACK"]["MAIN_ON"]
|
||||
|
@ -279,7 +286,7 @@ class CarState(CarStateBase):
|
|||
self.park_brake = 0 # TODO
|
||||
main_on = cp.vl["SCM_BUTTONS"]["MAIN_ON"]
|
||||
|
||||
gear = int(cp.vl["GEARBOX"]["GEAR_SHIFTER"])
|
||||
gear = int(cp.vl[self.gearbox_msg]["GEAR_SHIFTER"])
|
||||
ret.gearShifter = self.parse_gear_shifter(self.shifter_values.get(gear, None))
|
||||
|
||||
self.pedal_gas = cp.vl["POWERTRAIN_DATA"]["PEDAL_GAS"]
|
||||
|
@ -360,9 +367,8 @@ class CarState(CarStateBase):
|
|||
|
||||
return ret
|
||||
|
||||
@staticmethod
|
||||
def get_can_parser(CP):
|
||||
signals, checks = get_can_signals(CP)
|
||||
def get_can_parser(self, CP):
|
||||
signals, checks = get_can_signals(CP, self.gearbox_msg)
|
||||
bus_pt = 1 if CP.carFingerprint in HONDA_BOSCH else 0
|
||||
return CANParser(DBC[CP.carFingerprint]["pt"], signals, checks, bus_pt)
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@ A_ACC_MAX = max(_A_CRUISE_MAX_V_FOLLOWING)
|
|||
|
||||
ButtonType = car.CarState.ButtonEvent.Type
|
||||
EventName = car.CarEvent.EventName
|
||||
TransmissionType = car.CarParams.TransmissionType
|
||||
|
||||
|
||||
def compute_gb_honda(accel, speed):
|
||||
|
@ -133,6 +134,10 @@ class CarInterface(CarInterfaceBase):
|
|||
if candidate == CAR.CRV_5G:
|
||||
ret.enableBsm = 0x12f8bfa7 in fingerprint[0]
|
||||
|
||||
# Accord 1.5T CVT has different gearbox message
|
||||
if candidate == CAR.ACCORD and 0x191 in fingerprint[0]:
|
||||
ret.transmissionType = TransmissionType.cvt
|
||||
|
||||
cloudlog.warning("ECU Camera Simulated: %r", ret.enableCamera)
|
||||
cloudlog.warning("ECU Gas Interceptor: %r", ret.enableGasInterceptor)
|
||||
|
||||
|
@ -191,7 +196,7 @@ class CarInterface(CarInterfaceBase):
|
|||
ret.longitudinalTuning.kiBP = [0., 35.]
|
||||
ret.longitudinalTuning.kiV = [0.18, 0.12]
|
||||
|
||||
elif candidate in (CAR.ACCORD, CAR.ACCORD_15, CAR.ACCORDH):
|
||||
elif candidate in (CAR.ACCORD, CAR.ACCORDH):
|
||||
stop_and_go = True
|
||||
ret.mass = 3279. * CV.LB_TO_KG + STD_CARGO_KG
|
||||
ret.wheelbase = 2.83
|
||||
|
|
|
@ -34,8 +34,7 @@ VISUAL_HUD = {
|
|||
VisualAlert.speedTooHigh: 8}
|
||||
|
||||
class CAR:
|
||||
ACCORD = "HONDA ACCORD 2T 2018"
|
||||
ACCORD_15 = "HONDA ACCORD 1.5T 2018"
|
||||
ACCORD = "HONDA ACCORD 2018"
|
||||
ACCORDH = "HONDA ACCORD HYBRID 2018"
|
||||
CIVIC = "HONDA CIVIC 2016"
|
||||
CIVIC_BOSCH = "HONDA CIVIC (BOSCH) 2019"
|
||||
|
@ -63,9 +62,6 @@ FINGERPRINTS = {
|
|||
CAR.ACCORD: [{
|
||||
148: 8, 228: 5, 304: 8, 330: 8, 344: 8, 380: 8, 399: 7, 419: 8, 420: 8, 427: 3, 432: 7, 441: 5, 446: 3, 450: 8, 464: 8, 477: 8, 479: 8, 495: 8, 545: 6, 662: 4, 773: 7, 777: 8, 780: 8, 804: 8, 806: 8, 808: 8, 829: 5, 862: 8, 884: 8, 891: 8, 927: 8, 929: 8, 1302: 8, 1600: 5, 1601: 8, 1652: 8
|
||||
}],
|
||||
CAR.ACCORD_15: [{
|
||||
148: 8, 228: 5, 304: 8, 330: 8, 344: 8, 380: 8, 399: 7, 401: 8, 420: 8, 427: 3, 432: 7, 441: 5, 446: 3, 450: 8, 464: 8, 477: 8, 479: 8, 495: 8, 545: 6, 662: 4, 773: 7, 777: 8, 780: 8, 804: 8, 806: 8, 808: 8, 829: 5, 862: 8, 884: 8, 891: 8, 927: 8, 929: 8, 1302: 8, 1600: 5, 1601: 8, 1652: 8
|
||||
}],
|
||||
CAR.ACCORDH: [{
|
||||
148: 8, 228: 5, 304: 8, 330: 8, 344: 8, 380: 8, 387: 8, 388: 8, 399: 7, 419: 8, 420: 8, 427: 3, 432: 7, 441: 5, 450: 8, 464: 8, 477: 8, 479: 8, 495: 8, 525: 8, 545: 6, 662: 4, 773: 7, 777: 8, 780: 8, 804: 8, 806: 8, 808: 8, 829: 5, 862: 8, 884: 8, 891: 8, 927: 8, 929: 8, 1302: 8, 1600: 5, 1601: 8, 1652: 8
|
||||
}],
|
||||
|
@ -153,6 +149,19 @@ FW_VERSIONS = {
|
|||
b'37805-6B2-A820\x00\x00',
|
||||
b'37805-6B2-A920\x00\x00',
|
||||
b'37805-6B2-M520\x00\x00',
|
||||
b'37805-6A0-9520\x00\x00',
|
||||
b'37805-6A0-9620\x00\x00',
|
||||
b'37805-6A0-9720\x00\x00',
|
||||
b'37805-6A0-A540\x00\x00',
|
||||
b'37805-6A0-A550\x00\x00',
|
||||
b'37805-6A0-A650\x00\x00',
|
||||
b'37805-6A0-A740\x00\x00',
|
||||
b'37805-6A0-A750\x00\x00',
|
||||
b'37805-6A0-A840\x00\x00',
|
||||
b'37805-6A0-A850\x00\x00',
|
||||
b'37805-6A0-C540\x00\x00',
|
||||
b'37805-6A1-H650\x00\x00',
|
||||
b'37805-6M4-B730\x00\x00',
|
||||
],
|
||||
(Ecu.shiftByWire, 0x18da0bf1, None): [
|
||||
b'54008-TVC-A910\x00\x00',
|
||||
|
@ -164,25 +173,43 @@ FW_VERSIONS = {
|
|||
b'28102-6B8-A800\x00\x00',
|
||||
b'28102-6B8-C570\x00\x00',
|
||||
b'28102-6B8-M520\x00\x00',
|
||||
b'28101-6A7-A220\x00\x00',
|
||||
b'28101-6A7-A230\x00\x00',
|
||||
b'28101-6A7-A320\x00\x00',
|
||||
b'28101-6A7-A330\x00\x00',
|
||||
b'28101-6A7-A410\x00\x00',
|
||||
b'28101-6A7-A510\x00\x00',
|
||||
b'28101-6A9-H140\x00\x00',
|
||||
b'28101-6A9-H420\x00\x00',
|
||||
],
|
||||
(Ecu.electricBrakeBooster, 0x18da2bf1, None): [
|
||||
b'46114-TVA-A060\x00\x00',
|
||||
b'46114-TVA-A080\x00\x00',
|
||||
b'46114-TVA-A120\x00\x00',
|
||||
b'46114-TVA-A320\x00\x00',
|
||||
b'46114-TVA-A050\x00\x00',
|
||||
b'46114-TVE-H550\x00\x00',
|
||||
b'46114-TVE-H560\x00\x00',
|
||||
],
|
||||
(Ecu.vsa, 0x18da28f1, None): [
|
||||
b'57114-TVA-C040\x00\x00',
|
||||
b'57114-TVA-C050\x00\x00',
|
||||
b'57114-TVA-C060\x00\x00',
|
||||
b'57114-TVA-C530\x00\x00',
|
||||
b'57114-TVA-B040\x00\x00',
|
||||
b'57114-TVA-B050\x00\x00',
|
||||
b'57114-TVA-B060\x00\x00',
|
||||
b'57114-TVE-H250\x00\x00',
|
||||
],
|
||||
(Ecu.eps, 0x18da30f1, None): [
|
||||
b'39990-TVA,A150\x00\x00', # modified firmware
|
||||
b'39990-TVA,A150\x00\x00',
|
||||
b'39990-TVA-A150\x00\x00',
|
||||
b'39990-TVA-A160\x00\x00',
|
||||
b'39990-TVA-A340\x00\x00',
|
||||
b'39990-TVA-X030\x00\x00',
|
||||
b'39990-TVA-A140\x00\x00',
|
||||
b'39990-TVE-H130\x00\x00',
|
||||
b'39990-TBX-H120\x00\x00',
|
||||
],
|
||||
(Ecu.unknown, 0x18da3af1, None): [
|
||||
b'39390-TVA-A020\x00\x00',
|
||||
|
@ -191,6 +218,8 @@ FW_VERSIONS = {
|
|||
b'77959-TVA-A460\x00\x00',
|
||||
b'77959-TVA-L420\x00\x00',
|
||||
b'77959-TVA-X330\x00\x00',
|
||||
b'77959-TVA-H230\x00\x00',
|
||||
b'77959-TBX-H230\x00\x00',
|
||||
],
|
||||
(Ecu.combinationMeter, 0x18da60f1, None): [
|
||||
b'78109-TVA-A210\x00\x00',
|
||||
|
@ -205,71 +234,11 @@ FW_VERSIONS = {
|
|||
b'78109-TVC-L010\x00\x00',
|
||||
b'78109-TVC-L210\x00\x00',
|
||||
b'78109-TVC-M510\x00\x00',
|
||||
],
|
||||
(Ecu.hud, 0x18da61f1, None): [
|
||||
b'78209-TVA-A010\x00\x00',
|
||||
],
|
||||
(Ecu.fwdRadar, 0x18dab0f1, None): [
|
||||
b'36802-TVA-A160\x00\x00',
|
||||
b'36802-TVA-A170\x00\x00',
|
||||
b'36802-TVC-A330\x00\x00',
|
||||
b'36802-TWA-A070\x00\x00',
|
||||
],
|
||||
(Ecu.fwdCamera, 0x18dab5f1, None): [
|
||||
b'36161-TVA-A060\x00\x00',
|
||||
b'36161-TVC-A330\x00\x00',
|
||||
b'36161-TWA-A070\x00\x00',
|
||||
],
|
||||
(Ecu.gateway, 0x18daeff1, None): [
|
||||
b'38897-TVA-A010\x00\x00',
|
||||
b'38897-TVA-A020\x00\x00',
|
||||
],
|
||||
},
|
||||
CAR.ACCORD_15: {
|
||||
(Ecu.programmedFuelInjection, 0x18da10f1, None): [
|
||||
b'37805-6A0-9520\x00\x00',
|
||||
b'37805-6A0-9620\x00\x00',
|
||||
b'37805-6A0-9720\x00\x00',
|
||||
b'37805-6A0-A540\x00\x00',
|
||||
b'37805-6A0-A550\x00\x00',
|
||||
b'37805-6A0-A640\x00\x00',
|
||||
b'37805-6A0-A650\x00\x00',
|
||||
b'37805-6A0-A740\x00\x00',
|
||||
b'37805-6A0-A750\x00\x00',
|
||||
b'37805-6A0-A840\x00\x00',
|
||||
b'37805-6A0-A850\x00\x00',
|
||||
b'37805-6A0-C540\x00\x00',
|
||||
b'37805-6A1-H650\x00\x00',
|
||||
b'37805-6M4-B730\x00\x00',
|
||||
],
|
||||
(Ecu.transmission, 0x18da1ef1, None): [
|
||||
b'28101-6A7-A220\x00\x00',
|
||||
b'28101-6A7-A230\x00\x00',
|
||||
b'28101-6A7-A320\x00\x00',
|
||||
b'28101-6A7-A330\x00\x00',
|
||||
b'28101-6A7-A410\x00\x00',
|
||||
b'28101-6A7-A510\x00\x00',
|
||||
b'28101-6A9-H140\x00\x00',
|
||||
b'28101-6A9-H420\x00\x00',
|
||||
],
|
||||
(Ecu.gateway, 0x18daeff1, None): [
|
||||
b'38897-TVA-A230\x00\x00',
|
||||
],
|
||||
(Ecu.electricBrakeBooster, 0x18da2bf1, None): [
|
||||
b'46114-TVA-A050\x00\x00',
|
||||
b'46114-TVA-A060\x00\x00',
|
||||
b'46114-TVA-A080\x00\x00',
|
||||
b'46114-TVA-A120\x00\x00',
|
||||
b'46114-TVE-H550\x00\x00',
|
||||
b'46114-TVE-H560\x00\x00',
|
||||
],
|
||||
(Ecu.combinationMeter, 0x18da60f1, None): [
|
||||
b'78109-TBX-H310\x00\x00',
|
||||
b'78109-TVA-A010\x00\x00',
|
||||
b'78109-TVA-A020\x00\x00',
|
||||
b'78109-TVA-A110\x00\x00',
|
||||
b'78109-TVA-A120\x00\x00',
|
||||
b'78109-TVA-A210\x00\x00',
|
||||
b'78109-TVA-A220\x00\x00',
|
||||
b'78109-TVA-A310\x00\x00',
|
||||
b'78109-TVA-C010\x00\x00',
|
||||
|
@ -281,35 +250,26 @@ FW_VERSIONS = {
|
|||
(Ecu.hud, 0x18da61f1, None): [
|
||||
b'78209-TVA-A010\x00\x00',
|
||||
],
|
||||
(Ecu.fwdCamera, 0x18dab5f1, None): [
|
||||
b'36161-TVA-A060\x00\x00',
|
||||
b'36161-TVE-H050\x00\x00',
|
||||
b'36161-TBX-H130\x00\x00',
|
||||
],
|
||||
(Ecu.srs, 0x18da53f1, None): [
|
||||
b'77959-TVA-A460\x00\x00',
|
||||
b'77959-TVA-H230\x00\x00',
|
||||
b'77959-TBX-H230\x00\x00',
|
||||
],
|
||||
(Ecu.vsa, 0x18da28f1, None): [
|
||||
b'57114-TVA-B040\x00\x00',
|
||||
b'57114-TVA-B050\x00\x00',
|
||||
b'57114-TVA-B060\x00\x00',
|
||||
b'57114-TVE-H250\x00\x00',
|
||||
],
|
||||
(Ecu.fwdRadar, 0x18dab0f1, None): [
|
||||
b'36802-TVA-A150\x00\x00',
|
||||
b'36802-TVA-A160\x00\x00',
|
||||
b'36802-TVA-A170\x00\x00',
|
||||
b'36802-TVC-A330\x00\x00',
|
||||
b'36802-TWA-A070\x00\x00',
|
||||
b'36802-TVA-A150\x00\x00',
|
||||
b'36802-TVE-H070\x00\x00',
|
||||
b'36802-TBX-H140\x00\x00',
|
||||
],
|
||||
(Ecu.eps, 0x18da30f1, None): [
|
||||
b'39990-TVA-A140\x00\x00',
|
||||
b'39990-TVA-A150\x00\x00', # Are these two different steerRatio?
|
||||
b'39990-TVA-A160\x00\x00', # Sport, Sport 2.0T and Touring 2.0T have different ratios
|
||||
b'39990-TVE-H130\x00\x00',
|
||||
b'39990-TBX-H120\x00\x00',
|
||||
(Ecu.fwdCamera, 0x18dab5f1, None): [
|
||||
b'36161-TVA-A060\x00\x00',
|
||||
b'36161-TVC-A330\x00\x00',
|
||||
b'36161-TWA-A070\x00\x00',
|
||||
b'36161-TVE-H050\x00\x00',
|
||||
b'36161-TBX-H130\x00\x00',
|
||||
],
|
||||
(Ecu.gateway, 0x18daeff1, None): [
|
||||
b'38897-TVA-A010\x00\x00',
|
||||
b'38897-TVA-A020\x00\x00',
|
||||
b'38897-TVA-A230\x00\x00',
|
||||
],
|
||||
},
|
||||
CAR.ACCORDH: {
|
||||
|
@ -1278,9 +1238,8 @@ FW_VERSIONS = {
|
|||
}
|
||||
|
||||
DBC = {
|
||||
CAR.ACCORD: dbc_dict('honda_accord_s2t_2018_can_generated', None),
|
||||
CAR.ACCORD_15: dbc_dict('honda_accord_lx15t_2018_can_generated', None),
|
||||
CAR.ACCORDH: dbc_dict('honda_accord_s2t_2018_can_generated', None),
|
||||
CAR.ACCORD: dbc_dict('honda_accord_2018_can_generated', None),
|
||||
CAR.ACCORDH: dbc_dict('honda_accord_2018_can_generated', None),
|
||||
CAR.ACURA_ILX: dbc_dict('acura_ilx_2016_can_generated', 'acura_ilx_2016_nidec'),
|
||||
CAR.ACURA_RDX: dbc_dict('acura_rdx_2018_can_generated', 'acura_ilx_2016_nidec'),
|
||||
CAR.ACURA_RDX_3G: dbc_dict('acura_rdx_2020_can_generated', None),
|
||||
|
@ -1303,7 +1262,6 @@ DBC = {
|
|||
|
||||
STEER_THRESHOLD = {
|
||||
CAR.ACCORD: 1200,
|
||||
CAR.ACCORD_15: 1200,
|
||||
CAR.ACCORDH: 1200,
|
||||
CAR.ACURA_ILX: 1200,
|
||||
CAR.ACURA_RDX: 400,
|
||||
|
@ -1327,7 +1285,6 @@ STEER_THRESHOLD = {
|
|||
|
||||
SPEED_FACTOR = {
|
||||
CAR.ACCORD: 1.,
|
||||
CAR.ACCORD_15: 1.,
|
||||
CAR.ACCORDH: 1.,
|
||||
CAR.ACURA_ILX: 1.,
|
||||
CAR.ACURA_RDX: 1.,
|
||||
|
@ -1349,5 +1306,5 @@ SPEED_FACTOR = {
|
|||
CAR.INSIGHT: 1.,
|
||||
}
|
||||
|
||||
HONDA_BOSCH = set([CAR.ACCORD, CAR.ACCORD_15, CAR.ACCORDH, CAR.CIVIC_BOSCH, CAR.CIVIC_BOSCH_DIESEL, CAR.CRV_5G, CAR.CRV_HYBRID, CAR.INSIGHT, CAR.ACURA_RDX_3G])
|
||||
HONDA_BOSCH_ALT_BRAKE_SIGNAL = set([CAR.ACCORD, CAR.ACCORD_15, CAR.CRV_5G, CAR.ACURA_RDX_3G])
|
||||
HONDA_BOSCH = set([CAR.ACCORD, CAR.ACCORDH, CAR.CIVIC_BOSCH, CAR.CIVIC_BOSCH_DIESEL, CAR.CRV_5G, CAR.CRV_HYBRID, CAR.INSIGHT, CAR.ACURA_RDX_3G])
|
||||
HONDA_BOSCH_ALT_BRAKE_SIGNAL = set([CAR.ACCORD, CAR.CRV_5G, CAR.ACURA_RDX_3G])
|
||||
|
|
|
@ -367,7 +367,8 @@ def python_replay_process(cfg, lr, fingerprint=None):
|
|||
# TODO: remove after getting new route for civic & accord
|
||||
migration = {
|
||||
"HONDA CIVIC 2016 TOURING": "HONDA CIVIC 2016",
|
||||
"HONDA ACCORD 2018 SPORT 2T": "HONDA ACCORD 2T 2018",
|
||||
"HONDA ACCORD 2018 SPORT 2T": "HONDA ACCORD 2018",
|
||||
"HONDA ACCORD 2T 2018": "HONDA ACCORD 2018",
|
||||
}
|
||||
|
||||
if fingerprint is not None:
|
||||
|
|
|
@ -1 +1 @@
|
|||
7751b7e14e53d1712e87c29c6bd8653d1bd03c71
|
||||
ea8e38e4189e5f39a91fb455701ae9b876c5bcd8
|
|
@ -49,8 +49,8 @@ routes = [
|
|||
TestRoute("03be5f2fd5c508d1|2020-04-19--18-44-15", HONDA.HRV),
|
||||
TestRoute("917b074700869333|2021-05-24--20-40-20", HONDA.ACURA_ILX),
|
||||
TestRoute("81722949a62ea724|2019-04-06--15-19-25", HONDA.ODYSSEY_CHN),
|
||||
TestRoute("08a3deb07573f157|2020-03-06--16-11-19", HONDA.ACCORD_15),
|
||||
TestRoute("1da5847ac2488106|2021-05-24--19-31-50", HONDA.ACCORD),
|
||||
TestRoute("08a3deb07573f157|2020-03-06--16-11-19", HONDA.ACCORD), # 1.5T
|
||||
TestRoute("1da5847ac2488106|2021-05-24--19-31-50", HONDA.ACCORD), # 2.0T
|
||||
TestRoute("07585b0da3c88459|2021-05-26--18-52-04", HONDA.ACCORDH),
|
||||
TestRoute("1ad763dd22ef1a0e|2020-02-29--18-37-03", HONDA.CRV_5G),
|
||||
TestRoute("0a96f86fcfe35964|2020-02-05--07-25-51", HONDA.ODYSSEY),
|
||||
|
|
Loading…
Reference in New Issue