Merge branch 'commaai:master' into master

commaai · Dec 20, 2023 · 5d30259 · 5d30259
2 parents 6d77dbd + adb04b5
commit 5d30259
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 41 deletions.
diff --git a/selfdrive/car/chrysler/fingerprints.py b/selfdrive/car/chrysler/fingerprints.py
@@ -67,7 +67,6 @@
   }],
 }
 
-
 FW_VERSIONS = {
   CAR.JEEP_GRAND_CHEROKEE_2019: {
     (Ecu.combinationMeter, 0x742, None): [

diff --git a/selfdrive/car/gm/fingerprints.py b/selfdrive/car/gm/fingerprints.py
@@ -1,7 +1,6 @@
 # ruff: noqa: E501
 from openpilot.selfdrive.car.gm.values import CAR
 
-
 FINGERPRINTS = {
   CAR.HOLDEN_ASTRA: [
   # Astra BK MY17, ASCM unplugged

diff --git a/selfdrive/car/honda/fingerprints.py b/selfdrive/car/honda/fingerprints.py
@@ -1280,29 +1280,29 @@
       b'78109-TV9-A510\x00\x00',
     ],
   },
-  CAR.HONDA_E:{
-    (Ecu.eps, 0x18DA30F1, None):[
+  CAR.HONDA_E: {
+    (Ecu.eps, 0x18DA30F1, None): [
       b'39990-TYF-N030\x00\x00'
     ],
-    (Ecu.gateway, 0x18DAEFF1, None):[
+    (Ecu.gateway, 0x18DAEFF1, None): [
       b'38897-TYF-E140\x00\x00'
     ],
-    (Ecu.shiftByWire, 0x18DA0BF1, None):[
+    (Ecu.shiftByWire, 0x18DA0BF1, None): [
       b'54008-TYF-E010\x00\x00'
     ],
-    (Ecu.srs, 0x18DA53F1, None):[
+    (Ecu.srs, 0x18DA53F1, None): [
       b'77959-TYF-G430\x00\x00'
     ],
-    (Ecu.combinationMeter, 0x18DA60F1, None):[
+    (Ecu.combinationMeter, 0x18DA60F1, None): [
       b'78108-TYF-G610\x00\x00'
     ],
-    (Ecu.fwdRadar, 0x18DAB0F1, None):[
+    (Ecu.fwdRadar, 0x18DAB0F1, None): [
       b'36802-TYF-E030\x00\x00'
     ],
-    (Ecu.fwdCamera, 0x18DAB5F1, None):[
+    (Ecu.fwdCamera, 0x18DAB5F1, None): [
       b'36161-TYF-E020\x00\x00'
     ],
-    (Ecu.vsa, 0x18DA28F1, None):[
+    (Ecu.vsa, 0x18DA28F1, None): [
       b'57114-TYF-E030\x00\x00'
     ],
   },

diff --git a/selfdrive/car/hyundai/fingerprints.py b/selfdrive/car/hyundai/fingerprints.py
@@ -79,7 +79,6 @@
   }],
 }
 
-
 FW_VERSIONS = {
   CAR.AZERA_6TH_GEN: {
     (Ecu.fwdRadar, 0x7d0, None): [
@@ -924,7 +923,7 @@
     (Ecu.fwdCamera, 0x7c4, None): [b'\xf1\x00OS9 LKAS AT USA LHD 1.00 1.00 95740-J9300 g21', ],
     (Ecu.transmission, 0x7e1, None): [b'\xf1\x816U2VE051\x00\x00\xf1\x006U2V0_C2\x00\x006U2VE051\x00\x00DOS4T16NS3\x00\x00\x00\x00', ],
   },
-  CAR.KIA_CEED:  {
+  CAR.KIA_CEED: {
     (Ecu.fwdRadar, 0x7D0, None): [b'\xf1\000CD__ SCC F-CUP      1.00 1.02 99110-J7000         ', ],
     (Ecu.eps, 0x7D4, None): [b'\xf1\000CD  MDPS C 1.00 1.06 56310-XX000 4CDEC106', ],
     (Ecu.fwdCamera, 0x7C4, None): [b'\xf1\000CD  LKAS AT EUR LHD 1.00 1.01 99211-J7000 B40', ],

diff --git a/selfdrive/car/interfaces.py b/selfdrive/car/interfaces.py
@@ -3,6 +3,7 @@
 import numpy as np
 import tomllib
 from abc import abstractmethod, ABC
+from enum import StrEnum
 from typing import Any, Dict, Optional, Tuple, List, Callable
 
 from cereal import car
@@ -440,7 +441,7 @@ def get_loopback_can_parser(CP):
 
 # interface-specific helpers
 
-def get_interface_attr(attr: str, combine_brands: bool = False, ignore_none: bool = False) -> Dict[str, Any]:
+def get_interface_attr(attr: str, combine_brands: bool = False, ignore_none: bool = False) -> Dict[str | StrEnum, Any]:
   # read all the folders in selfdrive/car and return a dict where:
   # - keys are all the car models or brand names
   # - values are attr values from all car folders

diff --git a/selfdrive/car/mazda/fingerprints.py b/selfdrive/car/mazda/fingerprints.py
@@ -109,7 +109,7 @@
     ],
   },
 
-  CAR.CX9 : {
+  CAR.CX9: {
     (Ecu.eps, 0x730, None): [
       b'K070-3210X-C-00\x00\x00\x00\x00\x00\x00\x00\x00\x00',
       b'KJ01-3210X-G-00\x00\x00\x00\x00\x00\x00\x00\x00\x00',
@@ -146,7 +146,7 @@
       b'GSH7-67XK2-J\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00',
       b'GSH7-67XK2-K\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00',
       b'TK80-67XK2-C\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00',
-   ],
+    ],
     (Ecu.transmission, 0x7e1, None): [
       b'PXM4-21PS1-A\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00',
       b'PXM7-21PS1-A\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00',
@@ -230,7 +230,7 @@
     ],
   },
 
-  CAR.CX9_2021 : {
+  CAR.CX9_2021: {
     (Ecu.eps, 0x730, None): [
       b'TC3M-3210X-A-00\x00\x00\x00\x00\x00\x00\x00\x00\x00',
     ],

diff --git a/selfdrive/car/nissan/fingerprints.py b/selfdrive/car/nissan/fingerprints.py
@@ -39,7 +39,6 @@
   ]
 }
 
-
 FW_VERSIONS = {
   CAR.ALTIMA: {
     (Ecu.fwdCamera, 0x707, None): [
@@ -55,7 +54,7 @@
       b'284U29HE0A',
     ],
   },
-    CAR.LEAF: {
+  CAR.LEAF: {
     (Ecu.abs, 0x740, None): [
       b'476606WK9B',
     ],

diff --git a/selfdrive/car/subaru/fingerprints.py b/selfdrive/car/subaru/fingerprints.py
@@ -292,7 +292,7 @@
       b'\xd2\xa1`r\x07',
     ],
     (Ecu.transmission, 0x7e1, None): [
-       b'\x1b\xa7@a\x00',
+      b'\x1b\xa7@a\x00',
     ],
   },
   CAR.FORESTER_PREGLOBAL: {

diff --git a/selfdrive/car/toyota/fingerprints.py b/selfdrive/car/toyota/fingerprints.py
@@ -1269,26 +1269,26 @@
     ],
   },
   CAR.LEXUS_ESH: {
-      (Ecu.engine, 0x7e0, None): [
-        b'\x02333M4200\x00\x00\x00\x00\x00\x00\x00\x00A4701000\x00\x00\x00\x00\x00\x00\x00\x00',
-      ],
-      (Ecu.abs, 0x7b0, None): [
-        b'F152633171\x00\x00\x00\x00\x00\x00',
-      ],
-      (Ecu.dsu, 0x791, None): [
-        b'881513310400\x00\x00\x00\x00',
-      ],
-      (Ecu.eps, 0x7a1, None): [
-        b'8965B33512\x00\x00\x00\x00\x00\x00',
-      ],
-      (Ecu.fwdRadar, 0x750, 0xf): [
-        b'8821F4701100\x00\x00\x00\x00',
-        b'8821F4701300\x00\x00\x00\x00',
-      ],
-      (Ecu.fwdCamera, 0x750, 0x6d): [
-        b'8646F3302001\x00\x00\x00\x00',
-        b'8646F3302200\x00\x00\x00\x00',
-      ],
+    (Ecu.engine, 0x7e0, None): [
+      b'\x02333M4200\x00\x00\x00\x00\x00\x00\x00\x00A4701000\x00\x00\x00\x00\x00\x00\x00\x00',
+    ],
+    (Ecu.abs, 0x7b0, None): [
+      b'F152633171\x00\x00\x00\x00\x00\x00',
+    ],
+    (Ecu.dsu, 0x791, None): [
+      b'881513310400\x00\x00\x00\x00',
+    ],
+    (Ecu.eps, 0x7a1, None): [
+      b'8965B33512\x00\x00\x00\x00\x00\x00',
+    ],
+    (Ecu.fwdRadar, 0x750, 0xf): [
+      b'8821F4701100\x00\x00\x00\x00',
+      b'8821F4701300\x00\x00\x00\x00',
+    ],
+    (Ecu.fwdCamera, 0x750, 0x6d): [
+      b'8646F3302001\x00\x00\x00\x00',
+      b'8646F3302200\x00\x00\x00\x00',
+    ],
   },
   CAR.LEXUS_GS_F: {
     (Ecu.engine, 0x7E0, None): [

diff --git a/selfdrive/car/volkswagen/fingerprints.py b/selfdrive/car/volkswagen/fingerprints.py
@@ -3,7 +3,6 @@
 
 Ecu = car.CarParams.Ecu
 
-
 FW_VERSIONS = {
   CAR.ARTEON_MK1: {
     (Ecu.engine, 0x7e0, None): [