From 17ec4ad24ea446a99235223511792f8e9dfa16c7 Mon Sep 17 00:00:00 2001
From: Alexandre Nobuharu Sato
 <66435071+AlexandreSato@users.noreply.github.com>
Date: Sun, 21 Apr 2024 06:29:43 -0300
Subject: [PATCH] Honda: Brazilian HR-V 2023 fingerprint (#32243)

* fingerprint Honda HR-V 2023, brazilian market

* update routes

---------

Co-authored-by: Shane Smiskol <shane@smiskol.com>
---
 selfdrive/car/honda/fingerprints.py | 7 +++++++
 selfdrive/car/honda/interface.py    | 2 +-
 selfdrive/car/honda/values.py       | 2 +-
 selfdrive/car/tests/routes.py       | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/selfdrive/car/honda/fingerprints.py b/selfdrive/car/honda/fingerprints.py
index d53cffe325..cda1451649 100644
--- a/selfdrive/car/honda/fingerprints.py
+++ b/selfdrive/car/honda/fingerprints.py
@@ -1014,26 +1014,33 @@ FW_VERSIONS = {
   },
   CAR.HONDA_HRV_3G: {
     (Ecu.eps, 0x18da30f1, None): [
+      b'39990-3M0-G110\x00\x00',
       b'39990-3W0-A030\x00\x00',
     ],
     (Ecu.gateway, 0x18daeff1, None): [
+      b'38897-3M0-M110\x00\x00',
       b'38897-3W1-A010\x00\x00',
     ],
     (Ecu.srs, 0x18da53f1, None): [
+      b'77959-3M0-K840\x00\x00',
       b'77959-3V0-A820\x00\x00',
     ],
     (Ecu.fwdRadar, 0x18dab0f1, None): [
+      b'8S102-3M6-P030\x00\x00',
       b'8S102-3W0-A060\x00\x00',
       b'8S102-3W0-AB10\x00\x00',
     ],
     (Ecu.vsa, 0x18da28f1, None): [
+      b'57114-3M6-M010\x00\x00',
       b'57114-3W0-A040\x00\x00',
     ],
     (Ecu.transmission, 0x18da1ef1, None): [
       b'28101-6EH-A010\x00\x00',
+      b'28101-6JC-M310\x00\x00',
     ],
     (Ecu.programmedFuelInjection, 0x18da10f1, None): [
       b'37805-6CT-A710\x00\x00',
+      b'37805-6HZ-M630\x00\x00',
     ],
     (Ecu.electricBrakeBooster, 0x18da2bf1, None): [
       b'46114-3W0-A020\x00\x00',
diff --git a/selfdrive/car/honda/interface.py b/selfdrive/car/honda/interface.py
index 2a5a07093d..2026c385c2 100755
--- a/selfdrive/car/honda/interface.py
+++ b/selfdrive/car/honda/interface.py
@@ -193,7 +193,7 @@ class CarInterface(CarInterfaceBase):
 
     # These cars use alternate user brake msg (0x1BE)
     # TODO: Only detect feature for Accord/Accord Hybrid, not all Bosch DBCs have BRAKE_MODULE
-    if 0x1BE in fingerprint[CAN.pt] and candidate == CAR.HONDA_ACCORD:
+    if 0x1BE in fingerprint[CAN.pt] and candidate in (CAR.HONDA_ACCORD, CAR.HONDA_HRV_3G):
       ret.flags |= HondaFlags.BOSCH_ALT_BRAKE.value
 
     if ret.flags & HondaFlags.BOSCH_ALT_BRAKE:
diff --git a/selfdrive/car/honda/values.py b/selfdrive/car/honda/values.py
index ecb00d0a3c..1b0da8d7de 100644
--- a/selfdrive/car/honda/values.py
+++ b/selfdrive/car/honda/values.py
@@ -165,7 +165,7 @@ class CAR(Platforms):
     [HondaCarDocs("Honda HR-V 2023", "All")],
     CarSpecs(mass=3125 * CV.LB_TO_KG, wheelbase=2.61, steerRatio=15.2, centerToFrontRatio=0.41, tireStiffnessFactor=0.5),
     dbc_dict('honda_civic_ex_2022_can_generated', None),
-    flags=HondaFlags.BOSCH_RADARLESS | HondaFlags.BOSCH_ALT_BRAKE,
+    flags=HondaFlags.BOSCH_RADARLESS,
   )
   ACURA_RDX_3G = HondaBoschPlatformConfig(
     [HondaCarDocs("Acura RDX 2019-22", "All", min_steer_speed=3. * CV.MPH_TO_MS)],
diff --git a/selfdrive/car/tests/routes.py b/selfdrive/car/tests/routes.py
index 35a9d8a8e7..dd3a8f633d 100755
--- a/selfdrive/car/tests/routes.py
+++ b/selfdrive/car/tests/routes.py
@@ -80,6 +80,7 @@ routes = [
   CarTestRoute("2c4292a5cd10536c|2021-08-19--21-32-15", HONDA.HONDA_FREED),
   CarTestRoute("03be5f2fd5c508d1|2020-04-19--18-44-15", HONDA.HONDA_HRV),
   CarTestRoute("320098ff6c5e4730|2023-04-13--17-47-46", HONDA.HONDA_HRV_3G),
+  CarTestRoute("147613502316e718/00000001--dd141a3140", HONDA.HONDA_HRV_3G),  # Brazilian model
   CarTestRoute("917b074700869333|2021-05-24--20-40-20", HONDA.ACURA_ILX),
   CarTestRoute("08a3deb07573f157|2020-03-06--16-11-19", HONDA.HONDA_ACCORD),  # 1.5T
   CarTestRoute("1da5847ac2488106|2021-05-24--19-31-50", HONDA.HONDA_ACCORD),  # 2.0T