From c4501e4bc1cb7a242207e910c0b61af20c3c677d Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sun, 7 May 2023 15:43:45 -0700 Subject: [PATCH] controlsd: remove procs from ignore list (#26848) * trim list * check for file --- Jenkinsfile | 3 +-- selfdrive/controls/controlsd.py | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8978459689..8a2f83be2f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,8 +19,7 @@ source ~/.bash_profile if [ -f /TICI ]; then source /etc/profile fi - -if [ -d /data/openpilot ]; then +if [ -f /data/openpilot/launch_env.sh ]; then source /data/openpilot/launch_env.sh fi diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index e1a12dc7b2..b1fd9378c2 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -28,7 +28,6 @@ from selfdrive.controls.lib.alertmanager import AlertManager, set_offroad_alert from selfdrive.controls.lib.vehicle_model import VehicleModel from selfdrive.locationd.calibrationd import Calibration from system.hardware import HARDWARE -from selfdrive.manager.process_config import managed_processes SOFT_DISABLE_TIME = 3 # seconds LDW_MIN_SPEED = 31 * CV.MPH_TO_MS @@ -37,9 +36,7 @@ LANE_DEPARTURE_THRESHOLD = 0.1 REPLAY = "REPLAY" in os.environ SIMULATION = "SIMULATION" in os.environ NOSENSOR = "NOSENSOR" in os.environ -IGNORE_PROCESSES = {"uploader", "deleter", "loggerd", "logmessaged", "tombstoned", "statsd", - "logcatd", "proclogd", "clocksd", "updated", "timezoned", "manage_athenad"} | \ - {k for k, v in managed_processes.items() if not v.enabled} +IGNORE_PROCESSES = {"loggerd", "encoderd", "statsd"} ThermalStatus = log.DeviceState.ThermalStatus State = log.ControlsState.OpenpilotState