Merge remote-tracking branch 'upstream/master' into log-stock-aeb-tssp

3 years ago · 7ab7aca497
parent 14acb6d671 e5bb55ccd6
commit 7ab7aca497
5 changed files with 6 additions and 8 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 3f722780c3af70a1c244ea762d61edd8c002ed9c
+Subproject commit 7e095a90af3d36e6db9128a80f6f3b0cca01efa2
--- a/release/files_common
+++ b/release/files_common
@ -532,7 +532,7 @@ opendbc/honda_insight_ex_2019_can_generated.dbc
 opendbc/acura_ilx_2016_nidec.dbc
 opendbc/honda_civic_ex_2022_can_generated.dbc

-opendbc/kia_ev6.dbc
+opendbc/hyundai_canfd.dbc
 opendbc/hyundai_kia_generic.dbc
 opendbc/hyundai_kia_mando_front_radar.dbc

--- a/selfdrive/car/hyundai/values.py
+++ b/selfdrive/car/hyundai/values.py
@ -1362,7 +1362,7 @@ DBC = {
  CAR.PALISADE: dbc_dict('hyundai_kia_generic', 'hyundai_kia_mando_front_radar'),
  CAR.VELOSTER: dbc_dict('hyundai_kia_generic', None),
  CAR.KIA_CEED: dbc_dict('hyundai_kia_generic', None),
-  CAR.KIA_EV6: dbc_dict('kia_ev6', None),
+  CAR.KIA_EV6: dbc_dict('hyundai_canfd', None),
  CAR.SONATA_HYBRID: dbc_dict('hyundai_kia_generic', 'hyundai_kia_mando_front_radar'),
-  CAR.IONIQ_5: dbc_dict('kia_ev6', None),
+  CAR.IONIQ_5: dbc_dict('hyundai_canfd', None),
 }
--- a/selfdrive/car/toyota/carstate.py
+++ b/selfdrive/car/toyota/carstate.py
@ -232,9 +232,7 @@ class CarState(CarStateBase):
  @staticmethod
  def get_cam_can_parser(CP):
    signals = []
-    checks = [
-      ("STEERING_LKA", 42)  # use steering message to check if panda is connected to frc
-    ]
+    checks = []

    if CP.carFingerprint in (TSS2_CAR - RADAR_ACC_CAR):
      signals += [
--- a/selfdrive/test/process_replay/ref_commit
+++ b/selfdrive/test/process_replay/ref_commit
@ -1 +1 @@
-35899d5137e298220e91063f3078109227cc8715
+93a136f91739847afe1e1a4a1e98bc7c0adb5ec8