From 0148c24147e05abe239fb5423a79ad517d29884c Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Fri, 7 May 2021 04:32:34 -0700
Subject: [PATCH] cleanup Honda car strings - part 2 (#20848)

* cleanup honda car strins

* fix process replay

* update ref

* forgot to build

Co-authored-by: Willem Melching <willem.melching@gmail.com>
---
 selfdrive/car/honda/values.py                   | 16 ++++++++--------
 selfdrive/test/process_replay/process_replay.py |  2 +-
 selfdrive/test/process_replay/ref_commit        |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/selfdrive/car/honda/values.py b/selfdrive/car/honda/values.py
index d730168b..ebaea978 100644
--- a/selfdrive/car/honda/values.py
+++ b/selfdrive/car/honda/values.py
@@ -34,21 +34,21 @@ VISUAL_HUD = {
   VisualAlert.speedTooHigh: 8}
 
 class CAR:
-  ACCORD = "HONDA ACCORD 2018 2T"
-  ACCORD_15 = "HONDA ACCORD 2018 1.5T"
-  ACCORDH = "HONDA ACCORD 2018 HYBRID"
+  ACCORD = "HONDA ACCORD 2T 2018"
+  ACCORD_15 = "HONDA ACCORD 1.5T 2018"
+  ACCORDH = "HONDA ACCORD HYBRID 2018"
   CIVIC = "HONDA CIVIC 2016"
-  CIVIC_BOSCH = "HONDA CIVIC HATCHBACK 2017 SEDAN/COUPE 2019"
-  CIVIC_BOSCH_DIESEL = "HONDA CIVIC SEDAN 1.6 DIESEL"
+  CIVIC_BOSCH = "HONDA CIVIC (BOSCH) 2019"
+  CIVIC_BOSCH_DIESEL = "HONDA CIVIC SEDAN 1.6 DIESEL 2019"
   ACURA_ILX = "ACURA ILX 2016"
   CRV = "HONDA CR-V 2016"
   CRV_5G = "HONDA CR-V 2017"
-  CRV_EU = "HONDA CR-V 2016 EU"
-  CRV_HYBRID = "HONDA CR-V 2019 HYBRID"
+  CRV_EU = "HONDA CR-V EU 2016"
+  CRV_HYBRID = "HONDA CR-V HYBRID 2019"
   FIT = "HONDA FIT 2018"
   HRV = "HONDA HRV 2019"
   ODYSSEY = "HONDA ODYSSEY 2018"
-  ODYSSEY_CHN = "HONDA ODYSSEY 2019 CHN"
+  ODYSSEY_CHN = "HONDA ODYSSEY CHN 2019"
   ACURA_RDX = "ACURA RDX 2018"
   ACURA_RDX_3G = "ACURA RDX 2020"
   PILOT = "HONDA PILOT 2017"
diff --git a/selfdrive/test/process_replay/process_replay.py b/selfdrive/test/process_replay/process_replay.py
index b4b359ba..f90666b5 100755
--- a/selfdrive/test/process_replay/process_replay.py
+++ b/selfdrive/test/process_replay/process_replay.py
@@ -366,7 +366,7 @@ def python_replay_process(cfg, lr, fingerprint=None):
   # TODO: remove after getting new route for civic & accord
   migration = {
     "HONDA CIVIC 2016 TOURING": "HONDA CIVIC 2016",
-    "HONDA ACCORD 2018 SPORT 2T": "HONDA ACCORD 2018 2T",
+    "HONDA ACCORD 2018 SPORT 2T": "HONDA ACCORD 2T 2018",
   }
 
   if fingerprint is not None:
diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit
index 00445d00..6c404dcb 100644
--- a/selfdrive/test/process_replay/ref_commit
+++ b/selfdrive/test/process_replay/ref_commit
@@ -1 +1 @@
-e9db5723ef348954118643501a92cf0715402fea
\ No newline at end of file
+9a12b34e64f9fc0016b8b35a2bf8e11f273ab8d2
\ No newline at end of file