From 78e7982caa77e60aa30825632468ad760502278a Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Mon, 29 Jan 2024 14:28:35 +0100 Subject: [PATCH] rename to RAV4_PRIME --- selfdrive/car/toyota/fingerprints.py | 2 +- selfdrive/car/toyota/interface.py | 2 +- selfdrive/car/toyota/values.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/selfdrive/car/toyota/fingerprints.py b/selfdrive/car/toyota/fingerprints.py index b706d63da97916..ef407e8cdb78fe 100644 --- a/selfdrive/car/toyota/fingerprints.py +++ b/selfdrive/car/toyota/fingerprints.py @@ -1151,7 +1151,7 @@ b'\x028646F0R11000\x00\x00\x00\x008646G0R04000\x00\x00\x00\x00', ], }, - CAR.RAV4_TSS2_SECOC: { + CAR.RAV4_PRIME: { (Ecu.engine, 0x700, None): [ b'\x018966342S7000\x00\x00\x00\x00' ], diff --git a/selfdrive/car/toyota/interface.py b/selfdrive/car/toyota/interface.py index 0656cebc5aa3ff..2a0002efade82d 100644 --- a/selfdrive/car/toyota/interface.py +++ b/selfdrive/car/toyota/interface.py @@ -115,7 +115,7 @@ def _get_params(ret, candidate, fingerprint, car_fw, experimental_long, docs): ret.tireStiffnessFactor = 0.7983 ret.mass = 3505. * CV.LB_TO_KG # mean between normal and hybrid - elif candidate in (CAR.RAV4_TSS2, CAR.RAV4_TSS2_2022, CAR.RAV4_TSS2_2023, CAR.RAV4_TSS2_SECOC): + elif candidate in (CAR.RAV4_TSS2, CAR.RAV4_TSS2_2022, CAR.RAV4_TSS2_2023, CAR.RAV4_PRIME): ret.wheelbase = 2.68986 ret.steerRatio = 14.3 ret.tireStiffnessFactor = 0.7933 diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py index 2b386cf6cfb4b0..25c5cd09d8958e 100644 --- a/selfdrive/car/toyota/values.py +++ b/selfdrive/car/toyota/values.py @@ -71,7 +71,7 @@ class CAR(StrEnum): RAV4_TSS2 = "TOYOTA RAV4 2019" RAV4_TSS2_2022 = "TOYOTA RAV4 2022" RAV4_TSS2_2023 = "TOYOTA RAV4 2023" - RAV4_TSS2_SECOC = "TOYOTA RAV4 PRIME 2021" + RAV4_PRIME = "TOYOTA RAV4 PRIME 2021" MIRAI = "TOYOTA MIRAI 2021" # TSS 2.5 SIENNA = "TOYOTA SIENNA 2018" @@ -461,7 +461,7 @@ def match_fw_to_car_fuzzy(live_fw_versions, offline_fw_versions) -> Set[str]: CAR.RAV4_TSS2: dbc_dict('toyota_nodsu_pt_generated', 'toyota_tss2_adas'), CAR.RAV4_TSS2_2022: dbc_dict('toyota_nodsu_pt_generated', None), CAR.RAV4_TSS2_2023: dbc_dict('toyota_nodsu_pt_generated', None), - CAR.RAV4_TSS2_SECOC: dbc_dict('toyota_nodsu_secoc_pt_generated', 'toyota_tss2_adas'), + CAR.RAV4_PRIME: dbc_dict('toyota_nodsu_secoc_pt_generated', 'toyota_tss2_adas'), CAR.COROLLA_TSS2: dbc_dict('toyota_nodsu_pt_generated', 'toyota_tss2_adas'), CAR.LEXUS_ES: dbc_dict('toyota_new_mc_pt_generated', 'toyota_adas'), CAR.LEXUS_ES_TSS2: dbc_dict('toyota_nodsu_pt_generated', 'toyota_tss2_adas'), @@ -481,7 +481,7 @@ def match_fw_to_car_fuzzy(live_fw_versions, offline_fw_versions) -> Set[str]: EPS_SCALE = defaultdict(lambda: 73, {CAR.PRIUS: 66, CAR.COROLLA: 88, CAR.LEXUS_IS: 77, CAR.LEXUS_RC: 77, CAR.LEXUS_CTH: 100, CAR.PRIUS_V: 100}) # Toyota/Lexus Safety Sense 2.0 and 2.5 -TSS2_CAR = {CAR.RAV4_TSS2, CAR.RAV4_TSS2_2022, CAR.RAV4_TSS2_2023, CAR.RAV4_TSS2_SECOC, CAR.COROLLA_TSS2, CAR.LEXUS_ES_TSS2, +TSS2_CAR = {CAR.RAV4_TSS2, CAR.RAV4_TSS2_2022, CAR.RAV4_TSS2_2023, CAR.RAV4_PRIME, CAR.COROLLA_TSS2, CAR.LEXUS_ES_TSS2, CAR.LEXUS_RX_TSS2, CAR.HIGHLANDER_TSS2, CAR.PRIUS_TSS2, CAR.CAMRY_TSS2, CAR.LEXUS_IS_TSS2, CAR.MIRAI, CAR.LEXUS_NX_TSS2, CAR.ALPHARD_TSS2, CAR.AVALON_TSS2, CAR.CHR_TSS2} @@ -500,4 +500,4 @@ def match_fw_to_car_fuzzy(live_fw_versions, offline_fw_versions) -> Set[str]: NO_STOP_TIMER_CAR = TSS2_CAR | {CAR.PRIUS_V, CAR.RAV4H, CAR.HIGHLANDER, CAR.SIENNA} # these cars use SecOC to authenticate messages -SECOC_CAR = {CAR.RAV4_TSS2_SECOC} +SECOC_CAR = {CAR.RAV4_PRIME}