diff --git a/docs/CARS.md b/docs/CARS.md
index 754052085d..3e35782b2a 100644
--- a/docs/CARS.md
+++ b/docs/CARS.md
@@ -70,7 +70,7 @@ How We Rate The Cars
|Toyota|RAV4 2019-21|All|
|||||
|Toyota|RAV4 Hybrid 2019-21|All||||||
-# Silver - 70 cars
+# Silver - 77 cars
|Make|Model|Supported Package|openpilot ACC|Stop and Go|Steer to 0|Steering Torque|Actively Maintained|
|---|---|---|:---:|:---:|:---:|:---:|:---:|
@@ -133,19 +133,26 @@ How We Rate The Cars
|Toyota|RAV4 2022|All|
|||||
|Toyota|RAV4 Hybrid 2016-18|TSS-P|
[3](#footnotes)|||||
|Toyota|RAV4 Hybrid 2022|All||||||
-|Volkswagen|Atlas 2018-19, 2022[7](#footnotes)|Driver Assistance||||||
-|Volkswagen|e-Golf 2014, 2018-20|Driver Assistance||||||
-|Volkswagen|Golf 2015-20|Driver Assistance||||||
-|Volkswagen|Golf Alltrack 2017-18|Driver Assistance||||||
-|Volkswagen|Golf GTE 2016|Driver Assistance||||||
-|Volkswagen|Golf GTI 2018-21|Driver Assistance||||||
-|Volkswagen|Golf R 2016-19|Driver Assistance||||||
-|Volkswagen|Golf SportsVan 2016|Driver Assistance||||||
-|Volkswagen|Golf SportWagen 2015|Driver Assistance||||||
-|Volkswagen|Passat 2015-19[6](#footnotes)|Driver Assistance||||||
-|Volkswagen|Polo 2020|Driver Assistance||||||
-
-# Bronze - 80 cars
+|Volkswagen|Atlas 2018-22[7](#footnotes)|Driver Assistance||||||
+|Volkswagen|Atlas Cross Sport 2021-22[7](#footnotes)|Driver Assistance||||||
+|Volkswagen|e-Golf 2014-20|Driver Assistance||||||
+|Volkswagen|Golf 2015-20[8](#footnotes)|Driver Assistance||||||
+|Volkswagen|Golf Alltrack 2015-19|Driver Assistance||||||
+|Volkswagen|Golf GTD 2015-20|Driver Assistance||||||
+|Volkswagen|Golf GTE 2015-20|Driver Assistance||||||
+|Volkswagen|Golf GTI 2015-21|Driver Assistance||||||
+|Volkswagen|Golf R 2015-19[8](#footnotes)|Driver Assistance||||||
+|Volkswagen|Golf SportsVan 2015-20|Driver Assistance||||||
+|Volkswagen|Passat 2015-22[7](#footnotes)|Driver Assistance||||||
+|Volkswagen|Passat Alltrack 2015-22[7](#footnotes)|Driver Assistance||||||
+|Volkswagen|Passat GTE 2015-22[7](#footnotes)|Driver Assistance||||||
+|Volkswagen|Polo 2020-22[7](#footnotes)|Driver Assistance||||||
+|Volkswagen|Polo GTI 2020-22[7](#footnotes)|Driver Assistance||||||
+|Volkswagen|Teramont 2018-22[7](#footnotes)|Driver Assistance||||||
+|Volkswagen|Teramont Cross Sport 2021-22[7](#footnotes)|Driver Assistance||||||
+|Volkswagen|Teramont X 2021-22[7](#footnotes)|Driver Assistance||||||
+
+# Bronze - 83 cars
|Make|Model|Supported Package|openpilot ACC|Stop and Go|Steer to 0|Steering Torque|Actively Maintained|
|---|---|---|:---:|:---:|:---:|:---:|:---:|
@@ -219,11 +226,14 @@ How We Rate The Cars
|Toyota|Prius v 2017|TSS-P|[3](#footnotes)|||||
|Toyota|RAV4 2016-18|TSS-P|[3](#footnotes)|||||
|Toyota|Sienna 2018-20|All|[3](#footnotes)|||||
-|Volkswagen|Arteon 2018, 2021[7](#footnotes)|Driver Assistance||||||
+|Volkswagen|Arteon 2018-22[7](#footnotes)|Driver Assistance||||||
+|Volkswagen|Arteon eHybrid 2020-22[7](#footnotes)|Driver Assistance||||||
+|Volkswagen|Arteon R 2020-22[7](#footnotes)|Driver Assistance||||||
|Volkswagen|California 2021[7](#footnotes)|Driver Assistance||||||
|Volkswagen|Caravelle 2020[7](#footnotes)|Driver Assistance||||||
-|Volkswagen|Jetta 2018-21|Driver Assistance||||||
-|Volkswagen|Jetta GLI 2021|Driver Assistance||||||
+|Volkswagen|CC 2018-22[7](#footnotes)|Driver Assistance||||||
+|Volkswagen|Jetta 2018-22[7](#footnotes)|Driver Assistance||||||
+|Volkswagen|Jetta GLI 2021-22[7](#footnotes)|Driver Assistance||||||
|Volkswagen|T-Cross 2021[7](#footnotes)|Driver Assistance||||||
|Volkswagen|T-Roc 2021[7](#footnotes)|Driver Assistance||||||
|Volkswagen|Taos 2022[7](#footnotes)|Driver Assistance||||||
@@ -239,6 +249,7 @@ How We Rate The Cars
5Not including the China market Kamiq, which is based on the (currently) unsupported PQ34 platform.
6Not including the USA/China market Passat, which is based on the (currently) unsupported PQ35/NMS platform.
7Model-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.
+8Includes versions with extra rear cargo space (may be called Variant, Estate, SportWagen, Shooting Brake, etc.)
## 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/volkswagen/values.py b/selfdrive/car/volkswagen/values.py
index 6e64f705b0..8f38a00d4d 100755
--- a/selfdrive/car/volkswagen/values.py
+++ b/selfdrive/car/volkswagen/values.py
@@ -109,6 +109,9 @@ class Footnote(Enum):
"(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.",
Column.MODEL)
+ VW_VARIANT = CarFootnote(
+ "Includes versions with extra rear cargo space (may be called Variant, Estate, SportWagen, Shooting Brake, etc.)",
+ Column.MODEL)
@dataclass
@@ -118,24 +121,42 @@ class VWCarInfo(CarInfo):
CAR_INFO: Dict[str, Union[VWCarInfo, List[VWCarInfo]]] = {
- CAR.ARTEON_MK1: VWCarInfo("Volkswagen Arteon 2018, 2021", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533),
- CAR.ATLAS_MK1: VWCarInfo("Volkswagen Atlas 2018-19, 2022", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533),
+ CAR.ARTEON_MK1: [
+ VWCarInfo("Volkswagen Arteon 2018-22", footnotes=[Footnote.VW_HARNESS, Footnote.VW_VARIANT], harness=Harness.j533),
+ VWCarInfo("Volkswagen Arteon R 2020-22", footnotes=[Footnote.VW_HARNESS, Footnote.VW_VARIANT], harness=Harness.j533),
+ VWCarInfo("Volkswagen Arteon eHybrid 2020-22", footnotes=[Footnote.VW_HARNESS, Footnote.VW_VARIANT], harness=Harness.j533),
+ VWCarInfo("Volkswagen CC 2018-22", footnotes=[Footnote.VW_HARNESS, Footnote.VW_VARIANT], harness=Harness.j533),
+ ],
+ CAR.ATLAS_MK1: [
+ VWCarInfo("Volkswagen Atlas 2018-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533),
+ VWCarInfo("Volkswagen Atlas Cross Sport 2021-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533),
+ VWCarInfo("Volkswagen Teramont 2018-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533),
+ VWCarInfo("Volkswagen Teramont Cross Sport 2021-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533),
+ VWCarInfo("Volkswagen Teramont X 2021-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533),
+ ],
CAR.GOLF_MK7: [
- VWCarInfo("Volkswagen e-Golf 2014, 2018-20"),
- VWCarInfo("Volkswagen Golf 2015-20"),
- VWCarInfo("Volkswagen Golf Alltrack 2017-18"),
- VWCarInfo("Volkswagen Golf GTE 2016"),
- VWCarInfo("Volkswagen Golf GTI 2018-21"),
- VWCarInfo("Volkswagen Golf R 2016-19"),
- VWCarInfo("Volkswagen Golf SportsVan 2016"),
- VWCarInfo("Volkswagen Golf SportWagen 2015"),
+ VWCarInfo("Volkswagen e-Golf 2014-20"),
+ VWCarInfo("Volkswagen Golf 2015-20", footnotes=[Footnote.VW_VARIANT]),
+ VWCarInfo("Volkswagen Golf Alltrack 2015-19"),
+ VWCarInfo("Volkswagen Golf GTD 2015-20"),
+ VWCarInfo("Volkswagen Golf GTE 2015-20"),
+ VWCarInfo("Volkswagen Golf GTI 2015-21"),
+ VWCarInfo("Volkswagen Golf R 2015-19", footnotes=[Footnote.VW_VARIANT]),
+ VWCarInfo("Volkswagen Golf SportsVan 2015-20"),
],
CAR.JETTA_MK7: [
- VWCarInfo("Volkswagen Jetta 2018-21"),
- VWCarInfo("Volkswagen Jetta GLI 2021"),
+ VWCarInfo("Volkswagen Jetta 2018-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533),
+ VWCarInfo("Volkswagen Jetta GLI 2021-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533),
+ ],
+ CAR.PASSAT_MK8: [
+ VWCarInfo("Volkswagen Passat 2015-22", footnotes=[Footnote.VW_HARNESS, Footnote.PASSAT, Footnote.VW_VARIANT], harness=Harness.j533),
+ VWCarInfo("Volkswagen Passat Alltrack 2015-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533),
+ VWCarInfo("Volkswagen Passat GTE 2015-22", footnotes=[Footnote.VW_HARNESS, Footnote.VW_VARIANT], harness=Harness.j533),
+ ],
+ CAR.POLO_MK6: [
+ VWCarInfo("Volkswagen Polo 2020-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533),
+ VWCarInfo("Volkswagen Polo GTI 2020-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533),
],
- CAR.PASSAT_MK8: VWCarInfo("Volkswagen Passat 2015-19", footnotes=[Footnote.PASSAT]),
- CAR.POLO_MK6: VWCarInfo("Volkswagen Polo 2020"),
CAR.TAOS_MK1: VWCarInfo("Volkswagen Taos 2022", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533),
CAR.TCROSS_MK1: VWCarInfo("Volkswagen T-Cross 2021", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533),
CAR.TIGUAN_MK2: VWCarInfo("Volkswagen Tiguan 2019-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533),