Remove unnecessary trim levels from car name (#20815)

* remove unnecessary trim levels from car name

* remove hardcoded strings

* fix process replay

* more fixes

* fix migration

* update ref

selfdrive/car/honda/values.py

@@ -34,27 +34,27 @@ VISUAL_HUD = {
   VisualAlert.speedTooHigh: 8}
 
 class CAR:
-  ACCORD = "HONDA ACCORD 2018 SPORT 2T"
+  ACCORD = "HONDA ACCORD 2018 2T"
-  ACCORD_15 = "HONDA ACCORD 2018 LX 1.5T"
+  ACCORD_15 = "HONDA ACCORD 2018 1.5T"
-  ACCORDH = "HONDA ACCORD 2018 HYBRID TOURING"
+  ACCORDH = "HONDA ACCORD 2018 HYBRID"
-  CIVIC = "HONDA CIVIC 2016 TOURING"
+  CIVIC = "HONDA CIVIC 2016"
   CIVIC_BOSCH = "HONDA CIVIC HATCHBACK 2017 SEDAN/COUPE 2019"
   CIVIC_BOSCH_DIESEL = "HONDA CIVIC SEDAN 1.6 DIESEL"
-  ACURA_ILX = "ACURA ILX 2016 ACURAWATCH PLUS"
+  ACURA_ILX = "ACURA ILX 2016"
-  CRV = "HONDA CR-V 2016 TOURING"
+  CRV = "HONDA CR-V 2016"
-  CRV_5G = "HONDA CR-V 2017 EX"
+  CRV_5G = "HONDA CR-V 2017"
-  CRV_EU = "HONDA CR-V 2016 EXECUTIVE"
+  CRV_EU = "HONDA CR-V 2016 EU"
   CRV_HYBRID = "HONDA CR-V 2019 HYBRID"
-  FIT = "HONDA FIT 2018 EX"
+  FIT = "HONDA FIT 2018"
-  HRV = "HONDA HRV 2019 TOURING"
+  HRV = "HONDA HRV 2019"
-  ODYSSEY = "HONDA ODYSSEY 2018 EX-L"
+  ODYSSEY = "HONDA ODYSSEY 2018"
-  ODYSSEY_CHN = "HONDA ODYSSEY 2019 EXCLUSIVE CHN"
+  ODYSSEY_CHN = "HONDA ODYSSEY 2019 CHN"
-  ACURA_RDX = "ACURA RDX 2018 ACURAWATCH PLUS"
+  ACURA_RDX = "ACURA RDX 2018"
-  ACURA_RDX_3G = "ACURA RDX 2020 TECH"
+  ACURA_RDX_3G = "ACURA RDX 2020"
-  PILOT = "HONDA PILOT 2017 TOURING"
+  PILOT = "HONDA PILOT 2017"
-  PILOT_2019 = "HONDA PILOT 2019 ELITE"
+  PILOT_2019 = "HONDA PILOT 2019"
-  RIDGELINE = "HONDA RIDGELINE 2017 BLACK EDITION"
+  RIDGELINE = "HONDA RIDGELINE 2017"
-  INSIGHT = "HONDA INSIGHT 2019 TOURING"
+  INSIGHT = "HONDA INSIGHT 2019"
 
 # diag message that in some Nidec cars only appear with 1s freq if VIN query is performed
 DIAG_MSGS = {1600: 5, 1601: 8}

selfdrive/car/hyundai/values.py

@@ -20,7 +20,7 @@ class CarControllerParams:
 
 class CAR:
   # Hyundai
-  ELANTRA = "HYUNDAI ELANTRA LIMITED ULTIMATE 2017"
+  ELANTRA = "HYUNDAI ELANTRA 2017"
   ELANTRA_GT_I30 = "HYUNDAI I30 N LINE 2019 & GT 2018 DCT"
   HYUNDAI_GENESIS = "HYUNDAI GENESIS 2015-2016"
   IONIQ = "HYUNDAI IONIQ HYBRID 2017-2019"
@@ -28,7 +28,7 @@ class CAR:
   IONIQ_EV_2020 = "HYUNDAI IONIQ ELECTRIC 2020"
   KONA = "HYUNDAI KONA 2020"
   KONA_EV = "HYUNDAI KONA ELECTRIC 2019"
-  SANTA_FE = "HYUNDAI SANTA FE LIMITED 2019"
+  SANTA_FE = "HYUNDAI SANTA FE 2019"
   SONATA = "HYUNDAI SONATA 2020"
   SONATA_LF = "HYUNDAI SONATA 2019"
   PALISADE = "HYUNDAI PALISADE 2020"

selfdrive/test/process_replay/process_replay.py

@@ -359,13 +359,21 @@ def python_replay_process(cfg, lr):
   os.environ['NO_RADAR_SLEEP'] = "1"
   os.environ['SKIP_FW_QUERY'] = ""
   os.environ['FINGERPRINT'] = ""
+
+  # 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",
+  }
+
   for msg in lr:
     if msg.which() == 'carParams':
-      if len(msg.carParams.carFw) and (msg.carParams.carFingerprint in FW_VERSIONS):
+      car_fingerprint = migration.get(msg.carParams.carFingerprint, msg.carParams.carFingerprint)
+      if len(msg.carParams.carFw) and (car_fingerprint in FW_VERSIONS):
         params.put("CarParamsCache", msg.carParams.as_builder().to_bytes())
       else:
         os.environ['SKIP_FW_QUERY'] = "1"
-        os.environ['FINGERPRINT'] = msg.carParams.carFingerprint
+        os.environ['FINGERPRINT'] = car_fingerprint
 
   assert(type(managed_processes[cfg.proc_name]) is PythonProcess)
   managed_processes[cfg.proc_name].prepare()

selfdrive/test/process_replay/ref_commit

@@ -1 +1 @@
-e53498342bd6ba53e59976d284fc635368370e3d
+102840c395c0c19fb27a8f252044284834a0daf1

selfdrive/test/test_models.py

@@ -10,6 +10,10 @@ from cereal import log, car
 from selfdrive.car.fingerprints import all_known_cars
 from selfdrive.car.car_helpers import interfaces
 from selfdrive.car.honda.values import HONDA_BOSCH
+from selfdrive.car.honda.values import CAR as HONDA
+from selfdrive.car.toyota.values import CAR as TOYOTA
+from selfdrive.car.chrysler.values import CAR as CHRYSLER
+from selfdrive.car.hyundai.values import CAR as HYUNDAI
 from selfdrive.test.test_routes import routes, non_tested_cars
 from selfdrive.test.openpilotci import get_url
 from tools.lib.logreader import LogReader
@@ -23,27 +27,27 @@ ROUTES = {v['carFingerprint']: k for k, v in routes.items() if 'enableCamera' no
 
 # TODO: get updated routes for these cars
 ignore_can_valid = [
-  "ACURA ILX 2016 ACURAWATCH PLUS",
+  HONDA.ACURA_ILX,
-  "LEXUS RX HYBRID 2017",
+  TOYOTA.LEXUS_RXH,
-  "TOYOTA AVALON 2016",
+  TOYOTA.AVALON,
-  "HONDA PILOT 2019 ELITE",
+  HONDA.PILOT_2019,
-  "HYUNDAI SANTA FE LIMITED 2019",
+  HYUNDAI.SANTA_FE,
 
   # TODO: get new routes for these cars, current routes are from giraffe with different buses
-  "HONDA CR-V 2019 HYBRID",
+  HONDA.CRV_HYBRID,
-  "HONDA INSIGHT 2019 TOURING",
+  HONDA.INSIGHT,
-  "HONDA ACCORD 2018 HYBRID TOURING",
+  HONDA.ACCORDH,
 ]
 
 ignore_carstate_check = [
   # TODO: chrysler gas state in panda also checks wheel speed, refactor so it's only gas
-  "CHRYSLER PACIFICA HYBRID 2017",
+  CHRYSLER.PACIFICA_2017_HYBRID,
 
   # TODO: get new routes for these cars, current routes are from giraffe with different buses
-  "HONDA CR-V 2019 HYBRID",
+  HONDA.CRV_HYBRID,
-  "HONDA ACCORD 2018 SPORT 2T",
+  HONDA.ACCORD,
-  "HONDA INSIGHT 2019 TOURING",
+  HONDA.INSIGHT,
-  "HONDA ACCORD 2018 HYBRID TOURING",
+  HONDA.ACCORDH,
 ]
 
 @parameterized_class(('car_model'), [(car,) for car in all_known_cars()])