From 201ff2daa96314c0bd134487e3d997af4e86cb73 Mon Sep 17 00:00:00 2001
From: Jason Young <46612682+jyoung8607@users.noreply.github.com>
Date: Fri, 4 Oct 2024 15:05:41 -0700
Subject: [PATCH] Toyota: More RAV4 Prime fingerprints (#1343)

* from @pd0wm commaai/opendbc#1005

* from @pd0wm commaai/openpilot#31179

* we did need that flag rename

* those flags were numbered like that for a reason

* no more bustime

* add secOCKey to structs

* hack around new pitch value for now

* secOCKey placeholder

* help the test along for now

* codespell disapproves of my creative vision

* add crypto dependency

* the other one

* the other other one

* temp use SecOC branch of Panda

* i am the panda, for now

* propitiate static type checker

* on second thought, moving car.capnp is a good idea

* remove the SecOC key from CarParams

* remove SecOC key reading from Toyota port

* add secoc_key to CS/CC

* update SecOC key references

* default key in interfaces for tests

* more CarParams.SecurityConfig

* set secOcRequired at startup for SecOC car

* see if type checker likes this better

* santa please bring car.capnp back soon

* list -> flag

* diff reduction: won't need the flag rename

* add IDLE_COAST signal

* regen RAV4 DBC

* consolidate and remove ALT_GAS_MSG flag

* consolidate and remove GEAR_PACKET_HYBRID flag

* cleanup pitch signal

* cleanup can_gear

* cleanup SECOC_SYNCHRONIZATION

* more cleanup

* cleanup Mirai

* FLAG.value consistency, in case capnp move needs this

* not necessary, reduce diff with master

* prettier

* validation like this should be an offline test

* match non-SecOC LTA message

* follow secoc library move

* repack flag values

* whitespace fix

* cleanup stockAeb

* comment not necessary

* add explicit FIXME for pandacan ref

* how did that sneak back in

* mention why CarDocs are missing

* use carlog to note wrong key problems

* limit logging volume

* add migration entry for old routes

* add FW from 2fdfcfb945894324/00000151--11c864bd11

* add FW from 955536bf30ea4500/00000266--b60f72d541

* add FW from 5ac52f5bc37079ce/00000004--dd8686b2d0

* Revert "add migration entry for old routes"

This reverts commit 9791f10ba507647766f14114777f5832a957a96c.
---
 opendbc/car/toyota/fingerprints.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/opendbc/car/toyota/fingerprints.py b/opendbc/car/toyota/fingerprints.py
index b94b006790..4467542c70 100644
--- a/opendbc/car/toyota/fingerprints.py
+++ b/opendbc/car/toyota/fingerprints.py
@@ -1007,19 +1007,24 @@
   },
   CAR.TOYOTA_RAV4_PRIME: {
     (Ecu.engine, 0x700, None): [
-      b'\x018966342S7000\x00\x00\x00\x00'
+      b'\x018966342S7000\x00\x00\x00\x00',
+      b'\x018966342Z1000\x00\x00\x00\x00',
+      b'\x018966342Z1100\x00\x00\x00\x00',
     ],
     (Ecu.abs, 0x7b0, None): [
-      b'\x01F15264228300\x00\x00\x00\x00'
+      b'\x01F15264228300\x00\x00\x00\x00',
+      b'\x01F15264228500\x00\x00\x00\x00',
+      b'\x01F15264284100\x00\x00\x00\x00',
     ],
     (Ecu.eps, 0x7a1, None): [
-      b'\x018965B4209000\x00\x00\x00\x00'
+      b'\x018965B4209000\x00\x00\x00\x00',
     ],
     (Ecu.fwdRadar, 0x750, 0xf): [
-      b'\x018821F3301400\x00\x00\x00\x00'
+      b'\x018821F3301400\x00\x00\x00\x00',
     ],
     (Ecu.fwdCamera, 0x750, 0x6d): [
-      b'\x028646F4205200\x00\x00\x00\x008646G4202000\x00\x00\x00\x00'
+      b'\x028646F4205200\x00\x00\x00\x008646G4202000\x00\x00\x00\x00',
+      b'\x028646F4205300\x00\x00\x00\x008646G4202100\x00\x00\x00\x00',
     ],
   },
   CAR.TOYOTA_RAV4_TSS2: {