From 71ebb6fd03ad8acad7f7675ac7b8c11a9903c123 Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Tue, 18 Jul 2023 23:04:55 -0700
Subject: [PATCH] Toyota: add hybrid ECU FW versions for 2023 RAV4 Hybrid
 (#29023)

* add hybrid FW for a2c30de116fe186d

* add hybrid FW for 60b363805ee9fc06

* add hybrid FW for 5b05f9d3f9574132 & 459707e5f696e897

* remove from extra_ecus, we can't conditionally mark not logging

* add likely protocols
old-commit-hash: 527d13ad6782c6b03bf57b49fb8a99de324ae05b
---
 selfdrive/car/toyota/values.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py
index fe354f1dd6..c36f0c906c 100644
--- a/selfdrive/car/toyota/values.py
+++ b/selfdrive/car/toyota/values.py
@@ -272,9 +272,8 @@ FW_QUERY_CONFIG = FwQueryConfig(
     # Responds to KWP (0x1a8881):
     # - Body Control Module ((0x750, 0x40))
 
-    # Hybrid control computer can be on one of two addresses
+    # Hybrid control computer can be on 0x7e2 (KWP) or 0x7d2 (UDS) depending on platform
     (Ecu.hybrid, 0x7e2, None),  # Hybrid Control Assembly & Computer
-    (Ecu.hybrid, 0x7d2, None),  # Hybrid Control Assembly & Computer
     # TODO: if these duplicate ECUs always exist together, remove one
     (Ecu.srs, 0x780, None),     # SRS Airbag
     (Ecu.srs, 0x784, None),     # SRS Airbag 2
@@ -1653,6 +1652,11 @@ FW_VERSIONS = {
       b'\x01896634AE1001\x00\x00\x00\x00',
       b'\x01896634AF0000\x00\x00\x00\x00',
     ],
+    (Ecu.hybrid, 0x7d2, None): [
+      b'\x02899830R41000\x00\x00\x00\x00899850R20000\x00\x00\x00\x00',
+      b'\x028998342C0000\x00\x00\x00\x00899854224000\x00\x00\x00\x00',
+      b'\x02899830R39000\x00\x00\x00\x00899850R20000\x00\x00\x00\x00',
+    ],
     (Ecu.fwdRadar, 0x750, 0xf): [
       b'\x018821F0R03100\x00\x00\x00\x00',
     ],