From cb4ab313623802a7af331a3ebd7cc0322735ba5f Mon Sep 17 00:00:00 2001
From: Erich Moraga <33645296+ErichMoraga@users.noreply.github.com>
Date: Tue, 18 May 2021 17:46:04 -0500
Subject: [PATCH] Add missing Camry FW (#20953)

* Add missing several missing Camry firmwares

@oxigen#0649 2019 Toyota Camry ICE  DongleID/route 04b2f59611cf9e7f|2021-05-18--11-11-17

* Update fw_versions.py
---
 selfdrive/car/fw_versions.py   | 2 +-
 selfdrive/car/toyota/values.py | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/selfdrive/car/fw_versions.py b/selfdrive/car/fw_versions.py
index 0e3e038222..edf777af47 100755
--- a/selfdrive/car/fw_versions.py
+++ b/selfdrive/car/fw_versions.py
@@ -209,7 +209,7 @@ def match_fw_to_car_exact(fw_versions_dict):
         continue
 
       # On some Toyota models, the engine can show on two different addresses
-      if ecu_type == Ecu.engine and candidate in [TOYOTA.COROLLA_TSS2, TOYOTA.CHR, TOYOTA.LEXUS_IS, TOYOTA.AVALON] and found_version is None:
+      if ecu_type == Ecu.engine and candidate in [TOYOTA.CAMRY, TOYOTA.COROLLA_TSS2, TOYOTA.CHR, TOYOTA.LEXUS_IS, TOYOTA.AVALON] and found_version is None:
         continue
 
       # Ignore non essential ecus
diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py
index d9daaf9ac4..2cfb18675d 100644
--- a/selfdrive/car/toyota/values.py
+++ b/selfdrive/car/toyota/values.py
@@ -361,12 +361,16 @@ FW_VERSIONS = {
       b'\x018966333Q6300\x00\x00\x00\x00',
       b'\x018966333W6000\x00\x00\x00\x00',
     ],
+    (Ecu.engine, 0x7e0, None): [
+      b'\x02333P1100\x00\x00\x00\x00\x00\x00\x00\x00A0202000\x00\x00\x00\x00\x00\x00\x00\x00',
+    ],
     (Ecu.dsu, 0x791, None): [
       b'8821F0601200    ',
       b'8821F0601300    ',
       b'8821F0602000    ',
       b'8821F0603300    ',
       b'8821F0604100    ',
+      b'8821F0605200    ',
       b'8821F0607200    ',
       b'8821F0608000    ',
       b'8821F0608200    ',
@@ -395,6 +399,7 @@ FW_VERSIONS = {
       b'8821F0602000    ',
       b'8821F0603300    ',
       b'8821F0604100    ',
+      b'8821F0605200    ',
       b'8821F0607200    ',
       b'8821F0608000    ',
       b'8821F0608200    ',
@@ -405,6 +410,7 @@ FW_VERSIONS = {
       b'8646F0601300    ',
       b'8646F0601400    ',
       b'8646F0603400    ',
+      b'8646F0604100    ',
       b'8646F0605000    ',
       b'8646F0606000    ',
       b'8646F0606100    ',