From ec7073b5311c569374b0956442b95e9558fe7ede Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 10 Mar 2022 19:07:28 -0800 Subject: [PATCH] handle this --- docs/CARS_generated.md | 214 ++++++++++++++++++++--------------------- docs/cars.py | 11 +-- 2 files changed, 109 insertions(+), 116 deletions(-) diff --git a/docs/CARS_generated.md b/docs/CARS_generated.md index 77e525fa8e..a369a9c73f 100644 --- a/docs/CARS_generated.md +++ b/docs/CARS_generated.md @@ -3,163 +3,163 @@ |Make|Model|Supported Package|openpilot Longitudinal|FSR Longitudinal|FSR Steering|Steering Torque|Actively Maintained| |---|---|---|:---:|:---:|:---:|:---:|:---:| |Genesis|G70 2020|All|||||| -|Hyundai|Elantra 2021|SCC + LKAS|||||| +|Hyundai|Elantra 2021-22|SCC + LKAS|||||| |Hyundai|Elantra Hybrid 2021|SCC + LKAS|||||| |Hyundai|Kona 2020|SCC + LKAS|||||| |Hyundai|Kona Hybrid 2020|SCC + LKAS|||||| -|Hyundai|Palisade 2021|All|||||| -|Hyundai|Santa Fe 2020|All|||||| -|Hyundai|Santa Fe 2022|All|||||| +|Hyundai|Palisade 2020-21|All|||||| +|Hyundai|Santa Fe 2019-20|All|||||| +|Hyundai|Santa Fe 2021-22|All|||||| |Hyundai|Santa Fe Hybrid 2022|All|||||| |Hyundai|Santa Fe Plug-In Hybrid 2022|All|||||| -|Hyundai|Sonata 2022|All|||||| -|Hyundai|Sonata Hybrid 2022|All|||||| -|Kia|Forte 2021|SCC + LKAS|||||| -|Kia|K5 2022|SCC + LFA|||||| -|Kia|Niro EV 2022|All|||||| +|Hyundai|Sonata 2020-22|All|||||| +|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|Seltos 2021|SCC + LKAS|||||| -|Kia|Telluride 2020|All|||||| -|Lexus|ES 2021|All|||||| -|Lexus|ES Hybrid 2021|All|||||| +|Kia|Telluride 2020-21|All|||||| +|Lexus|ES 2019-21|All|||||| +|Lexus|ES Hybrid 2019-21|All|||||| |Lexus|NX 2020|All|||||| -|Lexus|RX 2021|All|||||| -|Lexus|RX Hybrid 2021|All|||||| -|Toyota|Alphard 2020|All|||||| -|Toyota|Camry 2022|All||2|||| -|Toyota|Camry Hybrid 2022|All|||||| -|Toyota|Corolla Hybrid TSS2 2022|All|||||| -|Toyota|Corolla TSS2 2022|All|||||| -|Toyota|Highlander 2022|All|||||| -|Toyota|Highlander Hybrid 2022|All|||||| +|Lexus|RX 2020-21|All|||||| +|Lexus|RX Hybrid 2020-21|All|||||| +|Lexus|UX Hybrid 2019-21|All|||||| +|Toyota|Alphard 2019-20|All|||||| +|Toyota|Camry 2021-22|All||2|||| +|Toyota|Camry Hybrid 2021-22|All|||||| +|Toyota|Corolla 2020-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 Prime TSS2 2022|All|||||| -|Toyota|RAV4 2021|All|||||| -|Toyota|RAV4 Hybrid 2021|All|||||| +|Toyota|Prius Prime 2021-22|All|||||| +|Toyota|RAV4 2019-21|All|||||| +|Toyota|RAV4 Hybrid 2019-21|All|||||| ## Silver Cars |Make|Model|Supported Package|openpilot Longitudinal|FSR Longitudinal|FSR Steering|Steering Torque|Actively Maintained| |---|---|---|:---:|:---:|:---:|:---:|:---:| -|Audi|A3 2019|ACC + Lane Assist|||||| -|Audi|A3 Sportback e-tron 2018|ACC + Lane Assist|||||| +|Audi|A3 2014-19|ACC + Lane Assist|||||| +|Audi|A3 Sportback e-tron 2017-18|ACC + Lane Assist|||||| |Audi|Q2 2018|ACC + Lane Assist|||||| -|Audi|Q3 2021|ACC + Lane Assist|||||| +|Audi|Q3 2020-21|ACC + Lane Assist|||||| |Genesis|G70 2018|All|||||| |Genesis|G80 2018|All|||||| |Genesis|G90 2018|All|||||| |Hyundai|Ioniq Electric 2020|SCC + LKAS|||||| -|Hyundai|Ioniq Hybrid 2022|SCC + LFA|||||| -|Hyundai|Ioniq Plug-In Hybrid 2021|SCC + LKAS|||||| -|Hyundai|Kona Electric 2019|SCC + LKAS|||||| -|Hyundai|Sonata 2019|SCC + LKAS|||||| -|Hyundai|Veloster 2020|SCC + LKAS|||||| -|Kia|Ceed Intro Edition 2019|SCC + LKAS|||||| +|Hyundai|Ioniq Hybrid 2020-22|SCC + LFA|||||| +|Hyundai|Ioniq Plug-In Hybrid 2020-21|SCC + LKAS|||||| +|Hyundai|Kona Electric 2018-19|SCC + LKAS|||||| +|Hyundai|Sonata 2018-19|SCC + LKAS|||||| +|Hyundai|Veloster 2019-20|SCC + LKAS|||||| +|Kia|Ceed 2019|SCC + LKAS|||||| |Kia|Niro Plug-In Hybrid 2019|SCC + LKAS|||||| -|Kia|Optima SX 2019 & 2016 2019|SCC + LKAS|||||| -|Kia|Sorento GT-Line 2019|SCC + LKAS|||||| -|Kia|Stinger GT2 2018|SCC + LKAS|||||| -|Lexus|CT Hybrid 2018|LSS|1||||| -|Lexus|ES Hybrid 2018|LSS|1||||| -|Lexus|NX 2019|All|1||||| -|Lexus|NX Hybrid 2019|All|1||||| -|Lexus|RX 2018|All|1||||| -|Lexus|RX Hybrid 2019|All|1||||| +|Kia|Optima 2019|SCC + LKAS|||||| +|Kia|Sorento 2018-19|SCC + LKAS|||||| +|Kia|Stinger 2018|SCC + LKAS|||||| +|Lexus|CT Hybrid 2017-18|LSS|1||||| +|Lexus|ES Hybrid 2017-18|LSS|1||||| +|Lexus|NX 2018-19|All|1||||| +|Lexus|NX Hybrid 2018-19|All|1||||| +|Lexus|RX 2016-18|All|1||||| +|Lexus|RX Hybrid 2016-19|All|1||||| |SEAT|Ateca 2018|Driver Assistance|||||| -|SEAT|Leon 2020|Driver Assistance|||||| +|SEAT|Leon 2014-2020|Driver Assistance|||||| |Toyota|Avalon 2022|All|||||| -|Toyota|C-HR 2021|All|||||| -|Toyota|C-HR Hybrid 2019|All|||||| -|Toyota|Camry 2020|All||2|||| -|Toyota|Camry Hybrid 2020|All||2|||| -|Toyota|Highlander 2019|All|1||||| -|Toyota|Highlander Hybrid 2019|All|1||||| -|Toyota|RAV4 Hybrid 2018|TSS-P|1||||| -|Toyota|Sienna 2020|All|1||||| -|Volkswagen|Arteon 20216|Driver Assistance|||||| -|Volkswagen|Atlas 20226|Driver Assistance|||||| -|Volkswagen|Golf 2020|Driver Assistance|||||| -|Volkswagen|Golf Alltrack 2018|Driver Assistance|||||| +|Toyota|C-HR 2017-21|All|||||| +|Toyota|C-HR Hybrid 2017-19|All|||||| +|Toyota|Camry 2018-20|All||2|||| +|Toyota|Camry Hybrid 2018-20|All||2|||| +|Toyota|Highlander 2017-19|All|1||||| +|Toyota|Highlander Hybrid 2017-19|All|1||||| +|Toyota|RAV4 Hybrid 2016-18|TSS-P|1||||| +|Toyota|Sienna 2018-20|All|1||||| +|Volkswagen|Arteon 2018, 20216|Driver Assistance|||||| +|Volkswagen|Atlas 2018-19, 20226|Driver Assistance|||||| +|Volkswagen|Golf 2015-20|Driver Assistance|||||| +|Volkswagen|Golf Alltrack 2017-18|Driver Assistance|||||| |Volkswagen|Golf GTE 2016|Driver Assistance|||||| -|Volkswagen|Golf GTI 2020|Driver Assistance|||||| -|Volkswagen|Golf R 2019|Driver Assistance|||||| -|Volkswagen|Golf SportWagen 2016|Driver Assistance|||||| +|Volkswagen|Golf GTI 2018-20|Driver Assistance|||||| +|Volkswagen|Golf R 2016-19|Driver Assistance|||||| +|Volkswagen|Golf SportWagen 2015|Driver Assistance|||||| |Volkswagen|Golf SportsVan 2016|Driver Assistance|||||| -|Volkswagen|Jetta 2020|Driver Assistance|||||| +|Volkswagen|Jetta 2018-20|Driver Assistance|||||| |Volkswagen|Jetta GLI 2021|Driver Assistance|||||| -|Volkswagen|Passat 20185|Driver Assistance|||||| +|Volkswagen|Passat 2016-185|Driver Assistance|||||| |Volkswagen|Polo 2020|Driver Assistance|||||| |Volkswagen|T-Cross 20216|Driver Assistance|||||| |Volkswagen|T-Roc 20216|Driver Assistance|||||| |Volkswagen|Taos 20226|Driver Assistance|||||| |Volkswagen|Tiguan 20206|Driver Assistance|||||| |Volkswagen|Touran 2017|Driver Assistance|||||| -|Volkswagen|e-Golf 2020|Driver Assistance|||||| +|Volkswagen|e-Golf 2014, 2019-20|Driver Assistance|||||| |Škoda|Kamiq 20214|Driver Assistance|||||| |Škoda|Karoq 2019|Driver Assistance|||||| -|Škoda|Kodiaq 2019|Driver Assistance|||||| -|Škoda|Octavia 2019|Driver Assistance|||||| +|Škoda|Kodiaq 2018-19|Driver Assistance|||||| +|Škoda|Octavia 2015, 2018-19|Driver Assistance|||||| |Škoda|Octavia RS 2016|Driver Assistance|||||| |Škoda|Scala 2020|Driver Assistance|||||| -|Škoda|Superb 2018|Driver Assistance|||||| +|Škoda|Superb 2015-18|Driver Assistance|||||| ## Bronze Cars |Make|Model|Supported Package|openpilot Longitudinal|FSR Longitudinal|FSR Steering|Steering Torque|Actively Maintained| |---|---|---|:---:|:---:|:---:|:---:|:---:| -|Acura|ILX 2019|AcuraWatch Plus|||||| -|Acura|RDX 2018|AcuraWatch Plus|||||| -|Acura|RDX 2021|All|||||| +|Acura|ILX 2016-19|AcuraWatch Plus|||||| +|Acura|RDX 2016-18|AcuraWatch Plus|||||| +|Acura|RDX 2019-21|All|||||| |Cadillac|Escalade ESV 20163|ACC + LKAS|||||| -|Chevrolet|Volt Premier 20183|Adaptive Cruise|||||| -|Chrysler|Pacifica 2018|Adaptive Cruise|||||| +|Chevrolet|Volt 2017-183|Adaptive Cruise|||||| +|Chrysler|Pacifica 2017-18|Adaptive Cruise|||||| |Chrysler|Pacifica 2020|Adaptive Cruise|||||| -|Chrysler|Pacifica Hybrid 2017|Adaptive Cruise|||||| -|Chrysler|Pacifica Hybrid 2018|Adaptive Cruise|||||| -|Chrysler|Pacifica Hybrid 2019|Adaptive Cruise|||||| -|GMC|Acadia Denali 20183|Adaptive Cruise|||||| -|Honda|Accord 2021|All|||||| -|Honda|Accord Hybrid 2021|All|||||| -|Honda|CR-V 2016|Touring|||||| -|Honda|CR-V 2021|Honda Sensing|||||| -|Honda|CR-V Hybrid 2019|Honda Sensing|||||| -|Honda|Civic Hatchback 2021|All|||||| -|Honda|Civic Sedan/Coupe 2018|Honda Sensing|||||| -|Honda|Civic Sedan/Coupe 2020|All|||||| +|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|||||| +|Honda|CR-V 2017-21|Honda Sensing|||||| +|Honda|CR-V Hybrid 2017-19|Honda Sensing|||||| +|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 2019|Honda Sensing|||||| +|Honda|Fit 2018-19|Honda Sensing|||||| |Honda|Freed 2020|Honda Sensing|||||| -|Honda|HR-V 2020|Honda Sensing|||||| -|Honda|Insight 2021|All|||||| -|Honda|Odyssey 2020|Honda Sensing|||||| -|Honda|Passport 2021|All|||||| -|Honda|Pilot 2021|Honda Sensing|||||| -|Honda|Ridgeline 2021|Honda Sensing|||||| -|Hyundai|Elantra 2019|SCC + LKAS|||||| -|Hyundai|Genesis 2016|SCC + LKAS|||||| +|Honda|HR-V 2019-20|Honda Sensing|||||| +|Honda|Insight 2019-21|All|||||| +|Honda|Odyssey 2018-20|Honda Sensing|||||| +|Honda|Passport 2019-21|All|||||| +|Honda|Pilot 2016-21|Honda Sensing|||||| +|Honda|Ridgeline 2017-21|Honda Sensing|||||| +|Hyundai|Elantra 2017-19|SCC + LKAS|||||| +|Hyundai|Genesis 2015-16|SCC + LKAS|||||| |Hyundai|Ioniq Electric Limited 2019|SCC + LKAS|||||| -|Hyundai|Ioniq Hybrid 2019|SCC + LKAS|||||| -|Jeep|Grand Cherokee 2020|Adaptive Cruise|||||| -|Jeep|Grand Cherokee V6 2018|Adaptive Cruise|||||| -|Lexus|IS 2019|All|||||| +|Hyundai|Ioniq Hybrid 2017-19|SCC + LKAS|||||| +|Kia|Optima 2017|SCC + LKAS|||||| +|Lexus|IS 2017-19|All|||||| |Lexus|RC 2020|All|||||| |Mazda|CX-5 2022|All|||||| |Mazda|CX-9 2021|All|||||| -|Nissan|Altima 2020|ProPILOT|||||| -|Nissan|Leaf 2022|ProPILOT|||||| -|Nissan|Rogue 2020|All|||||| +|Nissan|Altima 2019-20|ProPILOT|||||| +|Nissan|Leaf 2018-22|ProPILOT|||||| +|Nissan|Rogue 2018-20|ProPILOT|||||| |Nissan|X-Trail 2017|ProPILOT|||||| -|Subaru|Ascent Limited 2019|EyeSight|||||| -|Subaru|Forester 2021|EyeSight|||||| -|Subaru|Impreza Limited 2019|EyeSight|||||| -|Subaru|Impreza Sport 2021|EyeSight|||||| -|Toyota|Avalon 2021|TSS-P|1||||| +|Subaru|Ascent 2019|EyeSight|||||| +|Subaru|Forester 2019-21|EyeSight|||||| +|Subaru|Impreza 2017-19|EyeSight|||||| +|Toyota|Avalon 2016-21|TSS-P|1||||| |Toyota|Avalon 2022|TSS-P|||||| -|Toyota|Avalon Hybrid 2021|TSS-P|1||||| -|Toyota|Corolla 2019|All|1||||| -|Toyota|Prius 2020|TSS-P|1|||7|| -|Toyota|Prius Prime 2020|All|1|||7|| +|Toyota|Avalon Hybrid 2019-21|TSS-P|1||||| +|Toyota|Corolla 2017-19|All|1||||| +|Toyota|Prius 2016-20|TSS-P|1|||7|| +|Toyota|Prius Prime 2017-20|All|1|||7|| |Toyota|Prius v 2017|TSS-P|1|||7|| -|Toyota|RAV4 2018|TSS-P|1||||| +|Toyota|RAV4 2016-18|TSS-P|1||||| |Volkswagen|California 20216|Driver Assistance|||||| |Volkswagen|Caravelle 20206|Driver Assistance|||||| diff --git a/docs/cars.py b/docs/cars.py index 5cab6f3f0a..1448014dfe 100755 --- a/docs/cars.py +++ b/docs/cars.py @@ -91,21 +91,14 @@ CAR_EXCEPTIONS = [ class Car: def __init__(self, car_info, CP): self.make, self.model = car_info.name.split(' ', 1) - self.car_fingerprint = CP.carFingerprint - assert len(car_info.years), 'Model {} has no years listed'.format(CP.carFingerprint) - - # TODO: properly format model years - years = ' ' + str(max(car_info.years)) - self.model_string = "{}{}".format(self.model, years) self.package = car_info.package - self.exceptions = get_exceptions(CP) self.stars = self._calculate_stars(CP, car_info) @property def row(self): # TODO: add YouTube videos - row = [self.make, self.model_string, self.package, *map(get_star_icon, self.stars)] + row = [self.make, self.model, self.package, *map(get_star_icon, self.stars)] # Check for car exceptions for row_idx, column in enumerate(Column): @@ -167,7 +160,7 @@ def generate_cars_md(): cars_md_doc = [] for tier in Tier: # Sort by make, model name, and year - cars = sorted(tiered_cars[tier], key=lambda car: car.make + car.model_string) + cars = sorted(tiered_cars[tier], key=lambda car: car.make + car.model) cars_md_doc.append("## {} Cars\n".format(tier.name.title()))