diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index 1aa08f205..4f7e57b5f 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -47,7 +47,7 @@ jobs: timeout-minutes: ${{ ((steps.restore-scons-cache.outputs.cache-hit == 'true') && 10 || 30) }} # allow more time when we missed the scons cache run: | cd $STRIPPED_DIR - ${{ env.RUN }} "python selfdrive/manager/build.py" + ${{ env.RUN }} "python system/manager/build.py" - name: Run tests timeout-minutes: 3 run: | diff --git a/Jenkinsfile b/Jenkinsfile index 2e672e1a2..0a044ff03 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -183,7 +183,7 @@ node { deviceStage("onroad", "tici-needs-can", [], [ // TODO: ideally, this test runs in master-ci, but it takes 5+m to build it //["build master-ci", "cd $SOURCE_DIR/release && TARGET_DIR=$TEST_DIR $SOURCE_DIR/scripts/retry.sh ./build_devel.sh"], - ["build openpilot", "cd selfdrive/manager && ./build.py"], + ["build openpilot", "cd system/manager && ./build.py"], ["check dirty", "release/check-dirty.sh"], ["onroad tests", "pytest selfdrive/test/test_onroad.py -s"], ["time to onroad", "pytest selfdrive/test/test_time_to_onroad.py"], @@ -191,51 +191,51 @@ node { }, 'HW + Unit Tests': { deviceStage("tici-hardware", "tici-common", ["UNSAFE=1"], [ - ["build", "cd selfdrive/manager && ./build.py"], + ["build", "cd system/manager && ./build.py"], ["test pandad", "pytest selfdrive/boardd/tests/test_pandad.py"], ["test power draw", "pytest -s system/hardware/tici/tests/test_power_draw.py"], ["test encoder", "LD_LIBRARY_PATH=/usr/local/lib pytest system/loggerd/tests/test_encoder.py"], ["test pigeond", "pytest system/ubloxd/tests/test_pigeond.py"], - ["test manager", "pytest selfdrive/manager/test/test_manager.py"], + ["test manager", "pytest system/manager/test/test_manager.py"], ]) }, 'loopback': { deviceStage("loopback", "tici-loopback", ["UNSAFE=1"], [ - ["build openpilot", "cd selfdrive/manager && ./build.py"], + ["build openpilot", "cd system/manager && ./build.py"], ["test boardd loopback", "pytest selfdrive/boardd/tests/test_boardd_loopback.py"], ]) }, 'camerad': { deviceStage("AR0231", "tici-ar0231", ["UNSAFE=1"], [ - ["build", "cd selfdrive/manager && ./build.py"], + ["build", "cd system/manager && ./build.py"], ["test camerad", "pytest system/camerad/test/test_camerad.py"], ["test exposure", "pytest system/camerad/test/test_exposure.py"], ]) deviceStage("OX03C10", "tici-ox03c10", ["UNSAFE=1"], [ - ["build", "cd selfdrive/manager && ./build.py"], + ["build", "cd system/manager && ./build.py"], ["test camerad", "pytest system/camerad/test/test_camerad.py"], ["test exposure", "pytest system/camerad/test/test_exposure.py"], ]) }, 'sensord': { deviceStage("LSM + MMC", "tici-lsmc", ["UNSAFE=1"], [ - ["build", "cd selfdrive/manager && ./build.py"], + ["build", "cd system/manager && ./build.py"], ["test sensord", "pytest system/sensord/tests/test_sensord.py"], ]) deviceStage("BMX + LSM", "tici-bmx-lsm", ["UNSAFE=1"], [ - ["build", "cd selfdrive/manager && ./build.py"], + ["build", "cd system/manager && ./build.py"], ["test sensord", "pytest system/sensord/tests/test_sensord.py"], ]) }, 'replay': { deviceStage("model-replay", "tici-replay", ["UNSAFE=1"], [ - ["build", "cd selfdrive/manager && ./build.py"], + ["build", "cd system/manager && ./build.py"], ["model replay", "selfdrive/test/process_replay/model_replay.py"], ]) }, 'tizi': { deviceStage("tizi", "tizi", ["UNSAFE=1"], [ - ["build openpilot", "cd selfdrive/manager && ./build.py"], + ["build openpilot", "cd system/manager && ./build.py"], ["test boardd loopback", "SINGLE_PANDA=1 pytest selfdrive/boardd/tests/test_boardd_loopback.py"], ["test boardd spi", "pytest selfdrive/boardd/tests/test_boardd_spi.py"], ["test pandad", "pytest selfdrive/boardd/tests/test_pandad.py"], diff --git a/conftest.py b/conftest.py index 0d2a4a8fc..fc4931fb5 100644 --- a/conftest.py +++ b/conftest.py @@ -5,7 +5,7 @@ import pytest import random from openpilot.common.prefix import OpenpilotPrefix -from openpilot.selfdrive.manager import manager +from openpilot.system.manager import manager from openpilot.system.hardware import TICI, HARDWARE diff --git a/launch_chffrplus.sh b/launch_chffrplus.sh index a7f61411c..9256f463a 100755 --- a/launch_chffrplus.sh +++ b/launch_chffrplus.sh @@ -82,7 +82,7 @@ function launch { tmux capture-pane -pq -S-1000 > /tmp/launch_log # start manager - cd selfdrive/manager + cd system/manager if [ ! -f $DIR/prebuilt ]; then ./build.py fi diff --git a/release/build_release.sh b/release/build_release.sh index fc15cf6cd..b381ff732 100755 --- a/release/build_release.sh +++ b/release/build_release.sh @@ -93,7 +93,7 @@ cd $SOURCE_DIR cp -pR -n --parents $TEST_FILES $BUILD_DIR/ cd $BUILD_DIR RELEASE=1 selfdrive/test/test_onroad.py -#selfdrive/manager/test/test_manager.py +#system/manager/test/test_manager.py selfdrive/car/tests/test_car_interfaces.py rm -rf $TEST_FILES diff --git a/release/files_common b/release/files_common index ff3e62aa1..cc797fb20 100644 --- a/release/files_common +++ b/release/files_common @@ -303,14 +303,8 @@ system/camerad/cameras/camera_common.cc system/camerad/sensors/*.h system/camerad/sensors/*.cc -selfdrive/manager/__init__.py -selfdrive/manager/build.py -selfdrive/manager/helpers.py -selfdrive/manager/manager.py -selfdrive/manager/process_config.py -selfdrive/manager/process.py -selfdrive/manager/test/__init__.py -selfdrive/manager/test/test_manager.py +system/manager/__init__.py +system/manager/** selfdrive/modeld/.gitignore selfdrive/modeld/__init__.py diff --git a/selfdrive/boardd/tests/test_pandad.py b/selfdrive/boardd/tests/test_pandad.py index 65f3ad657..581b9813a 100755 --- a/selfdrive/boardd/tests/test_pandad.py +++ b/selfdrive/boardd/tests/test_pandad.py @@ -7,7 +7,7 @@ import cereal.messaging as messaging from cereal import log from openpilot.common.gpio import gpio_set, gpio_init from panda import Panda, PandaDFU, PandaProtocolMismatch -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes from openpilot.system.hardware import HARDWARE from openpilot.system.hardware.tici.pins import GPIO diff --git a/selfdrive/controls/tests/test_startup.py b/selfdrive/controls/tests/test_startup.py index 5b69a7cd8..fc9f8ab12 100644 --- a/selfdrive/controls/tests/test_startup.py +++ b/selfdrive/controls/tests/test_startup.py @@ -9,7 +9,7 @@ from openpilot.selfdrive.car.fingerprints import _FINGERPRINTS from openpilot.selfdrive.car.toyota.values import CAR as TOYOTA from openpilot.selfdrive.car.mazda.values import CAR as MAZDA from openpilot.selfdrive.controls.lib.events import EVENT_NAME -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes EventName = car.CarEvent.EventName Ecu = car.CarParams.Ecu diff --git a/selfdrive/debug/cpu_usage_stat.py b/selfdrive/debug/cpu_usage_stat.py index ec9d02e8f..baf44b908 100755 --- a/selfdrive/debug/cpu_usage_stat.py +++ b/selfdrive/debug/cpu_usage_stat.py @@ -24,7 +24,7 @@ import argparse import re from collections import defaultdict -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes # Do statistics every 5 seconds PRINT_INTERVAL = 5 diff --git a/selfdrive/debug/cycle_alerts.py b/selfdrive/debug/cycle_alerts.py index d66f83ad5..93b0430c1 100755 --- a/selfdrive/debug/cycle_alerts.py +++ b/selfdrive/debug/cycle_alerts.py @@ -8,7 +8,7 @@ from openpilot.common.realtime import DT_CTRL from openpilot.selfdrive.car.honda.interface import CarInterface from openpilot.selfdrive.controls.lib.events import ET, Events from openpilot.selfdrive.controls.lib.alertmanager import AlertManager -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes EventName = car.CarEvent.EventName diff --git a/selfdrive/debug/uiview.py b/selfdrive/debug/uiview.py index 958ee72e0..8e75769a8 100755 --- a/selfdrive/debug/uiview.py +++ b/selfdrive/debug/uiview.py @@ -3,7 +3,7 @@ import time from cereal import car, log, messaging from openpilot.common.params import Params -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes from openpilot.system.hardware import HARDWARE if __name__ == "__main__": diff --git a/selfdrive/locationd/test/test_locationd.py b/selfdrive/locationd/test/test_locationd.py index bac824bad..f88f423cf 100755 --- a/selfdrive/locationd/test/test_locationd.py +++ b/selfdrive/locationd/test/test_locationd.py @@ -10,7 +10,7 @@ from cereal.services import SERVICE_LIST from openpilot.common.params import Params from openpilot.common.transformations.coordinates import ecef2geodetic -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes class TestLocationdProc: diff --git a/selfdrive/modeld/tests/test_modeld.py b/selfdrive/modeld/tests/test_modeld.py index a18ce8fa4..5cbdbc2bb 100755 --- a/selfdrive/modeld/tests/test_modeld.py +++ b/selfdrive/modeld/tests/test_modeld.py @@ -7,7 +7,7 @@ from cereal.visionipc import VisionIpcServer, VisionStreamType from openpilot.common.transformations.camera import DEVICE_CAMERAS from openpilot.common.realtime import DT_MDL from openpilot.selfdrive.car.car_helpers import write_car_param -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes from openpilot.selfdrive.test.process_replay.vision_meta import meta_from_camera_state CAM = DEVICE_CAMERAS[("tici", "ar0231")].fcam diff --git a/selfdrive/modeld/tests/timing/benchmark.py b/selfdrive/modeld/tests/timing/benchmark.py index 4ab0afacb..c629ec2ff 100755 --- a/selfdrive/modeld/tests/timing/benchmark.py +++ b/selfdrive/modeld/tests/timing/benchmark.py @@ -6,7 +6,7 @@ import time import numpy as np import cereal.messaging as messaging -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes N = int(os.getenv("N", "5")) diff --git a/selfdrive/navd/tests/test_navd.py b/selfdrive/navd/tests/test_navd.py index 07f930365..3d899ba28 100755 --- a/selfdrive/navd/tests/test_navd.py +++ b/selfdrive/navd/tests/test_navd.py @@ -7,7 +7,7 @@ from parameterized import parameterized import cereal.messaging as messaging from openpilot.common.params import Params -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes class TestNavd: diff --git a/selfdrive/test/helpers.py b/selfdrive/test/helpers.py index 148d142bb..b7f5bb183 100644 --- a/selfdrive/test/helpers.py +++ b/selfdrive/test/helpers.py @@ -9,7 +9,7 @@ from functools import wraps import cereal.messaging as messaging from openpilot.common.params import Params -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes from openpilot.system.hardware import PC from openpilot.system.version import training_version, terms_version diff --git a/selfdrive/test/process_replay/migration.py b/selfdrive/test/process_replay/migration.py index c8d0504de..0715fcf7b 100644 --- a/selfdrive/test/process_replay/migration.py +++ b/selfdrive/test/process_replay/migration.py @@ -4,7 +4,7 @@ from cereal import messaging from openpilot.selfdrive.car.fingerprints import MIGRATION from openpilot.selfdrive.test.process_replay.vision_meta import meta_from_encode_index from openpilot.selfdrive.car.toyota.values import EPS_SCALE -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes from panda import Panda diff --git a/selfdrive/test/process_replay/process_replay.py b/selfdrive/test/process_replay/process_replay.py index 529ed91f7..b325e6e69 100755 --- a/selfdrive/test/process_replay/process_replay.py +++ b/selfdrive/test/process_replay/process_replay.py @@ -23,7 +23,7 @@ from openpilot.common.timeout import Timeout from openpilot.common.realtime import DT_CTRL from panda.python import ALTERNATIVE_EXPERIENCE from openpilot.selfdrive.car.car_helpers import get_car, interfaces -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes from openpilot.selfdrive.test.process_replay.vision_meta import meta_from_camera_state, available_streams from openpilot.selfdrive.test.process_replay.migration import migrate_all from openpilot.selfdrive.test.process_replay.capture import ProcessOutputCapture diff --git a/selfdrive/test/test_onroad.py b/selfdrive/test/test_onroad.py index 038bba7b2..8b60b9650 100755 --- a/selfdrive/test/test_onroad.py +++ b/selfdrive/test/test_onroad.py @@ -125,7 +125,7 @@ class TestOnroad: # start manager and run openpilot for a minute proc = None try: - manager_path = os.path.join(BASEDIR, "selfdrive/manager/manager.py") + manager_path = os.path.join(BASEDIR, "system/manager/manager.py") proc = subprocess.Popen(["python", manager_path]) sm = messaging.SubMaster(['carState']) diff --git a/selfdrive/test/test_time_to_onroad.py b/selfdrive/test/test_time_to_onroad.py index b85d40dbc..11de5283b 100755 --- a/selfdrive/test/test_time_to_onroad.py +++ b/selfdrive/test/test_time_to_onroad.py @@ -17,7 +17,7 @@ EventName = car.CarEvent.EventName def test_time_to_onroad(): # launch set_params_enabled() - manager_path = os.path.join(BASEDIR, "selfdrive/manager/manager.py") + manager_path = os.path.join(BASEDIR, "system/manager/manager.py") proc = subprocess.Popen(["python", manager_path]) start_time = time.monotonic() diff --git a/system/athena/manage_athenad.py b/system/athena/manage_athenad.py index 853a7cd95..f5ab81720 100755 --- a/system/athena/manage_athenad.py +++ b/system/athena/manage_athenad.py @@ -4,7 +4,7 @@ import time from multiprocessing import Process from openpilot.common.params import Params -from openpilot.selfdrive.manager.process import launcher +from openpilot.system.manager.process import launcher from openpilot.common.swaglog import cloudlog from openpilot.system.hardware import HARDWARE from openpilot.system.version import get_build_metadata diff --git a/system/athena/tests/test_athenad_ping.py b/system/athena/tests/test_athenad_ping.py index 3152ca427..4fda13dfe 100755 --- a/system/athena/tests/test_athenad_ping.py +++ b/system/athena/tests/test_athenad_ping.py @@ -8,7 +8,7 @@ from typing import cast from openpilot.common.params import Params from openpilot.common.timeout import Timeout from openpilot.system.athena import athenad -from openpilot.selfdrive.manager.helpers import write_onroad_params +from openpilot.system.manager.helpers import write_onroad_params from openpilot.system.hardware import TICI TIMEOUT_TOLERANCE = 20 # seconds diff --git a/system/camerad/snapshot/snapshot.py b/system/camerad/snapshot/snapshot.py index 8c1b6084c..d9377eebe 100755 --- a/system/camerad/snapshot/snapshot.py +++ b/system/camerad/snapshot/snapshot.py @@ -11,7 +11,7 @@ from openpilot.common.params import Params from openpilot.common.realtime import DT_MDL from openpilot.system.hardware import PC from openpilot.selfdrive.controls.lib.alertmanager import set_offroad_alert -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes VISION_STREAMS = { diff --git a/system/camerad/test/test_camerad.py b/system/camerad/test/test_camerad.py index 408115607..dcc982563 100755 --- a/system/camerad/test/test_camerad.py +++ b/system/camerad/test/test_camerad.py @@ -8,7 +8,7 @@ from collections import defaultdict import cereal.messaging as messaging from cereal import log from cereal.services import SERVICE_LIST -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes TEST_TIMESPAN = 30 LAG_FRAME_TOLERANCE = {log.FrameData.ImageSensor.ar0231: 0.5, # ARs use synced pulses for frame starts diff --git a/system/hardware/tici/tests/test_power_draw.py b/system/hardware/tici/tests/test_power_draw.py index 104329da4..1fe063c8e 100755 --- a/system/hardware/tici/tests/test_power_draw.py +++ b/system/hardware/tici/tests/test_power_draw.py @@ -11,8 +11,8 @@ from cereal.services import SERVICE_LIST from openpilot.common.mock import mock_messages from openpilot.selfdrive.car.car_helpers import write_car_param from openpilot.system.hardware.tici.power_monitor import get_power -from openpilot.selfdrive.manager.process_config import managed_processes -from openpilot.selfdrive.manager.manager import manager_cleanup +from openpilot.system.manager.process_config import managed_processes +from openpilot.system.manager.manager import manager_cleanup SAMPLE_TIME = 8 # seconds to sample power MAX_WARMUP_TIME = 30 # seconds to wait for SAMPLE_TIME consecutive valid samples diff --git a/system/loggerd/tests/test_encoder.py b/system/loggerd/tests/test_encoder.py index f6eb9b901..ddf074d3b 100755 --- a/system/loggerd/tests/test_encoder.py +++ b/system/loggerd/tests/test_encoder.py @@ -14,7 +14,7 @@ from tqdm import trange from openpilot.common.params import Params from openpilot.common.timeout import Timeout from openpilot.system.hardware import TICI -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes from openpilot.tools.lib.logreader import LogReader from openpilot.system.hardware.hw import Paths diff --git a/system/loggerd/tests/test_loggerd.py b/system/loggerd/tests/test_loggerd.py index fdea60a28..d3789badb 100755 --- a/system/loggerd/tests/test_loggerd.py +++ b/system/loggerd/tests/test_loggerd.py @@ -19,7 +19,7 @@ from openpilot.common.timeout import Timeout from openpilot.system.hardware.hw import Paths from openpilot.system.loggerd.xattr_cache import getxattr from openpilot.system.loggerd.deleter import PRESERVE_ATTR_NAME, PRESERVE_ATTR_VALUE -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes from openpilot.system.version import get_version from openpilot.tools.lib.helpers import RE from openpilot.tools.lib.logreader import LogReader diff --git a/selfdrive/manager/__init__.py b/system/manager/__init__.py similarity index 100% rename from selfdrive/manager/__init__.py rename to system/manager/__init__.py diff --git a/selfdrive/manager/build.py b/system/manager/build.py similarity index 100% rename from selfdrive/manager/build.py rename to system/manager/build.py diff --git a/selfdrive/manager/helpers.py b/system/manager/helpers.py similarity index 100% rename from selfdrive/manager/helpers.py rename to system/manager/helpers.py diff --git a/selfdrive/manager/manager.py b/system/manager/manager.py similarity index 96% rename from selfdrive/manager/manager.py rename to system/manager/manager.py index 408314d62..93fab3ad1 100755 --- a/selfdrive/manager/manager.py +++ b/system/manager/manager.py @@ -11,9 +11,9 @@ import openpilot.system.sentry as sentry from openpilot.common.params import Params, ParamKeyType from openpilot.common.text_window import TextWindow from openpilot.system.hardware import HARDWARE, PC -from openpilot.selfdrive.manager.helpers import unblock_stdout, write_onroad_params, save_bootlog -from openpilot.selfdrive.manager.process import ensure_running -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.helpers import unblock_stdout, write_onroad_params, save_bootlog +from openpilot.system.manager.process import ensure_running +from openpilot.system.manager.process_config import managed_processes from openpilot.system.athena.registration import register, UNREGISTERED_DONGLE_ID from openpilot.common.swaglog import cloudlog, add_file_handler from openpilot.system.version import get_build_metadata, terms_version, training_version diff --git a/selfdrive/manager/process.py b/system/manager/process.py similarity index 100% rename from selfdrive/manager/process.py rename to system/manager/process.py diff --git a/selfdrive/manager/process_config.py b/system/manager/process_config.py similarity index 97% rename from selfdrive/manager/process_config.py rename to system/manager/process_config.py index b6567c2f7..5e153ffb9 100644 --- a/selfdrive/manager/process_config.py +++ b/system/manager/process_config.py @@ -3,7 +3,7 @@ import os from cereal import car from openpilot.common.params import Params from openpilot.system.hardware import PC, TICI -from openpilot.selfdrive.manager.process import PythonProcess, NativeProcess, DaemonProcess +from openpilot.system.manager.process import PythonProcess, NativeProcess, DaemonProcess WEBCAM = os.getenv("USE_WEBCAM") is not None diff --git a/selfdrive/manager/test/__init__.py b/system/manager/test/__init__.py similarity index 100% rename from selfdrive/manager/test/__init__.py rename to system/manager/test/__init__.py diff --git a/selfdrive/manager/test/test_manager.py b/system/manager/test/test_manager.py similarity index 91% rename from selfdrive/manager/test/test_manager.py rename to system/manager/test/test_manager.py index 4cdc99c24..af8397b24 100755 --- a/selfdrive/manager/test/test_manager.py +++ b/system/manager/test/test_manager.py @@ -8,9 +8,9 @@ from parameterized import parameterized from cereal import car from openpilot.common.params import Params -import openpilot.selfdrive.manager.manager as manager -from openpilot.selfdrive.manager.process import ensure_running -from openpilot.selfdrive.manager.process_config import managed_processes +import openpilot.system.manager.manager as manager +from openpilot.system.manager.process import ensure_running +from openpilot.system.manager.process_config import managed_processes from openpilot.system.hardware import HARDWARE os.environ['FAKEUPLOAD'] = "1" diff --git a/system/qcomgpsd/tests/test_qcomgpsd.py b/system/qcomgpsd/tests/test_qcomgpsd.py index d47ea5d63..33d6e5b78 100755 --- a/system/qcomgpsd/tests/test_qcomgpsd.py +++ b/system/qcomgpsd/tests/test_qcomgpsd.py @@ -8,7 +8,7 @@ import subprocess import cereal.messaging as messaging from openpilot.system.qcomgpsd.qcomgpsd import at_cmd, wait_for_modem -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes GOOD_SIGNAL = bool(int(os.getenv("GOOD_SIGNAL", '0'))) diff --git a/system/sensord/tests/test_sensord.py b/system/sensord/tests/test_sensord.py index 1b3b78da8..aed3b07b3 100755 --- a/system/sensord/tests/test_sensord.py +++ b/system/sensord/tests/test_sensord.py @@ -10,7 +10,7 @@ from cereal import log from cereal.services import SERVICE_LIST from openpilot.common.gpio import get_irqs_for_action from openpilot.common.timeout import Timeout -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes BMX = { ('bmx055', 'acceleration'), diff --git a/system/sensord/tests/ttff_test.py b/system/sensord/tests/ttff_test.py index e023489ed..a9cc16d70 100755 --- a/system/sensord/tests/ttff_test.py +++ b/system/sensord/tests/ttff_test.py @@ -4,7 +4,7 @@ import time import atexit from cereal import messaging -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes TIMEOUT = 10*60 diff --git a/system/tests/test_logmessaged.py b/system/tests/test_logmessaged.py index 6d59bdcb0..f8c5be09b 100755 --- a/system/tests/test_logmessaged.py +++ b/system/tests/test_logmessaged.py @@ -4,7 +4,7 @@ import os import time import cereal.messaging as messaging -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes from openpilot.system.hardware.hw import Paths from openpilot.common.swaglog import cloudlog, ipchandler diff --git a/system/ubloxd/tests/test_pigeond.py b/system/ubloxd/tests/test_pigeond.py index a24414466..cd3ad9305 100755 --- a/system/ubloxd/tests/test_pigeond.py +++ b/system/ubloxd/tests/test_pigeond.py @@ -6,7 +6,7 @@ import cereal.messaging as messaging from cereal.services import SERVICE_LIST from openpilot.common.gpio import gpio_read from openpilot.selfdrive.test.helpers import with_processes -from openpilot.selfdrive.manager.process_config import managed_processes +from openpilot.system.manager.process_config import managed_processes from openpilot.system.hardware.tici.pins import GPIO diff --git a/system/updated/tests/test_base.py b/system/updated/tests/test_base.py index 615d0de99..928d07cbe 100644 --- a/system/updated/tests/test_base.py +++ b/system/updated/tests/test_base.py @@ -9,7 +9,7 @@ import time import pytest from openpilot.common.params import Params -from openpilot.selfdrive.manager.process import ManagerProcess +from openpilot.system.manager.process import ManagerProcess from openpilot.selfdrive.test.helpers import processes_context diff --git a/tools/sim/launch_openpilot.sh b/tools/sim/launch_openpilot.sh index 86d9607bb..1b4ac4ef8 100755 --- a/tools/sim/launch_openpilot.sh +++ b/tools/sim/launch_openpilot.sh @@ -18,4 +18,4 @@ SCRIPT_DIR=$(dirname "$0") OPENPILOT_DIR=$SCRIPT_DIR/../../ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" -cd $OPENPILOT_DIR/selfdrive/manager && exec ./manager.py +cd $OPENPILOT_DIR/system/manager && exec ./manager.py diff --git a/tools/webcam/README.md b/tools/webcam/README.md index 76733b173..7334d87b3 100644 --- a/tools/webcam/README.md +++ b/tools/webcam/README.md @@ -29,7 +29,7 @@ USE_WEBCAM=1 scons -j$(nproc) ## GO ``` -cd ~/openpilot/selfdrive/manager +cd ~/openpilot/system/manager NOSENSOR=1 USE_WEBCAM=1 ./manager.py ``` - Start the car, then the UI should show the road webcam's view