From 79e1fe4d68d3966997afe72e4e313dc3c927f060 Mon Sep 17 00:00:00 2001 From: DevTekVE Date: Thu, 25 Jan 2024 23:44:16 +0100 Subject: [PATCH] Moving fingerprints --- selfdrive/car/honda/fingerprints.py | 41 +++++++++- selfdrive/car/honda/values.py | 43 ---------- selfdrive/car/hyundai/fingerprints.py | 104 +++++++++++++++++++++++++ selfdrive/car/hyundai/values.py | 108 -------------------------- 4 files changed, 144 insertions(+), 152 deletions(-) diff --git a/selfdrive/car/honda/fingerprints.py b/selfdrive/car/honda/fingerprints.py index 25fb88aa39..1d7fff1737 100644 --- a/selfdrive/car/honda/fingerprints.py +++ b/selfdrive/car/honda/fingerprints.py @@ -1400,4 +1400,43 @@ FW_VERSIONS = { b'37805-64S-AA10\x00\x00', ], }, -} + CAR.CLARITY: { + (Ecu.shiftByWire, 0x18da0bf1, None): [ + b'54008-TRW-A910\x00\x00', + ], + (Ecu.vsa, 0x18da28f1, None): [ + b'57114-TRW-A010\x00\x00', + b'57114-TRW-A020\x00\x00', + ], + (Ecu.eps, 0x18da30f1, None): [ + b'39990-TRW-A020\x00\x00', + b'39990-TRW,A020\x00\x00', # modified firmware + b'39990,TRW,A020\x00\x00', # extra modified firmware + ], + (Ecu.srs, 0x18da53f1, None): [ + b'77959-TRW-A210\x00\x00', + b'77959-TRW-A220\x00\x00', + ], + (Ecu.gateway, 0x18daeff1, None): [ + b'38897-TRW-A010\x00\x00', + ], + (Ecu.combinationMeter, 0x18da60f1, None): [ + b'78109-TRW-A020\x00\x00', + b'78109-TRW-A030\x00\x00', + ], + }, + CAR.ACCORD_NIDEC_4CYL: { + (Ecu.vsa, 0x18DA28F1, None): [ + b'57114-T2F-X840\x00\x00', + ], + (Ecu.fwdRadar, 0x18DAB0F1, None): [ + b'36161-T2F-A140\x00\x00', + ], + (Ecu.combinationMeter, 0x18DA60F1, None): [ + b'78109-T2F-L110\x00\x00', + ], + (Ecu.srs, 0x18DA53F1, None): [ + b'77959-T2F-A030\x00\x00', + ], + }, +} \ No newline at end of file diff --git a/selfdrive/car/honda/values.py b/selfdrive/car/honda/values.py index be85e768e1..fc44c58ba7 100644 --- a/selfdrive/car/honda/values.py +++ b/selfdrive/car/honda/values.py @@ -210,49 +210,6 @@ FW_QUERY_CONFIG = FwQueryConfig( ], ) -# SP SYNC MOVE THIS TO firmware.py new -# FW_VERSIONS = { -# CAR.CLARITY: { -# (Ecu.shiftByWire, 0x18da0bf1, None): [ -# b'54008-TRW-A910\x00\x00', -# ], -# (Ecu.vsa, 0x18da28f1, None): [ -# b'57114-TRW-A010\x00\x00', -# b'57114-TRW-A020\x00\x00', -# ], -# (Ecu.eps, 0x18da30f1, None): [ -# b'39990-TRW-A020\x00\x00', -# b'39990-TRW,A020\x00\x00', # modified firmware -# b'39990,TRW,A020\x00\x00', # extra modified firmware -# ], -# (Ecu.srs, 0x18da53f1, None): [ -# b'77959-TRW-A210\x00\x00', -# b'77959-TRW-A220\x00\x00', -# ], -# (Ecu.gateway, 0x18daeff1, None): [ -# b'38897-TRW-A010\x00\x00', -# ], -# (Ecu.combinationMeter, 0x18da60f1, None): [ -# b'78109-TRW-A020\x00\x00', -# b'78109-TRW-A030\x00\x00', -# ], -# }, -# CAR.ACCORD_NIDEC_4CYL: { -# (Ecu.vsa, 0x18DA28F1, None): [ -# b'57114-T2F-X840\x00\x00', -# ], -# (Ecu.fwdRadar, 0x18DAB0F1, None): [ -# b'36161-T2F-A140\x00\x00', -# ], -# (Ecu.combinationMeter, 0x18DA60F1, None): [ -# b'78109-T2F-L110\x00\x00', -# ], -# (Ecu.srs, 0x18DA53F1, None): [ -# b'77959-T2F-A030\x00\x00', -# ], -# }, -# } - DBC = { CAR.ACCORD_NIDEC_4CYL: dbc_dict('honda_accord_touring_2016_can_generated', 'acura_ilx_2016_nidec'), CAR.ACCORD: dbc_dict('honda_accord_2018_can_generated', None), diff --git a/selfdrive/car/hyundai/fingerprints.py b/selfdrive/car/hyundai/fingerprints.py index 56b4217403..02a834cfdd 100644 --- a/selfdrive/car/hyundai/fingerprints.py +++ b/selfdrive/car/hyundai/fingerprints.py @@ -1710,4 +1710,108 @@ FW_VERSIONS = { b'\xf1\x00US4_ RDR ----- 1.00 1.00 99110-CG000 ', ], }, + CAR.GENESIS_G70_2021_NON_SCC: { + (Ecu.eps, 0x7d4, None): [ + b'\xf1\x00IK MDPS R 1.00 1.08 57700-G9200 4I2CL108', + ], + (Ecu.fwdRadar, 0x7d0, None): [ + b'\xf1\x00IK__ SCC --CUP 1.00 1.02 96400-G9100 ', + ], + (Ecu.fwdCamera, 0x7c4, None): [ + b'\xf1\x00IK MFC MT USA LHD 1.00 1.01 95740-G9000 170920', + ], + (Ecu.engine, 0x7e0, None): [ + b'\xf1\x81606G2051\x00\x00\x00\x00\x00\x00\x00\x00', + ], + }, + CAR.KONA_NON_SCC: { + (Ecu.abs, 0x7d1, None): [ + b'\xf1\x816V5RAJ00040.ELF\xf1\x00\x00\x00\x00\x00\x00\x00', + ], + (Ecu.engine, 0x7e0, None): [ + b'\xf1\x8161699051\x00\x00\x00\x00\x00\x00\x00\x00', + ], + (Ecu.eps, 0x7d4, None): [ + b'\xf1\x00OS MDPS C 1.00 1.05 56310J9030\x00 4OSDC105', + ], + (Ecu.fwdCamera, 0x7c4, None): [ + b'\xf1\x00OS9 LKAS AT USA LHD 1.00 1.00 95740-J9200 g30', + ], + (Ecu.transmission, 0x7e1, None): [ + b'\xf1\x006T6J0_C2\x00\x006T6K1051\x00\x00TOS4N20NS2\x00\x00\x00\x00', + ], + }, + CAR.KIA_FORTE_2019_NON_SCC: { + (Ecu.eps, 0x7D4, None): [ + b'\xf1\x00BD MDPS C 1.00 1.04 56310/M6000 4BDDC104', + ], + (Ecu.fwdCamera, 0x7C4, None): [ + b'\xf1\x00BD LKAS AT USA LHD 1.00 1.02 95740-M6000 J31', + ], + (Ecu.engine, 0x7e0, None): [ + b'\xf1\x81616B5051\x00\x00\x00\x00\x00\x00\x00\x00', + ], + (Ecu.abs, 0x7d1, None): [ + b'\xf1\x816VFRAF00018.ELF\xf1\x00\x00\x00\x00\x00\x00\x00', + ], + (Ecu.transmission, 0x7e1, None): [ + b'\xf1\x87CXJQAM4966515JB0x\xa9\x98\x9b\x99fff\x98feg\x88\x88w\x88Ff\x8f\xff{\xff\xff\xff\xa8\xf6\xf1\x816V2C1051\x00\x00\xf1\x006V2B0_C2\x00\x006V2C1051\x00\x00CBD0N20NS8q\xc1&\xd2', + ], + }, + CAR.KIA_FORTE_2021_NON_SCC: { + (Ecu.eps, 0x7D4, None): [ + b'\xf1\x00BD MDPS C 1.00 1.08 56310M6000\x00 4BDDC108', + ], + (Ecu.fwdCamera, 0x7C4, None): [ + b'\xf1\x00BD LKAS AT USA LHD 1.00 1.04 95740-M6000 J33', + ], + (Ecu.engine, 0x7e0, None): [ + b'\xf1\x81616B6051\x00\x00\x00\x00\x00\x00\x00\x00', + ], + (Ecu.abs, 0x7d1, None): [ + b'\xf1\x816VFRAL00010.ELF\xf1\x00\x00\x00\x00\x00\x00\x00', + ], + (Ecu.transmission, 0x7e1, None): [ + b'\xf1\x87CXLQAM0906975JB0\x89\x88\xa6\x8aVfug\xba\x87\x94yffuxgfo\xff\x8b\xff\xff\xff\x91\x82\xf1\x816V2C1051\x00\x00\xf1\x006V2B0_C2\x00\x006V2C1051\x00\x00CBD0N20NS8q\xc1&\xd2', + ], + }, + CAR.KIA_SELTOS_2023_NON_SCC: { + (Ecu.abs, 0x7d1, None): [ + b'\xf1\x00SP ESC \t 101"\t\x01 58910-Q5510', + b'\xf1\x00SP ESC \r 100"\x04\x01 58910-Q5510', + ], + (Ecu.engine, 0x7e0, None): [ + b'\xf1\x81616K0051\x00\x00\x00\x00\x00\x00\x00\x00', + b'\xf1\x81616G2051\x00\x00\x00\x00\x00\x00\x00\x00', + ], + (Ecu.eps, 0x7d4, None): [ + b'\xf1\x00SP2 MDPS C 1.00 1.04 56310Q5240 4SPSC104', + b'\xf1\x00SP2 MDPS C 1.00 1.01 56300Q5920 ', + ], + (Ecu.fwdCamera, 0x7c4, None): [ + b'\xf1\x00SP2 MFC AT USA LHD 1.00 1.03 99210-Q5500 230208', + b'\xf1\x00SP2 MFC AT AUS RHD 1.00 1.02 99210-Q5500 220624', + ], + (Ecu.transmission, 0x7e1, None): [ + b'\xf1\x006V2B0_C2\x00\x006V2D5051\x00\x00CSP2N20NL0\x00\x00\x00\x00', + b'\xf1\x006V2B0_C2\x00\x006V2D4051\x00\x00CSP2N20KL1\x00\x00\x00\x00', + ], + }, + CAR.ELANTRA_2022_NON_SCC: { + (Ecu.eps, 0x7d4, None): [ + b'\xf1\x8756310AA030\x00\xf1\x00CN7 MDPS C 1.00 1.06 56310AA030\x00 4CNDC106', + ], + (Ecu.fwdCamera, 0x7c4, None): [ + b'\xf1\x00CN7 MFC AT USA LHD 1.00 1.01 99210-AB000 210205', + ], + (Ecu.abs, 0x7d1, None): [ + b'\xf1\x8758910-AB500\xf1\x00CN ESC \t 100 \x06\x01 58910-AB500', + ], + (Ecu.transmission, 0x7e1, None): [ + b'\xf1\x87CXNQEM4091445JB3g\x98\x98\x89\x99\x87gv\x89wuwgwv\x89hD_\xffx\xff\xff\xff\x86\xeb\xf1\x89HT6VA640A1\xf1\x82CCN0N20NS5\x00\x00\x00\x00\x00\x00', + ], + (Ecu.engine, 0x7e0, None): [ + b'\xf1\x870\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf1\x82CNDWD0ANF3XCSG8A', + ], + }, } diff --git a/selfdrive/car/hyundai/values.py b/selfdrive/car/hyundai/values.py index 99b80db9c7..08db6c6b7c 100644 --- a/selfdrive/car/hyundai/values.py +++ b/selfdrive/car/hyundai/values.py @@ -486,114 +486,6 @@ FW_QUERY_CONFIG = FwQueryConfig( match_fw_to_car_fuzzy=match_fw_to_car_fuzzy, ) -#sunnyppilot check fw versions new firmware file -# FW_VERSIONS = { -# CAR.GENESIS_G70_2021_NON_SCC: { -# (Ecu.eps, 0x7d4, None): [ -# b'\xf1\x00IK MDPS R 1.00 1.08 57700-G9200 4I2CL108', -# ], -# (Ecu.fwdRadar, 0x7d0, None): [ -# b'\xf1\x00IK__ SCC --CUP 1.00 1.02 96400-G9100 ', -# ], -# (Ecu.fwdCamera, 0x7c4, None): [ -# b'\xf1\x00IK MFC MT USA LHD 1.00 1.01 95740-G9000 170920', -# ], -# (Ecu.engine, 0x7e0, None): [ -# b'\xf1\x81606G2051\x00\x00\x00\x00\x00\x00\x00\x00', -# ], -# }, -# CAR.KONA_NON_SCC: { -# (Ecu.abs, 0x7d1, None): [ -# b'\xf1\x816V5RAJ00040.ELF\xf1\x00\x00\x00\x00\x00\x00\x00', -# ], -# (Ecu.engine, 0x7e0, None): [ -# b'\xf1\x8161699051\x00\x00\x00\x00\x00\x00\x00\x00', -# ], -# (Ecu.eps, 0x7d4, None): [ -# b'\xf1\x00OS MDPS C 1.00 1.05 56310J9030\x00 4OSDC105', -# ], -# (Ecu.fwdCamera, 0x7c4, None): [ -# b'\xf1\x00OS9 LKAS AT USA LHD 1.00 1.00 95740-J9200 g30', -# ], -# (Ecu.transmission, 0x7e1, None): [ -# b'\xf1\x006T6J0_C2\x00\x006T6K1051\x00\x00TOS4N20NS2\x00\x00\x00\x00', -# ], -# }, -# CAR.KIA_FORTE_2019_NON_SCC: { -# (Ecu.eps, 0x7D4, None): [ -# b'\xf1\x00BD MDPS C 1.00 1.04 56310/M6000 4BDDC104', -# ], -# (Ecu.fwdCamera, 0x7C4, None): [ -# b'\xf1\x00BD LKAS AT USA LHD 1.00 1.02 95740-M6000 J31', -# ], -# (Ecu.engine, 0x7e0, None): [ -# b'\xf1\x81616B5051\x00\x00\x00\x00\x00\x00\x00\x00', -# ], -# (Ecu.abs, 0x7d1, None): [ -# b'\xf1\x816VFRAF00018.ELF\xf1\x00\x00\x00\x00\x00\x00\x00', -# ], -# (Ecu.transmission, 0x7e1, None): [ -# b'\xf1\x87CXJQAM4966515JB0x\xa9\x98\x9b\x99fff\x98feg\x88\x88w\x88Ff\x8f\xff{\xff\xff\xff\xa8\xf6\xf1\x816V2C1051\x00\x00\xf1\x006V2B0_C2\x00\x006V2C1051\x00\x00CBD0N20NS8q\xc1&\xd2', -# ], -# }, -# CAR.KIA_FORTE_2021_NON_SCC: { -# (Ecu.eps, 0x7D4, None): [ -# b'\xf1\x00BD MDPS C 1.00 1.08 56310M6000\x00 4BDDC108', -# ], -# (Ecu.fwdCamera, 0x7C4, None): [ -# b'\xf1\x00BD LKAS AT USA LHD 1.00 1.04 95740-M6000 J33', -# ], -# (Ecu.engine, 0x7e0, None): [ -# b'\xf1\x81616B6051\x00\x00\x00\x00\x00\x00\x00\x00', -# ], -# (Ecu.abs, 0x7d1, None): [ -# b'\xf1\x816VFRAL00010.ELF\xf1\x00\x00\x00\x00\x00\x00\x00', -# ], -# (Ecu.transmission, 0x7e1, None): [ -# b'\xf1\x87CXLQAM0906975JB0\x89\x88\xa6\x8aVfug\xba\x87\x94yffuxgfo\xff\x8b\xff\xff\xff\x91\x82\xf1\x816V2C1051\x00\x00\xf1\x006V2B0_C2\x00\x006V2C1051\x00\x00CBD0N20NS8q\xc1&\xd2', -# ], -# }, -# CAR.KIA_SELTOS_2023_NON_SCC: { -# (Ecu.abs, 0x7d1, None): [ -# b'\xf1\x00SP ESC \t 101"\t\x01 58910-Q5510', -# b'\xf1\x00SP ESC \r 100"\x04\x01 58910-Q5510', -# ], -# (Ecu.engine, 0x7e0, None): [ -# b'\xf1\x81616K0051\x00\x00\x00\x00\x00\x00\x00\x00', -# b'\xf1\x81616G2051\x00\x00\x00\x00\x00\x00\x00\x00', -# ], -# (Ecu.eps, 0x7d4, None): [ -# b'\xf1\x00SP2 MDPS C 1.00 1.04 56310Q5240 4SPSC104', -# b'\xf1\x00SP2 MDPS C 1.00 1.01 56300Q5920 ', -# ], -# (Ecu.fwdCamera, 0x7c4, None): [ -# b'\xf1\x00SP2 MFC AT USA LHD 1.00 1.03 99210-Q5500 230208', -# b'\xf1\x00SP2 MFC AT AUS RHD 1.00 1.02 99210-Q5500 220624', -# ], -# (Ecu.transmission, 0x7e1, None): [ -# b'\xf1\x006V2B0_C2\x00\x006V2D5051\x00\x00CSP2N20NL0\x00\x00\x00\x00', -# b'\xf1\x006V2B0_C2\x00\x006V2D4051\x00\x00CSP2N20KL1\x00\x00\x00\x00', -# ], -# }, -# CAR.ELANTRA_2022_NON_SCC: { -# (Ecu.eps, 0x7d4, None): [ -# b'\xf1\x8756310AA030\x00\xf1\x00CN7 MDPS C 1.00 1.06 56310AA030\x00 4CNDC106', -# ], -# (Ecu.fwdCamera, 0x7c4, None): [ -# b'\xf1\x00CN7 MFC AT USA LHD 1.00 1.01 99210-AB000 210205', -# ], -# (Ecu.abs, 0x7d1, None): [ -# b'\xf1\x8758910-AB500\xf1\x00CN ESC \t 100 \x06\x01 58910-AB500', -# ], -# (Ecu.transmission, 0x7e1, None): [ -# b'\xf1\x87CXNQEM4091445JB3g\x98\x98\x89\x99\x87gv\x89wuwgwv\x89hD_\xffx\xff\xff\xff\x86\xeb\xf1\x89HT6VA640A1\xf1\x82CCN0N20NS5\x00\x00\x00\x00\x00\x00', -# ], -# (Ecu.engine, 0x7e0, None): [ -# b'\xf1\x870\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf1\x82CNDWD0ANF3XCSG8A', -# ], -# }, -# } - CHECKSUM = { "crc8": [CAR.SANTA_FE, CAR.SONATA, CAR.PALISADE, CAR.KIA_SELTOS, CAR.ELANTRA_2021, CAR.ELANTRA_HEV_2021, CAR.SONATA_HYBRID, CAR.SANTA_FE_2022, CAR.KIA_K5_2021, CAR.SANTA_FE_HEV_2022, CAR.SANTA_FE_PHEV_2022,