@ -118,6 +118,7 @@ class CAR:
KIA_STINGER_2022 = " KIA STINGER 2022 "
KIA_STINGER_2022 = " KIA STINGER 2022 "
KIA_CEED = " KIA CEED INTRO ED 2019 "
KIA_CEED = " KIA CEED INTRO ED 2019 "
KIA_EV6 = " KIA EV6 2022 "
KIA_EV6 = " KIA EV6 2022 "
KIA_CARNIVAL_4TH_GEN = " KIA CARNIVAL 4TH GEN "
# Genesis
# Genesis
GENESIS_GV60_EV_1ST_GEN = " GENESIS GV60 ELECTRIC 1ST GEN "
GENESIS_GV60_EV_1ST_GEN = " GENESIS GV60 ELECTRIC 1ST GEN "
@ -241,6 +242,10 @@ CAR_INFO: Dict[str, Optional[Union[HyundaiCarInfo, List[HyundaiCarInfo]]]] = {
HyundaiCarInfo ( " Kia EV6 (without HDA II) 2022-23 " , " Highway Driving Assist " , car_parts = CarParts . common ( [ CarHarness . hyundai_l ] ) ) ,
HyundaiCarInfo ( " Kia EV6 (without HDA II) 2022-23 " , " Highway Driving Assist " , car_parts = CarParts . common ( [ CarHarness . hyundai_l ] ) ) ,
HyundaiCarInfo ( " Kia EV6 (with HDA II) 2022-23 " , " Highway Driving Assist II " , car_parts = CarParts . common ( [ CarHarness . hyundai_p ] ) )
HyundaiCarInfo ( " Kia EV6 (with HDA II) 2022-23 " , " Highway Driving Assist II " , car_parts = CarParts . common ( [ CarHarness . hyundai_p ] ) )
] ,
] ,
CAR . KIA_CARNIVAL_4TH_GEN : [
HyundaiCarInfo ( " Kia Carnival 2023 " , car_parts = CarParts . common ( [ CarHarness . hyundai_a ] ) ) ,
# HyundaiCarInfo("Kia Carnival (China only) 2023", car_parts=CarParts.common([CarHarness.hyundai_k]))
] ,
# Genesis
# Genesis
CAR . GENESIS_GV60_EV_1ST_GEN : [
CAR . GENESIS_GV60_EV_1ST_GEN : [
@ -1859,6 +1864,14 @@ FW_VERSIONS = {
b ' \xf1 \x00 JX1_ SCC FHCUP 1.00 1.01 99110-T6100 ' ,
b ' \xf1 \x00 JX1_ SCC FHCUP 1.00 1.01 99110-T6100 ' ,
] ,
] ,
} ,
} ,
CAR . KIA_CARNIVAL_4TH_GEN : {
( Ecu . fwdCamera , 0x7c4 , None ) : [
b ' \xf1 \x00 KA4 MFC AT USA LHD 1.00 1.06 99210-R0000 220221 ' ,
] ,
( Ecu . fwdRadar , 0x7d0 , None ) : [
b ' \xf1 \x00 KA4_ SCC FHCUP 1.00 1.03 99110-R0000 ' ,
] ,
} ,
}
}
CHECKSUM = {
CHECKSUM = {
@ -1873,10 +1886,10 @@ CAN_GEARS = {
" use_elect_gears " : { CAR . KIA_NIRO_EV , CAR . KIA_NIRO_PHEV , CAR . KIA_NIRO_HEV_2021 , CAR . KIA_OPTIMA_H , CAR . IONIQ_EV_LTD , CAR . KONA_EV , CAR . IONIQ , CAR . IONIQ_EV_2020 , CAR . IONIQ_PHEV , CAR . ELANTRA_HEV_2021 , CAR . SONATA_HYBRID , CAR . KONA_HEV , CAR . IONIQ_HEV_2022 , CAR . SANTA_FE_HEV_2022 , CAR . SANTA_FE_PHEV_2022 , CAR . IONIQ_PHEV_2019 , CAR . KONA_EV_2022 , CAR . KIA_K5_HEV_2020 } ,
" use_elect_gears " : { CAR . KIA_NIRO_EV , CAR . KIA_NIRO_PHEV , CAR . KIA_NIRO_HEV_2021 , CAR . KIA_OPTIMA_H , CAR . IONIQ_EV_LTD , CAR . KONA_EV , CAR . IONIQ , CAR . IONIQ_EV_2020 , CAR . IONIQ_PHEV , CAR . ELANTRA_HEV_2021 , CAR . SONATA_HYBRID , CAR . KONA_HEV , CAR . IONIQ_HEV_2022 , CAR . SANTA_FE_HEV_2022 , CAR . SANTA_FE_PHEV_2022 , CAR . IONIQ_PHEV_2019 , CAR . KONA_EV_2022 , CAR . KIA_K5_HEV_2020 } ,
}
}
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 , CAR . GENESIS_GV60_EV_1ST_GEN , CAR . KIA_SORENTO_4TH_GEN , CAR . KIA_NIRO_HEV_2ND_GEN , CAR . KIA_NIRO_EV_2ND_GEN , CAR . GENESIS_GV80 }
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 , CAR . GENESIS_GV60_EV_1ST_GEN , CAR . KIA_SORENTO_4TH_GEN , CAR . KIA_NIRO_HEV_2ND_GEN , CAR . KIA_NIRO_EV_2ND_GEN , CAR . GENESIS_GV80 , CAR . KIA_CARNIVAL_4TH_GEN }
# The radar does SCC on these cars when HDA I, rather than the camera
# 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 , CAR . KIA_SORENTO_4TH_GEN , CAR . GENESIS_GV80 }
CANFD_RADAR_SCC_CAR = { CAR . GENESIS_GV70_1ST_GEN , CAR . KIA_SORENTO_PHEV_4TH_GEN , CAR . KIA_SORENTO_4TH_GEN , CAR . GENESIS_GV80 , CAR . KIA_CARNIVAL_4TH_GEN }
# The camera does SCC on these cars, rather than the radar
# The camera does SCC on these cars, rather than the radar
CAMERA_SCC_CAR = { CAR . KONA_EV_2022 , }
CAMERA_SCC_CAR = { CAR . KONA_EV_2022 , }
@ -1947,4 +1960,5 @@ DBC = {
CAR . KIA_NIRO_HEV_2ND_GEN : dbc_dict ( ' hyundai_canfd ' , None ) ,
CAR . KIA_NIRO_HEV_2ND_GEN : dbc_dict ( ' hyundai_canfd ' , None ) ,
CAR . KIA_NIRO_EV_2ND_GEN : dbc_dict ( ' hyundai_canfd ' , None ) ,
CAR . KIA_NIRO_EV_2ND_GEN : dbc_dict ( ' hyundai_canfd ' , None ) ,
CAR . GENESIS_GV80 : dbc_dict ( ' hyundai_canfd ' , None ) ,
CAR . GENESIS_GV80 : dbc_dict ( ' hyundai_canfd ' , None ) ,
CAR . KIA_CARNIVAL_4TH_GEN : dbc_dict ( ' hyundai_canfd ' , None ) ,
}
}