From 2944bead37d51fc11252615f96419de43bd3668b Mon Sep 17 00:00:00 2001 From: commaci-public <60409688+commaci-public@users.noreply.github.com> Date: Fri, 21 Feb 2025 17:37:04 -0800 Subject: [PATCH] [bot] Update Python packages (#34664) * Update Python packages * fix that * fix that too * bump panda * bump --------- Co-authored-by: Vehicle Researcher Co-authored-by: Shane Smiskol --- opendbc_repo | 2 +- panda | 2 +- selfdrive/debug/clear_dtc.py | 4 ++-- selfdrive/debug/hyundai_enable_radar_points.py | 4 ++-- selfdrive/debug/read_dtc_status.py | 4 ++-- selfdrive/debug/vw_mqb_config.py | 4 ++-- selfdrive/test/process_replay/migration.py | 8 ++++---- tools/sim/lib/simulated_car.py | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/opendbc_repo b/opendbc_repo index 588464d29d..da0a5e3d2b 160000 --- a/opendbc_repo +++ b/opendbc_repo @@ -1 +1 @@ -Subproject commit 588464d29d98fe8d07dc37b9def1f322cc36a853 +Subproject commit da0a5e3d2b3984b56ebf5e25d9769f5c77807e4d diff --git a/panda b/panda index 8bd4e2d2dc..66bd9e8f25 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit 8bd4e2d2dc3d421de63ebd9a6a9cb891162cb923 +Subproject commit 66bd9e8f251d5b142e57534fdf238dce6d589bd6 diff --git a/selfdrive/debug/clear_dtc.py b/selfdrive/debug/clear_dtc.py index 3578930388..b2c5fe3db5 100755 --- a/selfdrive/debug/clear_dtc.py +++ b/selfdrive/debug/clear_dtc.py @@ -4,7 +4,7 @@ import argparse from subprocess import check_output, CalledProcessError from opendbc.car.carlog import carlog from opendbc.car.uds import UdsClient, MessageTimeoutError, SESSION_TYPE, DTC_GROUP_TYPE -from opendbc.safety import Safety +from opendbc.car.structs import CarParams from panda import Panda parser = argparse.ArgumentParser(description="clear DTC status") @@ -25,7 +25,7 @@ except CalledProcessError as e: raise e panda = Panda() -panda.set_safety_mode(Safety.SAFETY_ELM327) +panda.set_safety_mode(CarParams.SafetyModel.elm327) uds_client = UdsClient(panda, args.addr, bus=args.bus) print("extended diagnostic session ...") try: diff --git a/selfdrive/debug/hyundai_enable_radar_points.py b/selfdrive/debug/hyundai_enable_radar_points.py index 8612018b08..93f5949eac 100755 --- a/selfdrive/debug/hyundai_enable_radar_points.py +++ b/selfdrive/debug/hyundai_enable_radar_points.py @@ -18,7 +18,7 @@ from subprocess import check_output, CalledProcessError from opendbc.car.carlog import carlog from opendbc.car.uds import UdsClient, SESSION_TYPE, DATA_IDENTIFIER_TYPE -from opendbc.safety import Safety +from opendbc.car.structs import CarParams from panda.python import Panda class ConfigValues(NamedTuple): @@ -97,7 +97,7 @@ if __name__ == "__main__": sys.exit(0) panda = Panda() - panda.set_safety_mode(Safety.SAFETY_ELM327) + panda.set_safety_mode(CarParams.SafetyModel.elm327) uds_client = UdsClient(panda, 0x7D0, bus=args.bus) print("\n[START DIAGNOSTIC SESSION]") diff --git a/selfdrive/debug/read_dtc_status.py b/selfdrive/debug/read_dtc_status.py index 56f32abf46..f9dad53577 100755 --- a/selfdrive/debug/read_dtc_status.py +++ b/selfdrive/debug/read_dtc_status.py @@ -4,7 +4,7 @@ import argparse from subprocess import check_output, CalledProcessError from opendbc.car.carlog import carlog from opendbc.car.uds import UdsClient, SESSION_TYPE, DTC_REPORT_TYPE, DTC_STATUS_MASK_TYPE, get_dtc_num_as_str, get_dtc_status_names -from opendbc.safety import Safety +from opendbc.car.structs import CarParams from panda import Panda parser = argparse.ArgumentParser(description="read DTC status") @@ -25,7 +25,7 @@ except CalledProcessError as e: raise e panda = Panda() -panda.set_safety_mode(Safety.SAFETY_ELM327) +panda.set_safety_mode(CarParams.SafetyModel.elm327) uds_client = UdsClient(panda, args.addr, bus=args.bus) print("extended diagnostic session ...") uds_client.diagnostic_session_control(SESSION_TYPE.EXTENDED_DIAGNOSTIC) diff --git a/selfdrive/debug/vw_mqb_config.py b/selfdrive/debug/vw_mqb_config.py index bc92d3a4c4..7ff5774a71 100755 --- a/selfdrive/debug/vw_mqb_config.py +++ b/selfdrive/debug/vw_mqb_config.py @@ -6,7 +6,7 @@ from enum import IntEnum from opendbc.car.carlog import carlog from opendbc.car.uds import UdsClient, MessageTimeoutError, NegativeResponseError, SESSION_TYPE,\ DATA_IDENTIFIER_TYPE, ACCESS_TYPE -from opendbc.safety import Safety +from opendbc.car.structs import CarParams from panda import Panda from datetime import date @@ -39,7 +39,7 @@ if __name__ == "__main__": carlog.setLevel('DEBUG') panda = Panda() - panda.set_safety_mode(Safety.SAFETY_ELM327) + panda.set_safety_mode(CarParams.SafetyModel.elm327) bus = 1 if panda.has_obd() else 0 uds_client = UdsClient(panda, MQB_EPS_CAN_ADDR, MQB_EPS_CAN_ADDR + RX_OFFSET, bus, timeout=0.2) diff --git a/selfdrive/test/process_replay/migration.py b/selfdrive/test/process_replay/migration.py index fbe891abea..cebb6d1fc6 100644 --- a/selfdrive/test/process_replay/migration.py +++ b/selfdrive/test/process_replay/migration.py @@ -269,12 +269,12 @@ def migrate_carOutput(msgs): def migrate_pandaStates(msgs): # TODO: safety param migration should be handled automatically safety_param_migration = { - "TOYOTA_PRIUS": EPS_SCALE["TOYOTA_PRIUS"] | ToyotaSafetyFlags.FLAG_TOYOTA_STOCK_LONGITUDINAL, - "TOYOTA_RAV4": EPS_SCALE["TOYOTA_RAV4"] | ToyotaSafetyFlags.FLAG_TOYOTA_ALT_BRAKE, - "KIA_EV6": HyundaiSafetyFlags.FLAG_HYUNDAI_EV_GAS | HyundaiSafetyFlags.FLAG_HYUNDAI_CANFD_HDA2, + "TOYOTA_PRIUS": EPS_SCALE["TOYOTA_PRIUS"] | ToyotaSafetyFlags.STOCK_LONGITUDINAL, + "TOYOTA_RAV4": EPS_SCALE["TOYOTA_RAV4"] | ToyotaSafetyFlags.ALT_BRAKE, + "KIA_EV6": HyundaiSafetyFlags.EV_GAS | HyundaiSafetyFlags.CANFD_HDA2, } # TODO: get new Ford route - safety_param_migration |= {car: FordSafetyFlags.FLAG_FORD_LONG_CONTROL for car in (set(FORD) - FORD.with_flags(FordFlags.CANFD))} + safety_param_migration |= {car: FordSafetyFlags.LONG_CONTROL for car in (set(FORD) - FORD.with_flags(FordFlags.CANFD))} # Migrate safety param base on carParams CP = next((m.carParams for _, m in msgs if m.which() == 'carParams'), None) diff --git a/tools/sim/lib/simulated_car.py b/tools/sim/lib/simulated_car.py index 402ac1a21e..ad0f4de5d0 100644 --- a/tools/sim/lib/simulated_car.py +++ b/tools/sim/lib/simulated_car.py @@ -95,7 +95,7 @@ class SimulatedCar: 'controlsAllowed': True, 'safetyModel': 'hondaBosch', 'alternativeExperience': self.sm["carParams"].alternativeExperience, - 'safetyParam': HondaSafetyFlags.FLAG_HONDA_RADARLESS.value | HondaSafetyFlags.FLAG_HONDA_BOSCH_LONG.value, + 'safetyParam': HondaSafetyFlags.RADARLESS.value | HondaSafetyFlags.BOSCH_LONG.value, } self.pm.send('pandaStates', dat)