From db1592403e2d13c3049d305b6f8688b10a1264c1 Mon Sep 17 00:00:00 2001 From: Rick Lan Date: Mon, 24 Jun 2024 13:32:49 +0800 Subject: [PATCH] refactored onoad upload --- system/manager/process_config.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/system/manager/process_config.py b/system/manager/process_config.py index 3ddd125a9..4e9cdc102 100644 --- a/system/manager/process_config.py +++ b/system/manager/process_config.py @@ -7,8 +7,6 @@ from openpilot.system.manager.process import PythonProcess, NativeProcess, Daemo WEBCAM = os.getenv("USE_WEBCAM") is not None -dp_device_disable_onroad_uploads = Params().get_bool("dp_device_disable_onroad_uploads") - def driverview(started: bool, params: Params, CP: car.CarParams) -> bool: return started or params.get_bool("IsDriverViewEnabled") @@ -46,6 +44,12 @@ def only_offroad(started, params, CP: car.CarParams) -> bool: def dp_logging(started, params, CP: car.CarParams) -> bool: return not params.get_bool("dp_device_disable_logging") and logging(started, params, CP) +def dp_onroad_uploads(started, params, CP: car.CarParams) -> bool: + if params.get_bool("dp_device_disable_onroad_uploads"): + return not started + else: + return always_run(started, params, CP) + procs = [ DaemonProcess("manage_athenad", "system.athena.manage_athenad", "AthenadPid"), @@ -82,8 +86,8 @@ procs = [ PythonProcess("radard", "selfdrive.controls.radard", only_onroad), PythonProcess("hardwared", "system.hardware.hardwared", always_run), PythonProcess("tombstoned", "system.tombstoned", always_run, enabled=not PC), - # PythonProcess("updated", "system.updated.updated", only_offroad, enabled=not PC), - PythonProcess("uploader", "system.loggerd.uploader", only_offroad if dp_device_disable_onroad_uploads else always_run), + PythonProcess("updated", "system.updated.updated", only_offroad, enabled=not PC), + PythonProcess("uploader", "system.loggerd.uploader", dp_onroad_uploads), PythonProcess("statsd", "system.statsd", always_run), # debug procs