Curb my enthusiasm

selfdrive/car/volkswagen/interface.py

@@ -46,12 +46,12 @@ class CarInterface(CarInterfaceBase):
 
       # Per-chassis tuning values, override tuning defaults here if desired
 
-      if candidate == CAR.AU_A3_MK3:
+      if candidate == CAR.AUDI_A3:
         # Averages of all 8V A3 variants
         ret.mass = 1335 + STD_CARGO_KG
         ret.wheelbase = 2.61
 
-      elif candidate == CAR.VW_GOLF_MK7:
+      elif candidate == CAR.GOLF:
         # Averages of all AU Golf variants
         ret.mass = 1397 + STD_CARGO_KG
         ret.wheelbase = 2.62

selfdrive/car/volkswagen/values.py

@@ -48,26 +48,25 @@ MQB_LDW_MESSAGES = {
 }
 
 class CAR:
-  AU_A3_MK3 = "AUDI A3 3RD GEN"
+  GOLF = "VOLKSWAGEN GOLF"
-  VW_GOLF_MK7 = "VOLKSWAGEN GOLF 7TH GEN"
+  AUDI_A3 = "AUDI A3"
 
 MQB_CARS = {
-  CAR.AU_A3_MK3,             # Chassis 8V, 2013-2019, includes A3, A3 e-tron, A3 g-tron, S3, RS3
+  CAR.GOLF,                 # Chassis AU, 2013-2020, includes Golf, Alltrack, Sportwagen, GTI, GTI TCR, GTE, GTD, Clubsport, Golf R, e-Golf
-  CAR.VW_GOLF_MK7            # Chassis AU, 2013-2020, includes Golf, Alltrack, Sportwagen, GTI, GTI TCR, GTE, GTD, Clubsport, Golf R, e-Golf
+  CAR.AUDI_A3               # Chassis 8V, 2013-2019, includes A3, A3 e-tron, A3 g-tron, S3, RS3
 }
 
 FINGERPRINTS = {
-  CAR.AU_A3_MK3: [{
+  CAR.GOLF: [{
-    64: 8, 134: 8, 159: 8, 173: 8, 178: 8, 253: 8, 257: 8, 260: 8, 262: 8, 278: 8, 279: 8, 283: 8, 285: 8, 286: 8, 288: 8, 289: 8, 290: 8, 294: 8, 295: 8, 299: 8, 302: 8, 346: 8, 418: 8, 427: 8, 506: 8, 679: 8, 681: 8, 695: 8, 779: 8, 780: 8, 783: 8, 787: 8, 788: 8, 789: 8, 792: 8, 802: 8, 804: 8, 806: 8, 807: 8, 808: 8, 809: 8, 846: 8, 847: 8, 870: 8, 896: 8, 897:  8, 898: 8, 901: 8, 917: 8, 919: 8, 949: 8, 958: 8, 960: 4, 981: 8, 987: 8, 988: 8, 991: 8, 997: 8, 1000: 8, 1019: 8, 1122: 8, 1123: 8, 1124: 8, 1153: 8, 1162: 8, 1175: 8, 1312: 8, 1385: 8, 1413: 8, 1440: 5, 1514: 8, 1515: 8, 1520: 8, 1600: 8, 1601: 8, 1603: 8, 1624: 8, 1629: 8, 1631: 8, 1646: 8, 1648: 8, 1712: 6, 1714: 8, 1716: 8, 1717: 8, 1719: 8, 1720: 8, 1721: 8, 1792: 8, 1872: 8, 1976: 8, 1977: 8, 1982: 8, 1985: 8
-  }],
-  CAR.VW_GOLF_MK7: [{
     64: 8, 134: 8, 159: 8, 173: 8, 178: 8, 253: 8, 257: 8, 260: 8, 262: 8, 264: 8, 278: 8, 279: 8, 283: 8, 286: 8, 288: 8, 289: 8, 290: 8, 294: 8, 299: 8, 302: 8, 346: 8, 385: 8, 418: 8, 427: 8, 668: 8, 679: 8, 681: 8, 695: 8, 779: 8, 780: 8, 783: 8, 792: 8, 795: 8, 804: 8, 806: 8, 807: 8, 808: 8, 809: 8, 870: 8, 896: 8, 897: 8, 898: 8, 901: 8, 917: 8, 919: 8, 927: 8, 949: 8, 958: 8, 960: 4, 981: 8, 987: 8, 988: 8, 991: 8, 997: 8, 1000: 8, 1019: 8, 1120: 8, 1122: 8, 1123: 8, 1124: 8, 1153: 8, 1162: 8, 1175: 8, 1312: 8, 1385: 8, 1413: 8, 1440: 5, 1514: 8, 1515: 8, 1520: 8, 1529: 8, 1600: 8, 1601: 8, 1603: 8, 1605: 8, 1624: 8, 1626: 8, 1629: 8, 1631: 8, 1646: 8, 1648: 8, 1712: 6, 1714: 8, 1716: 8, 1717: 8, 1719: 8, 1720: 8, 1721: 8
   }],
+  CAR.AUDI_A3: [{
+    64: 8, 134: 8, 159: 8, 173: 8, 178: 8, 253: 8, 257: 8, 260: 8, 262: 8, 278: 8, 279: 8, 283: 8, 285: 8, 286: 8, 288: 8, 289: 8, 290: 8, 294: 8, 295: 8, 299: 8, 302: 8, 346: 8, 418: 8, 427: 8, 506: 8, 679: 8, 681: 8, 695: 8, 779: 8, 780: 8, 783: 8, 787: 8, 788: 8, 789: 8, 792: 8, 802: 8, 804: 8, 806: 8, 807: 8, 808: 8, 809: 8, 846: 8, 847: 8, 870: 8, 896: 8, 897: 8, 898: 8, 901: 8, 917: 8, 919: 8, 949: 8, 958: 8, 960: 4, 981: 8, 987: 8, 988: 8, 991: 8, 997: 8, 1000: 8, 1019: 8, 1122: 8, 1123: 8, 1124: 8, 1153: 8, 1162: 8, 1175: 8, 1312: 8, 1385: 8, 1413: 8, 1440: 5, 1514: 8, 1515: 8, 1520: 8, 1600: 8, 1601: 8, 1603: 8, 1624: 8, 1629: 8, 1631: 8, 1646: 8, 1648: 8, 1712: 6, 1714: 8, 1716: 8, 1717: 8, 1719: 8, 1720: 8, 1721: 8, 1792: 8, 1872: 8, 1976: 8, 1977: 8, 1982: 8, 1985: 8
+  }],
 }
 
 FW_VERSIONS = {
-  CAR.VW_GOLF_MK7: {
+  CAR.GOLF: {
-    # Mk7 2013-2017 and Mk7.5 facelift 2018-2020
     (Ecu.engine, 0x7e0, None): [
       b'8V0906259P ',  # 2018 Golf R (DJJA)
     ],
@@ -93,6 +92,6 @@ FW_VERSIONS = {
 }
 
 DBC = {
-  CAR.AU_A3_MK3: dbc_dict('vw_mqb_2010', None),
+  CAR.GOLF: dbc_dict('vw_mqb_2010', None),
-  CAR.VW_GOLF_MK7: dbc_dict('vw_mqb_2010', None),
+  CAR.AUDI_A3: dbc_dict('vw_mqb_2010', None),
 }