|
|
|
@ -86,6 +86,7 @@ class CAR: |
|
|
|
|
VELOSTER = "HYUNDAI VELOSTER 2019" |
|
|
|
|
SONATA_HYBRID = "HYUNDAI SONATA HYBRID 2021" |
|
|
|
|
IONIQ_5 = "HYUNDAI IONIQ 5 2022" |
|
|
|
|
TUCSON_4TH_GEN = "HYUNDAI TUCSON 4TH GEN" |
|
|
|
|
TUCSON_HYBRID_4TH_GEN = "HYUNDAI TUCSON HYBRID 4TH GEN" |
|
|
|
|
SANTA_CRUZ_1ST_GEN = "HYUNDAI SANTA CRUZ 1ST GEN" |
|
|
|
|
|
|
|
|
@ -157,11 +158,15 @@ CAR_INFO: Dict[str, Optional[Union[HyundaiCarInfo, List[HyundaiCarInfo]]]] = { |
|
|
|
|
CAR.VELOSTER: HyundaiCarInfo("Hyundai Veloster 2019-20", min_enable_speed=5. * CV.MPH_TO_MS, harness=Harness.hyundai_e), |
|
|
|
|
CAR.SONATA_HYBRID: HyundaiCarInfo("Hyundai Sonata Hybrid 2020-22", "All", harness=Harness.hyundai_a), |
|
|
|
|
CAR.IONIQ_5: [ |
|
|
|
|
HyundaiCarInfo("Hyundai Ioniq 5 (without HDA II) 2022-23" , "Highway Driving Assist", harness=Harness.hyundai_k), |
|
|
|
|
HyundaiCarInfo("Hyundai Ioniq 5 (without HDA II) 2022-23", "Highway Driving Assist", harness=Harness.hyundai_k), |
|
|
|
|
HyundaiCarInfo("Hyundai Ioniq 5 (with HDA II) 2022-23", "Highway Driving Assist II", harness=Harness.hyundai_q), |
|
|
|
|
], |
|
|
|
|
CAR.TUCSON_4TH_GEN: [ |
|
|
|
|
HyundaiCarInfo("Hyundai Tucson 2022", harness=Harness.hyundai_n), |
|
|
|
|
HyundaiCarInfo("Hyundai Tucson 2023", "All", harness=Harness.hyundai_n), |
|
|
|
|
], |
|
|
|
|
CAR.TUCSON_HYBRID_4TH_GEN: HyundaiCarInfo("Hyundai Tucson Hybrid 2022", "All", harness=Harness.hyundai_n), |
|
|
|
|
CAR.SANTA_CRUZ_1ST_GEN: HyundaiCarInfo("Hyundai Santa Cruz 2021-22", "Smart Cruise Control (SCC)", harness=Harness.hyundai_n), |
|
|
|
|
CAR.SANTA_CRUZ_1ST_GEN: HyundaiCarInfo("Hyundai Santa Cruz 2021-22", harness=Harness.hyundai_n), |
|
|
|
|
|
|
|
|
|
# Kia |
|
|
|
|
CAR.KIA_FORTE: HyundaiCarInfo("Kia Forte 2019-21", harness=Harness.hyundai_g), |
|
|
|
@ -184,7 +189,7 @@ CAR_INFO: Dict[str, Optional[Union[HyundaiCarInfo, List[HyundaiCarInfo]]]] = { |
|
|
|
|
HyundaiCarInfo("Kia Optima Hybrid 2019"), |
|
|
|
|
], |
|
|
|
|
CAR.KIA_SELTOS: HyundaiCarInfo("Kia Seltos 2021", harness=Harness.hyundai_a), |
|
|
|
|
CAR.KIA_SPORTAGE_5TH_GEN: HyundaiCarInfo("Kia Sportage 2023", "Smart Cruise Control (SCC)", harness=Harness.hyundai_n), |
|
|
|
|
CAR.KIA_SPORTAGE_5TH_GEN: HyundaiCarInfo("Kia Sportage 2023", harness=Harness.hyundai_n), |
|
|
|
|
CAR.KIA_SORENTO: [ |
|
|
|
|
HyundaiCarInfo("Kia Sorento 2018", "Advanced Smart Cruise Control", "https://www.youtube.com/watch?v=Fkh3s6WHJz8", harness=Harness.hyundai_c), |
|
|
|
|
HyundaiCarInfo("Kia Sorento 2019", video_link="https://www.youtube.com/watch?v=Fkh3s6WHJz8", harness=Harness.hyundai_e), |
|
|
|
@ -1435,6 +1440,14 @@ FW_VERSIONS = { |
|
|
|
|
b'\xf1\x00NE1 MFC AT USA LHD 1.00 1.05 99211-GI010 220614', |
|
|
|
|
], |
|
|
|
|
}, |
|
|
|
|
CAR.TUCSON_4TH_GEN: { |
|
|
|
|
(Ecu.fwdCamera, 0x7c4, None): [ |
|
|
|
|
b'\xf1\x00NX4 FR_CMR AT USA LHD 1.00 1.01 99211-N9240 14T', |
|
|
|
|
], |
|
|
|
|
(Ecu.fwdRadar, 0x7d0, None): [ |
|
|
|
|
b'\xf1\x00NX4__ 1.01 1.00 99110-N9100 ', |
|
|
|
|
], |
|
|
|
|
}, |
|
|
|
|
CAR.TUCSON_HYBRID_4TH_GEN: { |
|
|
|
|
(Ecu.fwdCamera, 0x7c4, None): [ |
|
|
|
|
b'\xf1\x00NX4 FR_CMR AT USA LHD 1.00 1.00 99211-N9240 14Q', |
|
|
|
@ -1496,7 +1509,7 @@ FEATURES = { |
|
|
|
|
"use_fca": {CAR.SONATA, CAR.SONATA_HYBRID, CAR.ELANTRA, CAR.ELANTRA_2021, CAR.ELANTRA_HEV_2021, CAR.KIA_STINGER, CAR.IONIQ_EV_2020, CAR.IONIQ_PHEV, CAR.KONA_EV, CAR.KIA_FORTE, CAR.KIA_NIRO_EV, CAR.PALISADE, CAR.GENESIS_G70, CAR.GENESIS_G70_2020, CAR.KONA, CAR.SANTA_FE, CAR.KIA_SELTOS, CAR.KONA_HEV, CAR.SANTA_FE_2022, CAR.KIA_K5_2021, CAR.IONIQ_HEV_2022, CAR.SANTA_FE_HEV_2022, CAR.SANTA_FE_PHEV_2022, CAR.TUCSON, CAR.KONA_EV_2022, CAR.KIA_STINGER_2022}, |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
CANFD_CAR = {CAR.KIA_EV6, CAR.IONIQ_5, CAR.TUCSON_HYBRID_4TH_GEN, CAR.KIA_SPORTAGE_HYBRID_5TH_GEN, CAR.SANTA_CRUZ_1ST_GEN, CAR.KIA_SPORTAGE_5TH_GEN, CAR.GENESIS_GV70_1ST_GEN, CAR.KIA_SORENTO_PHEV_4TH_GEN} |
|
|
|
|
CANFD_CAR = {CAR.KIA_EV6, CAR.IONIQ_5, CAR.TUCSON_4TH_GEN, CAR.TUCSON_HYBRID_4TH_GEN, CAR.KIA_SPORTAGE_HYBRID_5TH_GEN, CAR.SANTA_CRUZ_1ST_GEN, CAR.KIA_SPORTAGE_5TH_GEN, CAR.GENESIS_GV70_1ST_GEN, CAR.KIA_SORENTO_PHEV_4TH_GEN} |
|
|
|
|
|
|
|
|
|
# The radar does SCC on these cars when HDA I, rather than the camera |
|
|
|
|
CANFD_RADAR_SCC_CAR = {CAR.GENESIS_GV70_1ST_GEN, CAR.KIA_SORENTO_PHEV_4TH_GEN} |
|
|
|
@ -1555,6 +1568,7 @@ DBC = { |
|
|
|
|
CAR.KIA_CEED: dbc_dict('hyundai_kia_generic', None), |
|
|
|
|
CAR.KIA_EV6: dbc_dict('hyundai_canfd', None), |
|
|
|
|
CAR.SONATA_HYBRID: dbc_dict('hyundai_kia_generic', 'hyundai_kia_mando_front_radar_generated'), |
|
|
|
|
CAR.TUCSON_4TH_GEN: dbc_dict('hyundai_canfd', None), |
|
|
|
|
CAR.TUCSON_HYBRID_4TH_GEN: dbc_dict('hyundai_canfd', None), |
|
|
|
|
CAR.IONIQ_5: dbc_dict('hyundai_canfd', None), |
|
|
|
|
CAR.SANTA_CRUZ_1ST_GEN: dbc_dict('hyundai_canfd', None), |
|
|
|
|