From 6c971feb849491ddf5aa95aada96cf94499a54bb Mon Sep 17 00:00:00 2001
From: martinl <martin@mlp.ee>
Date: Wed, 27 Apr 2022 06:34:41 +0300
Subject: [PATCH] Subaru: Add missing FW versions for Forester 2019 and Impreza
 2020 (#24225)

* Add FPv2: Subaru Crosstrek 2020 Sport (Canada), a2af7643da1d4017|2022-04-14--12-00-31

* Add FPv2: 2021 Subaru Forester Sport, c2f528d49fe19d53|2022-04-13--20-11-17

* Add FPv2: 2020 Subaru Crosstrek Limited, 0f33f7a9d1949fa6|2022-04-13--14-44-02

* Update FPv2: 2019 Subaru Forester Sport, f6e178e18ba27ca1|2022-04-08--18-22-50

* Update FPv2: 2021 Subaru Forester Touring, 6fcb17b9ef924548|2022-04-14--05-37-28

* Add FPv2: 2019 Subaru Forester Limited, a447729c1d15ff89|2022-04-13--17-54-27

* Add fw for a2af7643da1d4017|2022-04-14--18-21-57 for IMPREZA SPORT 2020

* Add fw for a447729c1d15ff89|2021-12-27--15-35-46 for FORESTER 2019

* Add fw from c2f528d49fe19d53|2022-02-19--13-44-43 for FORESTER 2019

Co-authored-by: Shane Smiskol <shane@smiskol.com>
old-commit-hash: df13b26971727554a9c0465420c2eea9d986cf0a
---
 selfdrive/car/subaru/values.py | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/selfdrive/car/subaru/values.py b/selfdrive/car/subaru/values.py
index d350c67ef..4b6f3604b 100644
--- a/selfdrive/car/subaru/values.py
+++ b/selfdrive/car/subaru/values.py
@@ -164,14 +164,19 @@ FW_VERSIONS = {
       b'\xa2 \0313\000',
       b'\xa2 !i\000',
       b'\xa2 !`\000',
+      b'\xf1\x00\xb2\x06\x04',
+      b'\xa2  `\x00',
     ],
     (Ecu.eps, 0x746, None): [
       b'\x9a\xc0\000\000',
       b'\n\xc0\004\000',
+      b'\x9a\xc0\x04\x00',
     ],
     (Ecu.fwdCamera, 0x787, None): [
       b'\000\000eb\037@ \"',
       b'\000\000e\x8f\037@ )',
+      b'\x00\x00eq\x1f@ "',
+      b'\x00\x00eq\x00\x00\x00\x00',
     ],
     (Ecu.engine, 0x7e0, None): [
       b'\xca!ap\a',
@@ -179,43 +184,52 @@ FW_VERSIONS = {
       b'\xca!`0\a',
       b'\xcc\"f0\a',
       b'\xcc!fp\a',
+      b'\xf1\x00\xa2\x10\t',
+      b'\xca!f@\x07',
+      b'\xca!fp\x07',
     ],
     (Ecu.transmission, 0x7e1, None): [
       b'\xe6\xf5\004\000\000',
       b'\xe6\xf5$\000\000',
       b'\xe7\xf6B0\000',
       b'\xe7\xf5D0\000',
+      b'\xf1\x00\xd7\x10@',
+      b'\xe6\xf5D0\x00',
     ],
   },
   CAR.FORESTER: {
     (Ecu.esp, 0x7b0, None): [
-      b'\xa3 \030\024\000',
+      b'\xa3 \x18\x14\x00',
       b'\xa3  \024\000',
       b'\xa3 \031\024\000',
-      b'\xa3  \024\001',
+      b'\xa3  \x14\x01',
+      b'\xf1\x00\xbb\r\x05',
     ],
     (Ecu.eps, 0x746, None): [
-      b'\x8d\xc0\004\000',
+      b'\x8d\xc0\x04\x00',
     ],
     (Ecu.fwdCamera, 0x787, None): [
-      b'\000\000e!\037@ \021',
-      b'\000\000e\x97\037@ 0',
+      b'\x00\x00e!\x1f@ \x11',
+      b'\x00\x00e\x97\x1f@ 0',
       b'\000\000e`\037@  ',
       b'\xf1\x00\xac\x02\x00',
+      b'\x00\x00e!\x00\x00\x00\x00',
+      b'\x00\x00e\x97\x00\x00\x00\x00',
     ],
     (Ecu.engine, 0x7e0, None): [
-      b'\xb6\"`A\a',
-      b'\xcf"`0\a',
+      b'\xb6"`A\x07',
+      b'\xcf"`0\x07',
       b'\xcb\"`@\a',
       b'\xcb\"`p\a',
       b'\xf1\x00\xa2\x10\n',
     ],
     (Ecu.transmission, 0x7e1, None): [
       b'\032\xf6B0\000',
-      b'\032\xf6F`\000',
+      b'\x1a\xf6F`\x00',
       b'\032\xf6b`\000',
-      b'\032\xf6B`\000',
+      b'\x1a\xf6B`\x00',
       b'\xf1\x00\xa4\x10@',
+      b'\x1a\xf6b0\x00',
     ],
   },
   CAR.FORESTER_PREGLOBAL: {
@@ -244,6 +258,7 @@ FW_VERSIONS = {
       b'\xda\xfd\xe0\x80\x00',
       b'\xdc\xf2`\x81\000',
       b'\xdc\xf2`\x80\x00',
+      b'\x1a\xf6F`\x00',
     ],
   },
   CAR.LEGACY_PREGLOBAL: {