Merge branch 'commaai:master' into ccnc-port

commaai · Jan 28, 2025 · fbe4d17 · fbe4d17
2 parents 7a24a75 + ddd7b73
commit fbe4d17
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 2 deletions.
diff --git a/docs/CARS.md b/docs/CARS.md
@@ -200,7 +200,7 @@
 |Lexus|RX Hybrid 2016|Lexus Safety System+|[Upstream](#upstream)|
 |Lexus|RX Hybrid 2017-19|All|[Upstream](#upstream)|
 |Lexus|RX Hybrid 2020-22|All|[Upstream](#upstream)|
-|Lexus|UX Hybrid 2019-23|All|[Upstream](#upstream)|
+|Lexus|UX Hybrid 2019-24|All|[Upstream](#upstream)|
 |Lincoln|Aviator 2020-24|Co-Pilot360 Plus|[Upstream](#upstream)|
 |Lincoln|Aviator Plug-in Hybrid 2020-24|Co-Pilot360 Plus|[Upstream](#upstream)|
 |MAN|eTGE 2020-24|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)|

diff --git a/opendbc/car/chrysler/fingerprints.py b/opendbc/car/chrysler/fingerprints.py
@@ -441,6 +441,7 @@
       b'68510277AG',
       b'68510277AH',
       b'68510280AG',
+      b'68510280AH',
       b'68510282AG',
       b'68510282AH',
       b'68510283AG',

diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py
@@ -571,6 +571,7 @@
       b'28101-5EY-A040\x00\x00',
       b'28101-5EY-A050\x00\x00',
       b'28101-5EY-A100\x00\x00',
+      b'28101-5EY-A330\x00\x00',
       b'28101-5EY-A430\x00\x00',
       b'28101-5EY-A500\x00\x00',
       b'28101-5EZ-A050\x00\x00',

diff --git a/opendbc/car/toyota/fingerprints.py b/opendbc/car/toyota/fingerprints.py
@@ -262,6 +262,7 @@
       b'\x018966306T4100\x00\x00\x00\x00',
       b'\x018966306V1000\x00\x00\x00\x00',
       b'\x018966333Z1000\x00\x00\x00\x00',
+      b'\x018966333Z9000\x00\x00\x00\x00',
       b'\x01896633T20000\x00\x00\x00\x00',
     ],
     (Ecu.fwdRadar, 0x750, 0xf): [
@@ -1179,6 +1180,7 @@
     ],
     (Ecu.engine, 0x700, None): [
       b'\x01896634A02001\x00\x00\x00\x00',
+      b'\x01896634A02101\x00\x00\x00\x00',
       b'\x01896634A03000\x00\x00\x00\x00',
       b'\x01896634A08000\x00\x00\x00\x00',
       b'\x01896634A59000\x00\x00\x00\x00',
@@ -1253,6 +1255,7 @@
       b'\x01896630851200\x00\x00\x00\x00',
       b'\x01896630852000\x00\x00\x00\x00',
       b'\x01896630852100\x00\x00\x00\x00',
+      b'\x01896630852200\x00\x00\x00\x00',
       b'\x01896630859000\x00\x00\x00\x00',
       b'\x01896630860000\x00\x00\x00\x00',
     ],

diff --git a/opendbc/car/toyota/values.py b/opendbc/car/toyota/values.py
@@ -180,7 +180,7 @@ class CAR(Platforms):
       ToyotaCarDocs("Toyota Corolla Hybrid 2020-22"),
       ToyotaCarDocs("Toyota Corolla Hybrid (South America only) 2020-23", min_enable_speed=7.5),
       ToyotaCarDocs("Toyota Corolla Cross Hybrid (Non-US only) 2020-22", min_enable_speed=7.5),
-      ToyotaCarDocs("Lexus UX Hybrid 2019-23"),
+      ToyotaCarDocs("Lexus UX Hybrid 2019-24"),
     ],
     CarSpecs(mass=3060. * CV.LB_TO_KG, wheelbase=2.67, steerRatio=13.9, tireStiffnessFactor=0.444),
   )

diff --git a/opendbc/car/volkswagen/fingerprints.py b/opendbc/car/volkswagen/fingerprints.py
@@ -359,6 +359,7 @@
   },
   CAR.VOLKSWAGEN_JETTA_MK7: {
     (Ecu.engine, 0x7e0, None): [
+      b'\xf1\x8704E906024AF\xf1\x899970',
       b'\xf1\x8704E906024AK\xf1\x899937',
       b'\xf1\x8704E906024AS\xf1\x899912',
       b'\xf1\x8704E906024B \xf1\x895594',