From 46b60bb50c5969f5c2d22d7c5e563f01daf1a380 Mon Sep 17 00:00:00 2001 From: ajouatom Date: Wed, 29 Apr 2026 17:45:54 +0900 Subject: [PATCH] remove connect --- common/params_keys.h | 1 - launch_openpilot.sh | 8 ++++---- selfdrive/carrot_settings.json | 16 ---------------- system/manager/process_config.py | 6 +++--- 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/common/params_keys.h b/common/params_keys.h index adaa5f658..e427d3a87 100644 --- a/common/params_keys.h +++ b/common/params_keys.h @@ -317,7 +317,6 @@ inline static std::unordered_map keys = { {"MaxTimeOffroadMin", {PERSISTENT, INT, "60"}}, {"DisableDM", {PERSISTENT, INT, "0"}}, - {"EnableConnect", {PERSISTENT, INT, "0"}}, {"MuteDoor", {PERSISTENT, INT, "0"}}, {"MuteSeatbelt", {PERSISTENT, INT, "0"}}, diff --git a/launch_openpilot.sh b/launch_openpilot.sh index abc35aabf..3e65f350e 100755 --- a/launch_openpilot.sh +++ b/launch_openpilot.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -if [[ "$(cat /data/params/d/EnableConnect)" == "2" ]]; then - export API_HOST="https://api.carrotpilot.app" - export ATHENA_HOST="wss://athena.carrotpilot.app" -fi +#if [[ "$(cat /data/params/d/EnableConnect)" == "2" ]]; then +# export API_HOST="https://api.carrotpilot.app" +# export ATHENA_HOST="wss://athena.carrotpilot.app" +#fi exec ./launch_chffrplus.sh diff --git a/selfdrive/carrot_settings.json b/selfdrive/carrot_settings.json index dda57f7dd..21fb50884 100644 --- a/selfdrive/carrot_settings.json +++ b/selfdrive/carrot_settings.json @@ -1233,22 +1233,6 @@ "ctitle": "禁用驾驶员监控", "cdescr": "1. 禁用 DM, 2: + 开启 WebRTC, 需要重启" }, - { - "group": "시작", - "name": "EnableConnect", - "title": "EnableConnect", - "descr": "(1:콤마, 2:당근)커넥트를 사용합니다\n 상황에 따라 BAN될 수 있습니다\n 재부팅 필요", - "egroup": "START", - "etitle": "EnableConnect", - "edescr": "Using (1:comma, 2:carrot) Connect. May be banned depending on the situation. Reboot required.", - "min": 0, - "max": 2, - "default": 0, - "unit": 1, - "cgroup": "启动设置", - "ctitle": "开启连接 (Connect)", - "cdescr": "使用 (1:comma, 2:carrot) 连接。根据情况可能会被封禁。需要重启。" - }, { "group": "시작", "name": "MuteDoor", diff --git a/system/manager/process_config.py b/system/manager/process_config.py index 590e1ae2c..71125ffa0 100644 --- a/system/manager/process_config.py +++ b/system/manager/process_config.py @@ -76,8 +76,8 @@ def and_(*fns): def enable_dm(started, params, CP: car.CarParams) -> bool: return (started or params.get_bool("IsDriverViewEnabled")) and params.get_int("DisableDM") == 0 -def enable_connect(started, params, CP: car.CarParams) -> bool: - return params.get_int("EnableConnect") > 0 +#def enable_connect(started, params, CP: car.CarParams) -> bool: +# return params.get_int("EnableConnect") > 0 def enable_xiaoge_data(started, params, CP: car.CarParams) -> bool: return params.get_bool("ShareData") @@ -129,7 +129,7 @@ procs = [ PythonProcess("hardwared", "system.hardware.hardwared", always_run), PythonProcess("tombstoned", "system.tombstoned", always_run, enabled=not PC), PythonProcess("updated", "system.updated.updated", enable_updated, enabled=not PC), - PythonProcess("uploader", "system.loggerd.uploader", enable_connect), + #PythonProcess("uploader", "system.loggerd.uploader", enable_connect), PythonProcess("statsd", "system.statsd", always_run), PythonProcess("feedbackd", "selfdrive.ui.feedback.feedbackd", only_onroad),