From 628eecff06595395f9d5166e82680dc1a2c58af7 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 17 Mar 2022 16:11:03 -0700 Subject: [PATCH] CARS.md tweaks (#23983) * CARS.md fixups * wrong one * sort footnotes * Mazda CX-9 has good torque * Try this * generate * yup, os uses native filesystem order --- docs/CARS.md | 91 +++++++++++++++++----------------- selfdrive/car/CARS_template.md | 1 + selfdrive/car/car_helpers.py | 2 +- selfdrive/car/mazda/values.py | 6 +-- 4 files changed, 51 insertions(+), 49 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index ff065981d..c183cb2f3 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -53,7 +53,7 @@ How We Rate The Cars |Lexus|UX Hybrid 2019-21|All|||||| |Toyota|Alphard 2019-20|All|||||| |Toyota|Avalon 2022|All|||||| -|Toyota|Camry 2021-22|All||[6](#Footnotes)|||| +|Toyota|Camry 2021-22|All||[4](#Footnotes)|||| |Toyota|Camry Hybrid 2021-22|All|||||| |Toyota|Corolla 2020-22|All|||||| |Toyota|Corolla Hatchback 2019-22|All|||||| @@ -97,26 +97,27 @@ How We Rate The Cars |Kia|Seltos 2021|SCC + LKAS|||||| |Kia|Sorento 2018-19|SCC + LKAS|||||| |Kia|Stinger 2018|SCC + LKAS|||||| -|Lexus|CT Hybrid 2017-18|LSS|[5](#Footnotes)||||| -|Lexus|ES Hybrid 2017-18|LSS|[5](#Footnotes)||||| -|Lexus|NX 2018-19|All|[5](#Footnotes)||||| -|Lexus|NX Hybrid 2018-19|All|[5](#Footnotes)||||| -|Lexus|RX 2016-18|All|[5](#Footnotes)||||| -|Lexus|RX Hybrid 2016-19|All|[5](#Footnotes)||||| +|Lexus|CT Hybrid 2017-18|LSS|[3](#Footnotes)||||| +|Lexus|ES Hybrid 2017-18|LSS|[3](#Footnotes)||||| +|Lexus|NX 2018-19|All|[3](#Footnotes)||||| +|Lexus|NX Hybrid 2018-19|All|[3](#Footnotes)||||| +|Lexus|RX 2016-18|All|[3](#Footnotes)||||| +|Lexus|RX Hybrid 2016-19|All|[3](#Footnotes)||||| +|Mazda|CX-5 2022|All|||||| |SEAT|Ateca 2018|Driver Assistance|||||| |SEAT|Leon 2014-20|Driver Assistance|||||| -|Toyota|Avalon 2019-21|TSS-P|[5](#Footnotes)||||| -|Toyota|Avalon Hybrid 2019-21|TSS-P|[5](#Footnotes)||||| +|Toyota|Avalon 2019-21|TSS-P|[3](#Footnotes)||||| +|Toyota|Avalon Hybrid 2019-21|TSS-P|[3](#Footnotes)||||| |Toyota|C-HR 2017-21|All|||||| |Toyota|C-HR Hybrid 2017-19|All|||||| -|Toyota|Camry 2018-20|All||[6](#Footnotes)|||| -|Toyota|Camry Hybrid 2018-20|All||[6](#Footnotes)|||| -|Toyota|Highlander 2017-19|All|[5](#Footnotes)||||| -|Toyota|Highlander Hybrid 2017-19|All|[5](#Footnotes)||||| -|Toyota|RAV4 Hybrid 2016-18|TSS-P|[5](#Footnotes)||||| -|Toyota|Sienna 2018-20|All|[5](#Footnotes)||||| -|Volkswagen|Arteon 2018, 2021[4](#Footnotes)|Driver Assistance|||||| -|Volkswagen|Atlas 2018-19, 2022[4](#Footnotes)|Driver Assistance|||||| +|Toyota|Camry 2018-20|All||[4](#Footnotes)|||| +|Toyota|Camry Hybrid 2018-20|All||[4](#Footnotes)|||| +|Toyota|Highlander 2017-19|All|[3](#Footnotes)||||| +|Toyota|Highlander Hybrid 2017-19|All|[3](#Footnotes)||||| +|Toyota|RAV4 Hybrid 2016-18|TSS-P|[3](#Footnotes)||||| +|Toyota|Sienna 2018-20|All|[3](#Footnotes)||||| +|Volkswagen|Arteon 2018, 2021[8](#Footnotes)|Driver Assistance|||||| +|Volkswagen|Atlas 2018-19, 2022[8](#Footnotes)|Driver Assistance|||||| |Volkswagen|Golf 2015-20|Driver Assistance|||||| |Volkswagen|Golf Alltrack 2017-18|Driver Assistance|||||| |Volkswagen|Golf GTE 2016|Driver Assistance|||||| @@ -126,15 +127,15 @@ How We Rate The Cars |Volkswagen|Golf SportsVan 2016|Driver Assistance|||||| |Volkswagen|Jetta 2018-21|Driver Assistance|||||| |Volkswagen|Jetta GLI 2021|Driver Assistance|||||| -|Volkswagen|Passat 2016-18[3](#Footnotes)|Driver Assistance|||||| +|Volkswagen|Passat 2016-18[7](#Footnotes)|Driver Assistance|||||| |Volkswagen|Polo 2020|Driver Assistance|||||| -|Volkswagen|T-Cross 2021[4](#Footnotes)|Driver Assistance|||||| -|Volkswagen|T-Roc 2021[4](#Footnotes)|Driver Assistance|||||| -|Volkswagen|Taos 2022[4](#Footnotes)|Driver Assistance|||||| -|Volkswagen|Tiguan 2020-22[4](#Footnotes)|Driver Assistance|||||| +|Volkswagen|T-Cross 2021[8](#Footnotes)|Driver Assistance|||||| +|Volkswagen|T-Roc 2021[8](#Footnotes)|Driver Assistance|||||| +|Volkswagen|Taos 2022[8](#Footnotes)|Driver Assistance|||||| +|Volkswagen|Tiguan 2020-22[8](#Footnotes)|Driver Assistance|||||| |Volkswagen|Touran 2017|Driver Assistance|||||| |Volkswagen|e-Golf 2014, 2019-20|Driver Assistance|||||| -|Škoda|Kamiq 2021[2](#Footnotes)|Driver Assistance|||||| +|Škoda|Kamiq 2021[6](#Footnotes)|Driver Assistance|||||| |Škoda|Karoq 2019|Driver Assistance|||||| |Škoda|Kodiaq 2018-19|Driver Assistance|||||| |Škoda|Octavia 2015, 2018-19|Driver Assistance|||||| @@ -149,13 +150,13 @@ How We Rate The Cars |Acura|ILX 2016-19|AcuraWatch Plus|||||| |Acura|RDX 2016-18|AcuraWatch Plus|||||| |Acura|RDX 2019-21|All|||||| -|Cadillac|Escalade ESV 2016[8](#Footnotes)|ACC + LKAS|||||| -|Chevrolet|Volt 2017-18[8](#Footnotes)|Adaptive Cruise|||||| +|Cadillac|Escalade ESV 2016[1](#Footnotes)|ACC + LKAS|||||| +|Chevrolet|Volt 2017-18[1](#Footnotes)|Adaptive Cruise|||||| |Chrysler|Pacifica 2017-18|Adaptive Cruise|||||| |Chrysler|Pacifica 2020|Adaptive Cruise|||||| |Chrysler|Pacifica Hybrid 2017-18|Adaptive Cruise|||||| |Chrysler|Pacifica Hybrid 2019-21|Adaptive Cruise|||||| -|GMC|Acadia 2018[8](#Footnotes)|Adaptive Cruise|||||| +|GMC|Acadia 2018[1](#Footnotes)|Adaptive Cruise|||||| |Genesis|G90 2018|All|||||| |Honda|Accord 2018-21|All|||||| |Honda|Accord Hybrid 2018-21|All|||||| @@ -163,7 +164,7 @@ How We Rate The Cars |Honda|CR-V 2017-21|Honda Sensing|||||| |Honda|CR-V Hybrid 2017-19|Honda Sensing|||||| |Honda|Civic 2016-18|Honda Sensing|||||| -|Honda|Civic 2019-20|All|||[1](#Footnotes)||| +|Honda|Civic 2019-20|All|||[2](#Footnotes)||| |Honda|Civic Hatchback 2017-21|Honda Sensing|||||| |Honda|Fit 2018-19|Honda Sensing|||||| |Honda|Freed 2020|Honda Sensing|||||| @@ -186,8 +187,7 @@ How We Rate The Cars |Kia|Optima 2017|SCC + LKAS|||||| |Lexus|IS 2017-19|All|||||| |Lexus|RC 2020|All|||||| -|Mazda|CX-5 2022|All|||||| -|Mazda|CX-9 2021|All|||||| +|Mazda|CX-9 2021|All|||||| |Nissan|Altima 2019-20|ProPILOT|||||| |Nissan|Leaf 2018-22|ProPILOT|||||| |Nissan|Rogue 2018-20|ProPILOT|||||| @@ -196,24 +196,25 @@ How We Rate The Cars |Subaru|Crosstrek 2018-20|EyeSight|||||| |Subaru|Forester 2019-21|EyeSight|||||| |Subaru|Impreza 2017-19|EyeSight|||||| -|Toyota|Avalon 2016-18|TSS-P|[5](#Footnotes)||||| -|Toyota|Corolla 2017-19|All|[5](#Footnotes)||||| -|Toyota|Prius 2016-20|TSS-P|[5](#Footnotes)|||[7](#Footnotes)|| -|Toyota|Prius Prime 2017-20|All|[5](#Footnotes)|||[7](#Footnotes)|| -|Toyota|Prius v 2017|TSS-P|[5](#Footnotes)|||[7](#Footnotes)|| -|Toyota|RAV4 2016-18|TSS-P|[5](#Footnotes)||||| -|Volkswagen|California 2021[4](#Footnotes)|Driver Assistance|||||| -|Volkswagen|Caravelle 2020[4](#Footnotes)|Driver Assistance|||||| +|Toyota|Avalon 2016-18|TSS-P|[3](#Footnotes)||||| +|Toyota|Corolla 2017-19|All|[3](#Footnotes)||||| +|Toyota|Prius 2016-20|TSS-P|[3](#Footnotes)|||[5](#Footnotes)|| +|Toyota|Prius Prime 2017-20|All|[3](#Footnotes)|||[5](#Footnotes)|| +|Toyota|Prius v 2017|TSS-P|[3](#Footnotes)|||[5](#Footnotes)|| +|Toyota|RAV4 2016-18|TSS-P|[3](#Footnotes)||||| +|Volkswagen|California 2021[8](#Footnotes)|Driver Assistance|||||| +|Volkswagen|Caravelle 2020[8](#Footnotes)|Driver Assistance|||||| -12019 Honda Civic 1.6L Diesel Sedan does not have ALC below 12mph.
-2Not including the China market Kamiq, which is based on the (currently) unsupported PQ34 platform.
-3Not including the USA/China market Passat, which is based on the (currently) unsupported PQ35/NMS platform.
-4Model-years 2021 and beyond may have a new camera harness design, which isn't yet available from the comma store. Before ordering, remove the Lane Assist camera cover and check to see if the connector is black (older design) or light brown (newer design). For the newer design, in the interim, choose "VW J533 Development" from the vehicle drop-down for a harness that integrates at the CAN gateway inside the dashboard.
-5When disconnecting the Driver Support Unit (DSU), openpilot Adaptive Cruise Control (ACC) will replace stock Adaptive Cruise Control (ACC). NOTE: disconnecting the DSU disables Automatic Emergency Braking (AEB).
-628mph for Camry 4CYL L, 4CYL LE and 4CYL SE which don't have Full-Speed Range Dynamic Radar Cruise Control.
-7An inaccurate steering wheel angle sensor makes precise control difficult.
-8Requires an [OBD-II](https://comma.ai/shop/products/comma-car-harness) car harness and [community built ASCM harness](https://github.com/commaai/openpilot/wiki/GM#hardware). NOTE: disconnecting the ASCM disables Automatic Emergency Braking (AEB).
+## Footnotes +1Requires an [OBD-II](https://comma.ai/shop/products/comma-car-harness) car harness and [community built ASCM harness](https://github.com/commaai/openpilot/wiki/GM#hardware). NOTE: disconnecting the ASCM disables Automatic Emergency Braking (AEB).
+22019 Honda Civic 1.6L Diesel Sedan does not have ALC below 12mph.
+3When disconnecting the Driver Support Unit (DSU), openpilot Adaptive Cruise Control (ACC) will replace stock Adaptive Cruise Control (ACC). NOTE: disconnecting the DSU disables Automatic Emergency Braking (AEB).
+428mph for Camry 4CYL L, 4CYL LE and 4CYL SE which don't have Full-Speed Range Dynamic Radar Cruise Control.
+5An inaccurate steering wheel angle sensor makes precise control difficult.
+6Not including the China market Kamiq, which is based on the (currently) unsupported PQ34 platform.
+7Not including the USA/China market Passat, which is based on the (currently) unsupported PQ35/NMS platform.
+8Model-years 2021 and beyond may have a new camera harness design, which isn't yet available from the comma store. Before ordering, remove the Lane Assist camera cover and check to see if the connector is black (older design) or light brown (newer design). For the newer design, in the interim, choose "VW J533 Development" from the vehicle drop-down for a harness that integrates at the CAN gateway inside the dashboard.
## Community Maintained Cars Although they're not upstream, the community has openpilot running on other makes and models. See the 'Community Supported Models' section of each make [on our wiki](https://wiki.comma.ai/). \ No newline at end of file diff --git a/selfdrive/car/CARS_template.md b/selfdrive/car/CARS_template.md index 7cdb7bc02..72ca40d4d 100644 --- a/selfdrive/car/CARS_template.md +++ b/selfdrive/car/CARS_template.md @@ -45,6 +45,7 @@ How We Rate The Cars {% endfor %} +## Footnotes {% for footnote in footnotes %} {{loop.index}}{{footnote}}
{% endfor %} diff --git a/selfdrive/car/car_helpers.py b/selfdrive/car/car_helpers.py index 6e9c842df..518dd42ca 100644 --- a/selfdrive/car/car_helpers.py +++ b/selfdrive/car/car_helpers.py @@ -62,7 +62,7 @@ def load_interfaces(brand_names): def get_interface_attr(attr: str) -> Dict[str, Any]: # returns given attribute from each interface brand_names = {} - for car_folder in [x[0] for x in os.walk(BASEDIR + '/selfdrive/car')]: + for car_folder in sorted([x[0] for x in os.walk(BASEDIR + '/selfdrive/car')]): try: brand_name = car_folder.split('/')[-1] attr_data = getattr(__import__(f'selfdrive.car.{brand_name}.values', fromlist=[attr]), attr, None) diff --git a/selfdrive/car/mazda/values.py b/selfdrive/car/mazda/values.py index 969b43aeb..6b6aa05c2 100644 --- a/selfdrive/car/mazda/values.py +++ b/selfdrive/car/mazda/values.py @@ -28,12 +28,12 @@ class CAR: CAR_INFO: Dict[str, Union[CarInfo, List[CarInfo]]] = { - CAR.CX5: CarInfo("Mazda CX-5 2017, 2019", "All"), # TODO: verify years for first 4 + CAR.CX5: CarInfo("Mazda CX-5 2017, 2019", "All"), # TODO: verify years and torque for first 4 CAR.CX9: CarInfo("Mazda CX-9 2016-17", "All"), CAR.MAZDA3: CarInfo("Mazda 3 2017", "All"), CAR.MAZDA6: CarInfo("Mazda 6 2017", "All"), - CAR.CX9_2021: CarInfo("Mazda CX-9 2021", "All"), - CAR.CX5_2022: CarInfo("Mazda CX-5 2022", "All"), + CAR.CX9_2021: CarInfo("Mazda CX-9 2021", "All", good_torque=True), + CAR.CX5_2022: CarInfo("Mazda CX-5 2022", "All", good_torque=True), }