diff --git a/selfdrive/car/hyundai/values.py b/selfdrive/car/hyundai/values.py index 81f57af5ad..ecc18ce000 100644 --- a/selfdrive/car/hyundai/values.py +++ b/selfdrive/car/hyundai/values.py @@ -28,91 +28,91 @@ class CarControllerParams: class CAR(Enum): # Hyundai - ELANTRA = "HYUNDAI ELANTRA 2017" - ELANTRA_2021 = "HYUNDAI ELANTRA 2021" - ELANTRA_HEV_2021 = "HYUNDAI ELANTRA HYBRID 2021" - ELANTRA_GT_I30 = "HYUNDAI I30 N LINE 2019 & GT 2018 DCT" - HYUNDAI_GENESIS = "HYUNDAI GENESIS 2015-2016" - IONIQ = "HYUNDAI IONIQ HYBRID 2017-2019" - IONIQ_HEV_2022 = "HYUNDAI IONIQ HYBRID 2020-2022" - IONIQ_EV_LTD = "HYUNDAI IONIQ ELECTRIC LIMITED 2019" - IONIQ_EV_2020 = "HYUNDAI IONIQ ELECTRIC 2020" - IONIQ_PHEV = "HYUNDAI IONIQ PHEV 2020" - KONA = "HYUNDAI KONA 2020" - KONA_EV = "HYUNDAI KONA ELECTRIC 2019" - KONA_HEV = "HYUNDAI KONA HYBRID 2020" - SANTA_FE = "HYUNDAI SANTA FE 2019" - SANTA_FE_2022 = "HYUNDAI SANTA FE 2022" - SANTA_FE_HEV_2022 = "HYUNDAI SANTA FE HYBRID 2022" - SANTA_FE_PHEV_2022 = "HYUNDAI SANTA FE PlUG-IN HYBRID 2022" - SONATA = "HYUNDAI SONATA 2020" - SONATA_LF = "HYUNDAI SONATA 2019" - PALISADE = "HYUNDAI PALISADE 2020" - VELOSTER = "HYUNDAI VELOSTER 2019" - SONATA_HYBRID = "HYUNDAI SONATA HYBRID 2021" + ELANTRA = 0 + ELANTRA_2021 = 1 + ELANTRA_HEV_2021 = 2 + ELANTRA_GT_I30 = 3 + HYUNDAI_GENESIS = 4 + IONIQ = 5 + IONIQ_HEV_2022 = 6 + IONIQ_EV_LTD = 7 + IONIQ_EV_2020 = 8 + IONIQ_PHEV = 9 + KONA = 10 + KONA_EV = 11 + KONA_HEV = 12 + SANTA_FE = 13 + SANTA_FE_2022 = 14 + SANTA_FE_HEV_2022 = 15 + SANTA_FE_PHEV_2022 = 16 + SONATA = 17 + SONATA_LF = 18 + PALISADE = 19 + VELOSTER = 20 + SONATA_HYBRID = 21 # Kia - KIA_FORTE = "KIA FORTE E 2018 & GT 2021" - KIA_K5_2021 = "KIA K5 2021" - KIA_NIRO_EV = "KIA NIRO EV 2020" - KIA_NIRO_HEV = "KIA NIRO HYBRID 2019" - KIA_NIRO_HEV_2021 = "KIA NIRO HYBRID 2021" - KIA_OPTIMA = "KIA OPTIMA SX 2019 & 2016" - KIA_OPTIMA_H = "KIA OPTIMA HYBRID 2017 & SPORTS 2019" - KIA_SELTOS = "KIA SELTOS 2021" - KIA_SORENTO = "KIA SORENTO GT LINE 2018" - KIA_STINGER = "KIA STINGER GT2 2018" - KIA_CEED = "KIA CEED INTRO ED 2019" + KIA_FORTE = 22 + KIA_K5_2021 = 23 + KIA_NIRO_EV = 24 + KIA_NIRO_HEV = 25 + KIA_NIRO_HEV_2021 = 26 + KIA_OPTIMA = 27 + KIA_OPTIMA_H = 28 + KIA_SELTOS = 29 + KIA_SORENTO = 30 + KIA_STINGER = 31 + KIA_CEED = 32 # Genesis - GENESIS_G70 = "GENESIS G70 2018" - GENESIS_G70_2020 = "GENESIS G70 2020" - GENESIS_G80 = "GENESIS G80 2017" - GENESIS_G90 = "GENESIS G90 2017" + GENESIS_G70 = 33 + GENESIS_G70_2020 = 34 + GENESIS_G80 = 35 + GENESIS_G90 = 36 CAR_INFO = { - CAR.ELANTRA: CarInfo("HYUNDAI ELANTRA 2017", {2017, 2018, 2019}, "SCC + LKAS"), - CAR.ELANTRA_2021: CarInfo("HYUNDAI ELANTRA 2021", {2021}, "SCC + LKAS"), - CAR.ELANTRA_HEV_2021: CarInfo("HYUNDAI ELANTRA HYBRID 2021", {2021}, "SCC + LKAS"), - CAR.ELANTRA_GT_I30: CarInfo("HYUNDAI I30 N LINE 2019 & GT 2018 DCT", {2018, 2019}, "SCC + LKAS"), - CAR.HYUNDAI_GENESIS: CarInfo("HYUNDAI GENESIS 2015-2016", {2015, 2016}, "SCC + LKAS"), - CAR.IONIQ: CarInfo("HYUNDAI IONIQ HYBRID 2017-2019", {2017, 2018, 2019}, "SCC + LKAS"), - CAR.IONIQ_HEV_2022: CarInfo("HYUNDAI IONIQ HYBRID 2020-2022", {2020, 2021, 2022}, "SCC + LFA"), - CAR.IONIQ_EV_LTD: CarInfo("HYUNDAI IONIQ ELECTRIC LIMITED 2019", {2019}, "SCC + LKAS"), - CAR.IONIQ_EV_2020: CarInfo("HYUNDAI IONIQ ELECTRIC 2020", {2020}, "SCC + LKAS"), - CAR.IONIQ_PHEV: CarInfo("HYUNDAI IONIQ PHEV 2020", {2020, 2021}, "SCC + LKAS"), - CAR.KONA: CarInfo("HYUNDAI KONA 2020", {2020}, "SCC + LKAS"), - CAR.KONA_EV: CarInfo("HYUNDAI KONA ELECTRIC 2019", {2018, 2019}, "SCC + LKAS"), - CAR.KONA_HEV: CarInfo("HYUNDAI KONA HYBRID 2020", {2020}, "SCC + LKAS"), - CAR.SANTA_FE: CarInfo("HYUNDAI SANTA FE 2019", {2019, 2020}), - CAR.SANTA_FE_2022: CarInfo("HYUNDAI SANTA FE 2022", {2021, 2022}), - CAR.SANTA_FE_HEV_2022: CarInfo("HYUNDAI SANTA FE HYBRID 2022", {2022}), - CAR.SANTA_FE_PHEV_2022: CarInfo("HYUNDAI SANTA FE PlUG-IN HYBRID 2022", {2022}), - CAR.SONATA: CarInfo("HYUNDAI SONATA 2020", {2020, 2021, 2022}), - CAR.SONATA_LF: CarInfo("HYUNDAI SONATA 2019", {2018, 2019}, "SCC + LKAS"), - CAR.PALISADE: CarInfo("HYUNDAI PALISADE 2020", {2020, 2021}), - CAR.VELOSTER: CarInfo("HYUNDAI VELOSTER 2019", {2019, 2020}, "SCC + LKAS"), - CAR.SONATA_HYBRID: CarInfo("HYUNDAI SONATA HYBRID 2021", {2021, 2022}), + CAR.ELANTRA: CarInfo("Hyundai Elantra", {2017, 2018, 2019}, "SCC + LKAS"), + CAR.ELANTRA_2021: CarInfo("Hyundai Elantra", {2021}, "SCC + LKAS"), + CAR.ELANTRA_HEV_2021: CarInfo("Hyundai Elantra Hybrid", {2021}, "SCC + LKAS"), + CAR.ELANTRA_GT_I30: CarInfo("Hyundai i30 N Line 2019 & GT 2018 DCT", {2018, 2019}, "SCC + LKAS"), + CAR.HYUNDAI_GENESIS: CarInfo("Hyundai Genesis", {2015, 2016}, "SCC + LKAS"), + CAR.IONIQ: CarInfo("Hyundai Ioniq Hybrid", {2017, 2018, 2019}, "SCC + LKAS"), + CAR.IONIQ_HEV_2022: CarInfo("Hyundai Ioniq Hybrid", {2020, 2021, 2022}, "SCC + LFA"), + CAR.IONIQ_EV_LTD: CarInfo("Hyundai Ioniq Electric Limited", {2019}, "SCC + LKAS"), + CAR.IONIQ_EV_2020: CarInfo("Hyundai Ioniq Electric", {2020}, "SCC + LKAS"), + CAR.IONIQ_PHEV: CarInfo("Hyundai Ioniq Plug-In Hybrid", {2020, 2021}, "SCC + LKAS"), + CAR.KONA: CarInfo("Hyundai Kona", {2020}, "SCC + LKAS"), + CAR.KONA_EV: CarInfo("Hyundai Kona Electric", {2018, 2019}, "SCC + LKAS"), + CAR.KONA_HEV: CarInfo("Hyundai Kona Hybrid", {2020}, "SCC + LKAS"), + CAR.SANTA_FE: CarInfo("Hyundai Santa Fe", {2019, 2020}), + CAR.SANTA_FE_2022: CarInfo("Hyundai Santa Fe", {2021, 2022}), + CAR.SANTA_FE_HEV_2022: CarInfo("Hyundai Santa Fe Hybrid", {2022}), + CAR.SANTA_FE_PHEV_2022: CarInfo("Hyundai Santa Fe Plug-In Hybrid", {2022}), + CAR.SONATA: CarInfo("Hyundai Sonata", {2020, 2021, 2022}), + CAR.SONATA_LF: CarInfo("Hyundai Sonata", {2018, 2019}, "SCC + LKAS"), + CAR.PALISADE: CarInfo("Hyundai Palisade", {2020, 2021}), + CAR.VELOSTER: CarInfo("Hyundai Veloster", {2019, 2020}, "SCC + LKAS"), + CAR.SONATA_HYBRID: CarInfo("Hyundai Sonata Hybrid", {2021, 2022}), # Kia - CAR.KIA_FORTE: CarInfo("KIA FORTE E 2018 & GT 2021", {2018, 2019, 2020, 2021}, "SCC + LKAS"), - CAR.KIA_K5_2021: CarInfo("KIA K5 2021", {2021, 2022}, "SCC + LFA"), - CAR.KIA_NIRO_EV: CarInfo("KIA NIRO EV 2020", {2019, 2020, 2021, 2022}), - CAR.KIA_NIRO_HEV: CarInfo("KIA NIRO HYBRID 2019", {2019}, "SCC + LKAS"), # FIXME: this is PHEV in the readme? - CAR.KIA_NIRO_HEV_2021: CarInfo("KIA NIRO HYBRID 2021", {2021}, "SCC + LKAS"), - CAR.KIA_OPTIMA: CarInfo("KIA OPTIMA SX 2019 & 2016", {2016, 2017, 2018, 2019}), - CAR.KIA_OPTIMA_H: CarInfo("KIA OPTIMA HYBRID 2017 & SPORTS 2019", {}), - CAR.KIA_SELTOS: CarInfo("KIA SELTOS 2021", {}), - CAR.KIA_SORENTO: CarInfo("KIA SORENTO GT LINE 2018", {}), - CAR.KIA_STINGER: CarInfo("KIA STINGER GT2 2018", {}), - CAR.KIA_CEED: CarInfo("KIA CEED INTRO ED 2019", {}), + CAR.KIA_FORTE: CarInfo("Kia Forte E 2018 & GT 2021", {2018, 2019, 2020, 2021}, "SCC + LKAS"), # TODO: figure out which cars this exactly supports + CAR.KIA_K5_2021: CarInfo("Kia K5", {2021, 2022}, "SCC + LFA"), + CAR.KIA_NIRO_EV: CarInfo("Kia Niro EV", {2019, 2020, 2021, 2022}), + CAR.KIA_NIRO_HEV: CarInfo("Kia Niro Plug-In Hybrid", {2019}, "SCC + LKAS"), + CAR.KIA_NIRO_HEV_2021: CarInfo("Kia Niro Hybrid", {2021}, "SCC + LKAS"), + CAR.KIA_OPTIMA: CarInfo("Kia Optima SX 2019 & 2016", {2017, 2019}, "SCC + LKAS"), + CAR.KIA_OPTIMA_H: CarInfo("Kia Optima Hybrid 2017 & Sports 2019", {2017, 2019}, "SCC + LKAS"), + CAR.KIA_SELTOS: CarInfo("Kia Seltos", {2021}, "SCC + LKAS"), + CAR.KIA_SORENTO: CarInfo("Kia Sorento GT-Line", {2018, 2019}, "SCC + LKAS"), + CAR.KIA_STINGER: CarInfo("Kia Stinger GT2", {2018}, "SCC + LKAS"), + CAR.KIA_CEED: CarInfo("Kia Ceed Intro Edition", {2019}, "SCC + LKAS"), # Genesis - CAR.GENESIS_G70: CarInfo("GENESIS G70 2018", {}), - CAR.GENESIS_G70_2020: CarInfo("GENESIS G70 2020", {}), - CAR.GENESIS_G80: CarInfo("GENESIS G80 2017", {}), - CAR.GENESIS_G90: CarInfo("GENESIS G90 2017", {}), + CAR.GENESIS_G70: CarInfo("Genesis G70", {2018}), + CAR.GENESIS_G70_2020: CarInfo("Genesis G70", {2020}), + CAR.GENESIS_G80: CarInfo("Genesis G80", {2018}), + CAR.GENESIS_G90: CarInfo("Genesis G90", {2018}), }