diff --git a/docs/CARS_generated.md b/docs/CARS_generated.md index 9bcc8aba83..69c27c6118 100644 --- a/docs/CARS_generated.md +++ b/docs/CARS_generated.md @@ -16,8 +16,8 @@ |Hyundai|Sonata Hybrid 2021-22|All|||||| |Kia|Forte 2018-21|SCC + LKAS|||||| |Kia|K5 2021-22|SCC + LFA|||||| -|Kia|Niro EV 2019-22|All|||||| -|Kia|Niro Hybrid 2021|SCC + LKAS|||||| +|Kia|Niro Electric 2019-22|All|||||| +|Kia|Niro Hybrid 2021-22|SCC + LKAS|||||| |Kia|Seltos 2021|SCC + LKAS|||||| |Kia|Telluride 2020|All|||||| |Lexus|ES 2019-21|All|||||| @@ -30,10 +30,12 @@ |Toyota|Camry 2021-22|All||2|||| |Toyota|Camry Hybrid 2021-22|All|||||| |Toyota|Corolla 2020-22|All|||||| +|Toyota|Corolla Hatchback 2019-22|All|||||| |Toyota|Corolla Hybrid 2020-22|All|||||| |Toyota|Highlander 2020-22|All|||||| |Toyota|Highlander Hybrid 2020-22|All|||||| |Toyota|Mirai 2021|All|||||| +|Toyota|Prius 2021-22|All|||||| |Toyota|Prius Prime 2021-22|All|||||| |Toyota|RAV4 2019-21|All|||||| |Toyota|RAV4 Hybrid 2019-21|All|||||| @@ -68,7 +70,7 @@ |Lexus|RX 2016-18|All|1||||| |Lexus|RX Hybrid 2016-19|All|1||||| |SEAT|Ateca 2018|Driver Assistance|||||| -|SEAT|Leon 2014-2020|Driver Assistance|||||| +|SEAT|Leon 2014-20|Driver Assistance|||||| |Toyota|Avalon 2022|All|||||| |Toyota|C-HR 2017-21|All|||||| |Toyota|C-HR Hybrid 2017-19|All|||||| @@ -94,7 +96,7 @@ |Volkswagen|T-Cross 20216|Driver Assistance|||||| |Volkswagen|T-Roc 20216|Driver Assistance|||||| |Volkswagen|Taos 20226|Driver Assistance|||||| -|Volkswagen|Tiguan 20206|Driver Assistance|||||| +|Volkswagen|Tiguan 2020-226|Driver Assistance|||||| |Volkswagen|Touran 2017|Driver Assistance|||||| |Volkswagen|e-Golf 2014, 2019-20|Driver Assistance|||||| |Škoda|Kamiq 20214|Driver Assistance|||||| @@ -119,8 +121,6 @@ |Chrysler|Pacifica Hybrid 2017-18|Adaptive Cruise|||||| |Chrysler|Pacifica Hybrid 2019-21|Adaptive Cruise|||||| |GMC|Acadia 20183|Adaptive Cruise|||||| -|Grand|Cherokee 2016-18|Adaptive Cruise|||||| -|Grand|Cherokee 2019-20|Adaptive Cruise|||||| |Honda|Accord 2018-21|All|||||| |Honda|Accord Hybrid 2018-21|All|||||| |Honda|CR-V 2015-16|Touring|||||| @@ -129,19 +129,22 @@ |Honda|Civic Hatchback 2017-21|All|||||| |Honda|Civic Sedan/Coupe 2016-18|Honda Sensing|||||| |Honda|Civic Sedan/Coupe 2019-20|All|||||| -|Honda|E 2020|All|||||| |Honda|Fit 2018-19|Honda Sensing|||||| |Honda|Freed 2020|Honda Sensing|||||| |Honda|HR-V 2019-20|Honda Sensing|||||| |Honda|Insight 2019-21|All|||||| +|Honda|Inspire 2018|All|||||| |Honda|Odyssey 2018-20|Honda Sensing|||||| |Honda|Passport 2019-21|All|||||| |Honda|Pilot 2016-21|Honda Sensing|||||| |Honda|Ridgeline 2017-21|Honda Sensing|||||| +|Honda|e 2020|All|||||| |Hyundai|Elantra 2017-19|SCC + LKAS|||||| |Hyundai|Genesis 2015-16|SCC + LKAS|||||| -|Hyundai|Ioniq Electric Limited 2019|SCC + LKAS|||||| +|Hyundai|Ioniq Electric 2019|SCC + LKAS|||||| |Hyundai|Ioniq Hybrid 2017-19|SCC + LKAS|||||| +|Jeep|Grand Cherokee 2016-18|Adaptive Cruise|||||| +|Jeep|Grand Cherokee 2019-20|Adaptive Cruise|||||| |Kia|Optima 2017|SCC + LKAS|||||| |Lexus|IS 2017-19|All|||||| |Lexus|RC 2020|All|||||| @@ -152,6 +155,7 @@ |Nissan|Rogue 2018-20|ProPILOT|||||| |Nissan|X-Trail 2017|ProPILOT|||||| |Subaru|Ascent 2019|EyeSight|||||| +|Subaru|Crosstrek 2018-20|EyeSight|||||| |Subaru|Forester 2019-21|EyeSight|||||| |Subaru|Impreza 2017-19|EyeSight|||||| |Toyota|Avalon 2016-21|TSS-P|1||||| diff --git a/selfdrive/car/chrysler/values.py b/selfdrive/car/chrysler/values.py index e95892dd2d..06dec898d6 100644 --- a/selfdrive/car/chrysler/values.py +++ b/selfdrive/car/chrysler/values.py @@ -24,8 +24,8 @@ CAR_INFO = { CAR.PACIFICA_2019_HYBRID: CarInfo("Chrysler Pacifica Hybrid 2019-21", "Adaptive Cruise"), CAR.PACIFICA_2018: CarInfo("Chrysler Pacifica 2017-18", "Adaptive Cruise"), CAR.PACIFICA_2020: CarInfo("Chrysler Pacifica 2020", "Adaptive Cruise"), - CAR.JEEP_CHEROKEE: CarInfo("Grand Cherokee 2016-18", "Adaptive Cruise"), - CAR.JEEP_CHEROKEE_2019: CarInfo("Grand Cherokee 2019-20", "Adaptive Cruise"), + CAR.JEEP_CHEROKEE: CarInfo("Jeep Grand Cherokee 2016-18", "Adaptive Cruise"), + CAR.JEEP_CHEROKEE_2019: CarInfo("Jeep Grand Cherokee 2019-20", "Adaptive Cruise"), } # Unique CAN messages: diff --git a/selfdrive/car/honda/values.py b/selfdrive/car/honda/values.py index b1ffe61d7e..ddc9276758 100644 --- a/selfdrive/car/honda/values.py +++ b/selfdrive/car/honda/values.py @@ -90,7 +90,10 @@ class CAR: CAR_INFO = { - CAR.ACCORD: CarInfo("Honda Accord 2018-21", "All", min_steer_speed=3. * CV.MPH_TO_MS), + CAR.ACCORD: [ + CarInfo("Honda Accord 2018-21", "All", min_steer_speed=3. * CV.MPH_TO_MS), + CarInfo("Honda Inspire 2018", "All", min_steer_speed=3. * CV.MPH_TO_MS), + ], CAR.ACCORDH: CarInfo("Honda Accord Hybrid 2018-21", "All", min_steer_speed=3. * CV.MPH_TO_MS), CAR.CIVIC: CarInfo("Honda Civic Sedan/Coupe 2016-18", "Honda Sensing", min_steer_speed=12. * CV.MPH_TO_MS), CAR.CIVIC_BOSCH: [ @@ -114,7 +117,7 @@ CAR_INFO = { CAR.PASSPORT: CarInfo("Honda Passport 2019-21", "All", min_steer_speed=12. * CV.MPH_TO_MS), CAR.RIDGELINE: CarInfo("Honda Ridgeline 2017-21", "Honda Sensing", min_steer_speed=12. * CV.MPH_TO_MS), CAR.INSIGHT: CarInfo("Honda Insight 2019-21", "All", min_steer_speed=3. * CV.MPH_TO_MS), - CAR.HONDA_E: CarInfo("Honda E 2020", "All", min_steer_speed=3. * CV.MPH_TO_MS), + CAR.HONDA_E: CarInfo("Honda e 2020", "All", min_steer_speed=3. * CV.MPH_TO_MS), } diff --git a/selfdrive/car/hyundai/values.py b/selfdrive/car/hyundai/values.py index ad67cafde1..94c82af637 100644 --- a/selfdrive/car/hyundai/values.py +++ b/selfdrive/car/hyundai/values.py @@ -76,7 +76,7 @@ CAR_INFO = { CAR.HYUNDAI_GENESIS: CarInfo("Hyundai Genesis 2015-16", "SCC + LKAS"), CAR.IONIQ: CarInfo("Hyundai Ioniq Hybrid 2017-19", "SCC + LKAS"), CAR.IONIQ_HEV_2022: CarInfo("Hyundai Ioniq Hybrid 2020-22", "SCC + LFA"), - CAR.IONIQ_EV_LTD: CarInfo("Hyundai Ioniq Electric Limited 2019", "SCC + LKAS"), + CAR.IONIQ_EV_LTD: CarInfo("Hyundai Ioniq Electric 2019", "SCC + LKAS"), CAR.IONIQ_EV_2020: CarInfo("Hyundai Ioniq Electric 2020", "SCC + LKAS"), CAR.IONIQ_PHEV: CarInfo("Hyundai Ioniq Plug-In Hybrid 2020-21", "SCC + LKAS"), CAR.KONA: CarInfo("Hyundai Kona 2020", "SCC + LKAS"), @@ -98,9 +98,9 @@ CAR_INFO = { # Kia CAR.KIA_FORTE: CarInfo("Kia Forte 2018-21", "SCC + LKAS"), CAR.KIA_K5_2021: CarInfo("Kia K5 2021-22", "SCC + LFA"), - CAR.KIA_NIRO_EV: CarInfo("Kia Niro EV 2019-22", "All"), + CAR.KIA_NIRO_EV: CarInfo("Kia Niro Electric 2019-22", "All"), 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_NIRO_HEV_2021: CarInfo("Kia Niro Hybrid 2021-22", "SCC + LKAS"), CAR.KIA_OPTIMA: [ CarInfo("Kia Optima 2017", "SCC + LKAS", min_steer_speed=32. * CV.MPH_TO_MS), CarInfo("Kia Optima 2019", "SCC + LKAS"), diff --git a/selfdrive/car/subaru/values.py b/selfdrive/car/subaru/values.py index 59754b4676..df3edf271c 100644 --- a/selfdrive/car/subaru/values.py +++ b/selfdrive/car/subaru/values.py @@ -29,7 +29,10 @@ class CAR: CAR_INFO = { CAR.ASCENT: CarInfo("Subaru Ascent 2019", "EyeSight"), - CAR.IMPREZA: CarInfo("Subaru Impreza 2017-19", "EyeSight"), + CAR.IMPREZA: [ + CarInfo("Subaru Impreza 2017-19", "EyeSight"), + CarInfo("Subaru Crosstrek 2018-20", "EyeSight"), + ], CAR.FORESTER: CarInfo("Subaru Forester 2019-21", "EyeSight"), CAR.FORESTER_PREGLOBAL: CarInfo("Subaru Forester 2017-18", "EyeSight"), CAR.LEGACY_PREGLOBAL: CarInfo("Subaru Legacy 2015-18", "EyeSight"), diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py index e0cf71f09b..57cd1fe0c8 100644 --- a/selfdrive/car/toyota/values.py +++ b/selfdrive/car/toyota/values.py @@ -85,7 +85,10 @@ CAR_INFO = { CAR.CHR: CarInfo("Toyota C-HR 2017-21", "All"), CAR.CHRH: CarInfo("Toyota C-HR Hybrid 2017-19", "All"), CAR.COROLLA: CarInfo("Toyota Corolla 2017-19", "All"), - CAR.COROLLA_TSS2: CarInfo("Toyota Corolla 2020-22", "All"), + CAR.COROLLA_TSS2: [ + CarInfo("Toyota Corolla 2020-22", "All"), + CarInfo("Toyota Corolla Hatchback 2019-22", "All"), + ], CAR.COROLLAH_TSS2: [ CarInfo("Toyota Corolla Hybrid 2020-22", "All"), CarInfo("Lexus UX Hybrid 2019-21", "All"), @@ -99,7 +102,10 @@ CAR_INFO = { CarInfo("Toyota Prius Prime 2017-20", 'All'), ], CAR.PRIUS_V: CarInfo("Toyota Prius v 2017", 'TSS-P', min_enable_speed=MIN_ACC_SPEED), - CAR.PRIUS_TSS2: CarInfo("Toyota Prius Prime 2021-22", "All"), + CAR.PRIUS_TSS2: [ + CarInfo("Toyota Prius 2021-22", "All"), + CarInfo("Toyota Prius Prime 2021-22", "All"), + ], CAR.RAV4: CarInfo("Toyota RAV4 2016-18", 'TSS-P'), CAR.RAV4H: CarInfo("Toyota RAV4 Hybrid 2016-18", 'TSS-P'), CAR.RAV4_TSS2: CarInfo("Toyota RAV4 2019-21", "All"), diff --git a/selfdrive/car/volkswagen/values.py b/selfdrive/car/volkswagen/values.py index df02e2c872..fbac57db7c 100755 --- a/selfdrive/car/volkswagen/values.py +++ b/selfdrive/car/volkswagen/values.py @@ -109,7 +109,7 @@ CAR_INFO = { CAR.POLO_MK6: CarInfo("Volkswagen Polo 2020", "Driver Assistance"), CAR.TAOS_MK1: CarInfo("Volkswagen Taos 2022", "Driver Assistance"), CAR.TCROSS_MK1: CarInfo("Volkswagen T-Cross 2021", "Driver Assistance"), - CAR.TIGUAN_MK2: CarInfo("Volkswagen Tiguan 2020", "Driver Assistance"), + CAR.TIGUAN_MK2: CarInfo("Volkswagen Tiguan 2020-22", "Driver Assistance"), CAR.TOURAN_MK2: CarInfo("Volkswagen Touran 2017", "Driver Assistance"), CAR.TRANSPORTER_T61: [ CarInfo("Volkswagen Caravelle 2020", "Driver Assistance"), @@ -124,7 +124,7 @@ CAR_INFO = { CAR.AUDI_Q2_MK1: CarInfo("Audi Q2 2018", "ACC + Lane Assist"), CAR.AUDI_Q3_MK2: CarInfo("Audi Q3 2020-21", "ACC + Lane Assist"), CAR.SEAT_ATECA_MK1: CarInfo("SEAT Ateca 2018", "Driver Assistance"), - CAR.SEAT_LEON_MK3: CarInfo("SEAT Leon 2014-2020", "Driver Assistance"), + CAR.SEAT_LEON_MK3: CarInfo("SEAT Leon 2014-20", "Driver Assistance"), CAR.SKODA_KAMIQ_MK1: CarInfo("Škoda Kamiq 2021", "Driver Assistance"), CAR.SKODA_KAROQ_MK1: CarInfo("Škoda Karoq 2019", "Driver Assistance"), CAR.SKODA_KODIAQ_MK1: CarInfo("Škoda Kodiaq 2018-19", "Driver Assistance"),