VW MQB: carFw updates, model-year support expansion, various cleanup (#20599)

* Additional FPv2 data

* Expand e-Golf supported years

* Add 2016 Skoda Superb FW (ItsMe)

* FW version dedupe after merge

* Sort FW versions

* GC dead comment
old-commit-hash: 87f4a811aa

README.md

@@ -174,12 +174,12 @@ Community Maintained Cars and Features
 | SEAT      | Ateca 2018                    | Driver Assistance | Stock            | 0mph               | 0mph         |
 | Škoda     | Kodiaq 2018                   | Driver Assistance | Stock            | 0mph               | 0mph         |
 | Škoda     | Scala 2020                    | Driver Assistance | Stock            | 0mph               | 0mph         |
-| Škoda     | Superb 2018                   | Driver Assistance | Stock            | 0mph               | 0mph         |
+| Škoda     | Superb 2016-18                | Driver Assistance | Stock            | 0mph               | 0mph         |
 | Subaru    | Ascent 2019                   | EyeSight          | Stock            | 0mph               | 0mph         |
 | Subaru    | Crosstrek 2018-19             | EyeSight          | Stock            | 0mph               | 0mph         |
 | Subaru    | Forester 2019-20              | EyeSight          | Stock            | 0mph               | 0mph         |
 | Subaru    | Impreza 2017-19               | EyeSight          | Stock            | 0mph               | 0mph         |
-| Volkswagen| e-Golf 2014, 2020             | Driver Assistance | Stock            | 0mph               | 0mph         |
+| Volkswagen| e-Golf 2014, 2019-20          | Driver Assistance | Stock            | 0mph               | 0mph         |
 | Volkswagen| Golf 2015-19                  | Driver Assistance | Stock            | 0mph               | 0mph         |
 | Volkswagen| Golf GTE 2016                 | Driver Assistance | Stock            | 0mph               | 0mph         |
 | Volkswagen| Golf GTI 2018-19              | Driver Assistance | Stock            | 0mph               | 0mph         |

selfdrive/car/volkswagen/carstate.py

@@ -242,9 +242,6 @@ class CarState(CarStateBase):
 
     return CANParser(DBC[CP.carFingerprint]['pt'], signals, checks, CANBUS.pt)
 
-  # A single signal is monitored from the camera CAN bus, and then ignored,
-  # so the presence of CAN traffic can be verified with cam_cp.valid.
-
   @staticmethod
   def get_cam_can_parser(CP):
 

selfdrive/car/volkswagen/values.py

@@ -106,60 +106,69 @@ FW_VERSIONS = {
       b'\xf1\x8704E906023BN\xf1\x894518',
       b'\xf1\x8704E906027GR\xf1\x892394',
       b'\xf1\x8704L906026NF\xf1\x899528',
+      b'\xf1\x8704L906056CR\xf1\x895813',
       b'\xf1\x8704L906056HE\xf1\x893758',
       b'\xf1\x870EA906016A \xf1\x898343',
+      b'\xf1\x870EA906016F \xf1\x895002',
       b'\xf1\x870EA906016S \xf1\x897207',
       b'\xf1\x875G0906259  \xf1\x890007',
       b'\xf1\x875G0906259J \xf1\x890002',
       b'\xf1\x875G0906259L \xf1\x890002',
       b'\xf1\x875G0906259Q \xf1\x890002',
+      b'\xf1\x875G0906259Q \xf1\x892313',
       b'\xf1\x878V0906259J \xf1\x890003',
       b'\xf1\x878V0906259P \xf1\x890001',
       b'\xf1\x878V0906259Q \xf1\x890002',
     ],
     (Ecu.transmission, 0x7e1, None): [
+      b'\xf1\x870CW300042F \xf1\x891604',
       b'\xf1\x870CW300045  \xf1\x894531',
-      b'\xf1\x870D9300040S \xf1\x894311',
       b'\xf1\x870CW300047D \xf1\x895261',
+      b'\xf1\x870CW300048J \xf1\x890611',
       b'\xf1\x870D9300012  \xf1\x894913',
-      b'\xf1\x870CW300042F \xf1\x891604',
-      b'\xf1\x870DD300046F \xf1\x891601',
       b'\xf1\x870D9300020S \xf1\x895201',
+      b'\xf1\x870D9300040S \xf1\x894311',
+      b'\xf1\x870DD300045K \xf1\x891120',
+      b'\xf1\x870DD300046F \xf1\x891601',
       b'\xf1\x870GC300012A \xf1\x891403',
-      b'\xf1\x870GC300043T \xf1\x899999',
-      b'\xf1\x870GC300020G \xf1\x892404',
       b'\xf1\x870GC300014B \xf1\x892401',
       b'\xf1\x870GC300014B \xf1\x892405',
-      b'\xf1\x870DD300045K \xf1\x891120',
+      b'\xf1\x870GC300020G \xf1\x892403',
+      b'\xf1\x870GC300020G \xf1\x892404',
+      b'\xf1\x870GC300043T \xf1\x899999',
     ],
     (Ecu.srs, 0x715, None): [
+      b'\xf1\x875Q0959655AA\xf1\x890386\xf1\x82\0211413001113120043114317121C111C9113',
+      b'\xf1\x875Q0959655AA\xf1\x890386\xf1\x82\0211413001113120053114317121C111C9113',
+      b'\xf1\x875Q0959655AA\xf1\x890388\xf1\x82\0211413001113120043114317121C111C9113',
+      b'\xf1\x875Q0959655AA\xf1\x890388\xf1\x82\0211413001113120043114417121411149113',
+      b'\xf1\x875Q0959655AA\xf1\x890388\xf1\x82\0211413001113120053114317121C111C9113',
+      b'\xf1\x875Q0959655BH\xf1\x890336\xf1\x82\02314160011123300314211012230229333463100',
+      b'\xf1\x875Q0959655BT\xf1\x890403\xf1\x82\023141600111233003142405A2252229333463100',
       b'\xf1\x875Q0959655J \xf1\x890830\xf1\x82\023271212111312--071104171838103891131211',
+      b'\xf1\x875Q0959655J \xf1\x890830\xf1\x82\023341512112212--071104172328102891131211',
       b'\xf1\x875Q0959655J \xf1\x890830\xf1\x82\x13272512111312--07110417182C102C91131211',
       b'\xf1\x875Q0959655M \xf1\x890361\xf1\x82\0211413001112120041114115121611169112',
-      b'\xf1\x875Q0959655S \xf1\x890870\xf1\x82\02324230011211200621143171724112491132111',
       b'\xf1\x875Q0959655S \xf1\x890870\xf1\x82\02315120011211200621143171717111791132111',
-      b'\xf1\x875Q0959655S \xf1\x890870\xf1\x82\x1315120011211200061104171717101791132111',
       b'\xf1\x875Q0959655S \xf1\x890870\xf1\x82\02324230011211200061104171724102491132111',
-      b'\xf1\x875Q0959655AA\xf1\x890386\xf1\x82\0211413001113120053114317121C111C9113',
+      b'\xf1\x875Q0959655S \xf1\x890870\xf1\x82\02324230011211200621143171724112491132111',
-      b'\xf1\x875Q0959655AA\xf1\x890386\xf1\x82\0211413001113120043114317121C111C9113',
+      b'\xf1\x875Q0959655S \xf1\x890870\xf1\x82\x1315120011211200061104171717101791132111',
-      b'\xf1\x875Q0959655AA\xf1\x890388\xf1\x82\0211413001113120053114317121C111C9113',
-      b'\xf1\x875Q0959655AA\xf1\x890388\xf1\x82\0211413001113120043114417121411149113',
-      b'\xf1\x875Q0959655BH\xf1\x890336\xf1\x82\02314160011123300314211012230229333463100',
-      b'\xf1\x875Q0959655BT\xf1\x890403\xf1\x82\023141600111233003142405A2252229333463100',
     ],
     (Ecu.eps, 0x712, None): [
       b'\xf1\x873Q0909144F \xf1\x895043\xf1\x82\00561A01612A0',
       b'\xf1\x873Q0909144H \xf1\x895061\xf1\x82\00566A0J612A1',
+      b'\xf1\x873Q0909144J \xf1\x895063\xf1\x82\00566A00514A1',
       b'\xf1\x873Q0909144L \xf1\x895081\xf1\x82\x0571A0JA15A1',
       b'\xf1\x873Q0909144M \xf1\x895082\xf1\x82\00571A0JA16A1',
       b'\xf1\x875Q0909143K \xf1\x892033\xf1\x820519A9040203',
-      b'\xf1\x875Q0909144L \xf1\x891021\xf1\x82\00522A00402A0',
-      b'\xf1\x875Q0909144P \xf1\x891043\xf1\x82\00511A00403A0',
-      b'\xf1\x875Q0909144S \xf1\x891063\xf1\x82\00516A07A02A1',
       b'\xf1\x875Q0909144AA\xf1\x891081\xf1\x82\00521A00441A1',
       b'\xf1\x875Q0909144AA\xf1\x891081\xf1\x82\x0521A00641A1',
       b'\xf1\x875Q0909144AB\xf1\x891082\xf1\x82\00521A00642A1',
       b'\xf1\x875Q0909144AB\xf1\x891082\xf1\x82\00521A07B05A1',
+      b'\xf1\x875Q0909144L \xf1\x891021\xf1\x82\00522A00402A0',
+      b'\xf1\x875Q0909144P \xf1\x891043\xf1\x82\00511A00403A0',
+      b'\xf1\x875Q0909144S \xf1\x891063\xf1\x82\00516A07A02A1',
+      b'\xf1\x875QN909144A \xf1\x895081\xf1\x82\00571A01A18A1',
       b'\xf1\x875QN909144A \xf1\x895081\xf1\x82\x0571A01A17A1',
     ],
     (Ecu.fwdRadar, 0x757, None): [
@@ -175,9 +184,9 @@ FW_VERSIONS = {
   },
   CAR.JETTA_MK7: {
     (Ecu.engine, 0x7e0, None): [
+      b'\xf1\x8704E906024AK\xf1\x899937',
       b'\xf1\x8704E906024B \xf1\x895594',
       b'\xf1\x8704E906024L \xf1\x895595',
-      b'\xf1\x8704E906024AK\xf1\x899937',
       b'\xf1\x875G0906259T \xf1\x890003',
     ],
     (Ecu.transmission, 0x7e1, None): [
@@ -187,8 +196,8 @@ FW_VERSIONS = {
     ],
     (Ecu.srs, 0x715, None): [
       b'\xf1\x875Q0959655AG\xf1\x890336\xf1\x82\02314171231313500314611011630169333463100',
-      b'\xf1\x875Q0959655BR\xf1\x890403\xf1\x82\02311170031313300314240011150119333433100',
       b'\xf1\x875Q0959655BM\xf1\x890403\xf1\x82\02314171231313500314643011650169333463100',
+      b'\xf1\x875Q0959655BR\xf1\x890403\xf1\x82\02311170031313300314240011150119333433100',
     ],
     (Ecu.eps, 0x712, None): [
       b'\xf1\x875QM909144B \xf1\x891081\xf1\x82\00521A10A01A1',
@@ -207,20 +216,20 @@ FW_VERSIONS = {
       b'\xf1\x8704L906026GA\xf1\x892013',
     ],
     (Ecu.transmission, 0x7e1, None): [
-      b'\xf1\x870DD300045T \xf1\x891601',
       b'\xf1\x870D9300014L \xf1\x895002',
+      b'\xf1\x870DD300045T \xf1\x891601',
     ],
     (Ecu.srs, 0x715, None): [
-      b'\xf1\x875Q0959655S \xf1\x890870\xf1\x82\02315120011111200631145171716121691132111',
       b'\xf1\x873Q0959655AN\xf1\x890306\xf1\x82\r58160058140013036914110311',
+      b'\xf1\x875Q0959655S \xf1\x890870\xf1\x82\02315120011111200631145171716121691132111',
     ],
     (Ecu.eps, 0x712, None): [
       b'\xf1\x875Q0909143M \xf1\x892041\xf1\x820522B0080803',
       b'\xf1\x875Q0909144T \xf1\x891072\xf1\x82\00521B00703A1',
     ],
     (Ecu.fwdRadar, 0x757, None): [
-      b'\xf1\x875Q0907572R \xf1\x890771',
       b'\xf1\x873Q0907572C \xf1\x890195',
+      b'\xf1\x875Q0907572R \xf1\x890771',
     ],
   },
   CAR.TIGUAN_MK2: {
@@ -242,11 +251,11 @@ FW_VERSIONS = {
   },
   CAR.AUDI_A3_MK3: {
     (Ecu.engine, 0x7e0, None): [
-      b'\xf1\x878V0906264B \xf1\x890003',
-      b'\xf1\x875G0906259L \xf1\x890002',
       b'\xf1\x8704E906023AN\xf1\x893695',
       b'\xf1\x8704E906023BL\xf1\x895190',
       b'\xf1\x8704L997022N \xf1\x899459',
+      b'\xf1\x875G0906259L \xf1\x890002',
+      b'\xf1\x878V0906264B \xf1\x890003',
     ],
     (Ecu.transmission, 0x7e1, None): [
       b'\xf1\x870CW300048  \xf1\x895201',
@@ -256,15 +265,15 @@ FW_VERSIONS = {
       b'\xf1\x870DD300046G \xf1\x891601',
     ],
     (Ecu.srs, 0x715, None): [
-      b'\xf1\x875Q0959655N \xf1\x890361\xf1\x82\0211212001112111104110411111521159114',
       b'\xf1\x875Q0959655J \xf1\x890825\xf1\x82\023111112111111--171115141112221291163221',
       b'\xf1\x875Q0959655J \xf1\x890830\xf1\x82\023121111111211--261117141112231291163221',
       b'\xf1\x875Q0959655J \xf1\x890830\xf1\x82\x13121111111111--341117141212231291163221',
+      b'\xf1\x875Q0959655N \xf1\x890361\xf1\x82\0211212001112111104110411111521159114',
     ],
     (Ecu.eps, 0x712, None): [
       b'\xf1\x875Q0909144P \xf1\x891043\xf1\x82\00503G00803A0',
-      b'\xf1\x875Q0909144T \xf1\x891072\xf1\x82\00521G00807A1',
       b'\xf1\x875Q0909144R \xf1\x891061\xf1\x82\00516G00804A1',
+      b'\xf1\x875Q0909144T \xf1\x891072\xf1\x82\00521G00807A1',
     ],
     (Ecu.fwdRadar, 0x757, None): [
       b'\xf1\x875Q0907572D \xf1\x890304\xf1\x82\00101',
@@ -328,15 +337,21 @@ FW_VERSIONS = {
   CAR.SKODA_SUPERB_MK3: {
     (Ecu.engine, 0x7e0, None): [
       b'\xf1\x8704L906026KB\xf1\x894071',
+      b'\xf1\x873G0906259B \xf1\x890002',
+    ],
+    (Ecu.transmission, 0x7e1, None): [
+      b'\xf1\x870D9300012  \xf1\x894940',
     ],
-    # Only onboarded Superb so far is a manual (Ecu.transmission, 0x7e1, None): [],
     (Ecu.srs, 0x715, None): [
+      b'\xf1\x875Q0959655AE\xf1\x890130\xf1\x82\022111200111121001121118112231292221111',
       b'\xf1\x875Q0959655BH\xf1\x890336\xf1\x82\02331310031313100313131013141319331413100',
     ],
     (Ecu.eps, 0x712, None): [
+      b'\xf1\x875Q0909143M \xf1\x892041\xf1\x820522UZ070303',
       b'\xf1\x875Q0910143B \xf1\x892201\xf1\x82\00563UZ060700',
     ],
     (Ecu.fwdRadar, 0x757, None): [
+      b'\xf1\x873Q0907572B \xf1\x890194',
       b'\xf1\x873Q0907572C \xf1\x890195',
     ],
   },