mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-10-13 09:43:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove dashcam branch (#31081)

Browse Source 
* remove dashcam branch

* fix

* more cleanup

* remove param

* one more
This commit is contained in:
Adeeb Shihadeh
2024-01-19 14:05:03 -08:00
committed by GitHub
parent 18467c8383
commit 7cd9568423
35 changed files with 28 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/controls/controlsd.py
+1 -2
View File
@@ -105,14 +105,13 @@ class Controls:
self.is_metric = self.params.get_bool("IsMetric")
self.is_ldw_enabled = self.params.get_bool("IsLdwEnabled")
openpilot_enabled_toggle = self.params.get_bool("OpenpilotEnabledToggle")
passive = self.params.get_bool("Passive") or not openpilot_enabled_toggle
# detect sound card presence and ensure successful init
sounds_available = HARDWARE.get_sound_card_online()
car_recognized = self.CP.carName != 'mock'
controller_available = self.CI.CC is not None and not passive and not self.CP.dashcamOnly
controller_available = self.CI.CC is not None and openpilot_enabled_toggle and not self.CP.dashcamOnly
self.CP.passive = not car_recognized or not controller_available or self.CP.dashcamOnly
if self.CP.passive:
safety_config = car.CarParams.SafetyConfig.new_message()
selfdrive/controls/tests/test_startup.py
-1
View File
@@ -69,7 +69,6 @@ class TestStartup(unittest.TestCase):
pm = messaging.PubMaster(['can', 'pandaStates'])
params = Params()
params.put_bool("Passive", False)
params.put_bool("OpenpilotEnabledToggle", True)
# Build capnn version of FW array
selfdrive/manager/manager.py
-7
View File
@@ -58,13 +58,6 @@ def manager_init() -> None:
if params.get(k) is None:
params.put(k, v)
# is this dashcam?
if os.getenv("PASSIVE") is not None:
params.put_bool("Passive", bool(int(os.getenv("PASSIVE", "0"))))
if params.get("Passive") is None:
raise Exception("Passive must be set to continue")
# Create folders needed for msgq
try:
os.mkdir("/dev/shm")
selfdrive/manager/test/test_manager.py
-1
View File
@@ -21,7 +21,6 @@ BLACKLIST_PROCS = ['manage_athenad', 'pandad', 'pigeond']
@pytest.mark.tici
class TestManager(unittest.TestCase):
def setUp(self):
os.environ['PASSIVE'] = '0'
HARDWARE.set_power_save(False)
# ensure clean CarParams
selfdrive/test/helpers.py
-2
View File
@@ -12,7 +12,6 @@ from openpilot.tools.lib.logreader import LogIterable
def set_params_enabled():
os.environ['PASSIVE'] = "0"
os.environ['REPLAY'] = "1"
os.environ['FINGERPRINT'] = "TOYOTA COROLLA TSS2 2019"
os.environ['LOGPRINT'] = "debug"
@@ -21,7 +20,6 @@ def set_params_enabled():
params.put("HasAcceptedTerms", terms_version)
params.put("CompletedTrainingVersion", training_version)
params.put_bool("OpenpilotEnabledToggle", True)
params.put_bool("Passive", False)
# valid calib
msg = messaging.new_message('liveCalibration')
selfdrive/test/process_replay/process_replay.py
-1
View File
@@ -725,7 +725,6 @@ def _replay_multi_process(
def generate_params_config(lr=None, CP=None, fingerprint=None, custom_params=None) -> Dict[str, Any]:
params_dict = {
"OpenpilotEnabledToggle": True,
"Passive": False,
"DisengageOnAccelerator": True,
"DisableLogging": False,
}
selfdrive/thermald/thermald.py
+1 -2
View File
@@ -297,8 +297,7 @@ def thermald_thread(end_event, hw_queue) -> None:
# with 2% left, we killall, otherwise the phone will take a long time to boot
startup_conditions["free_space"] = msg.deviceState.freeSpacePercent > 2
startup_conditions["completed_training"] = params.get("CompletedTrainingVersion") == training_version or \
params.get_bool("Passive")
startup_conditions["completed_training"] = params.get("CompletedTrainingVersion") == training_version
startup_conditions["not_driver_view"] = not params.get_bool("IsDriverViewEnabled")
startup_conditions["not_taking_snapshot"] = not params.get_bool("IsTakingSnapshot")
selfdrive/ui/SConscript
+4 -10
View File
@@ -101,23 +101,17 @@ if GetOption('extras') and arch != "Darwin":
senv['LINKFLAGS'].append('-Wl,-strip-debug')
release = "release3"
dashcam = "dashcam3"
installers = [
("openpilot", release),
("openpilot_test", f"{release}-staging"),
("openpilot_nightly", "nightly"),
("openpilot_internal", "master"),
("dashcam", dashcam),
("dashcam_test", f"{dashcam}-staging"),
]
cont = {}
for brand in ("openpilot", "dashcam"):
cont[brand] = senv.Command(f"installer/continue_{brand}.o", f"installer/continue_{brand}.sh",
"ld -r -b binary -o $TARGET $SOURCE")
cont = senv.Command(f"installer/continue_openpilot.o", f"installer/continue_openpilot.sh",
"ld -r -b binary -o $TARGET $SOURCE")
for name, branch in installers:
brand = "dashcam" if "dashcam" in branch else "openpilot"
d = {'BRANCH': f"'\"{branch}\"'", 'BRAND': f"'\"{brand}\"'"}
d = {'BRANCH': f"'\"{branch}\"'"}
if "internal" in name:
d['INTERNAL'] = "1"
@@ -126,7 +120,7 @@ if GetOption('extras') and arch != "Darwin":
r.raise_for_status()
d['SSH_KEYS'] = f'\\"{r.text.strip()}\\"'
obj = senv.Object(f"installer/installers/installer_{name}.o", ["installer/installer.cc"], CPPDEFINES=d)
f = senv.Program(f"installer/installers/installer_{name}", [obj, cont[brand]], LIBS=qt_libs)
f = senv.Program(f"installer/installers/installer_{name}", [obj, cont], LIBS=qt_libs)
# keep installers small
assert f[0].get_size() < 350*1e3
selfdrive/ui/installer/continue_dashcam.sh
-4
View File
@@ -1,4 +0,0 @@
#!/usr/bin/bash
cd /data/openpilot
exec ./launch_chffrplus.sh
selfdrive/ui/installer/installer.cc
+2 -2
View File
@@ -33,8 +33,8 @@ const QString CACHE_PATH = "/data/openpilot.cache";
#define INSTALL_PATH "/data/openpilot"
#define TMP_INSTALL_PATH "/data/tmppilot"
extern const uint8_t str_continue[] asm("_binary_selfdrive_ui_installer_continue_" BRAND "_sh_start");
extern const uint8_t str_continue_end[] asm("_binary_selfdrive_ui_installer_continue_" BRAND "_sh_end");
extern const uint8_t str_continue[] asm("_binary_selfdrive_ui_installer_continue_openpilot_sh_start");
extern const uint8_t str_continue_end[] asm("_binary_selfdrive_ui_installer_continue_openpilot_sh_end");
bool time_valid() {
time_t rawtime;
selfdrive/ui/qt/offroad/onboarding.cc
+1 -1
View File
@@ -183,7 +183,7 @@ void DeclinePage::showEvent(QShowEvent *event) {
void OnboardingWindow::updateActiveScreen() {
if (!accepted_terms) {
setCurrentIndex(0);
} else if (!training_done && !params.getBool("Passive")) {
} else if (!training_done) {
setCurrentIndex(1);
} else {
emit onboardingDone();
selfdrive/ui/qt/offroad/settings.cc
+7 -9
View File
@@ -215,15 +215,13 @@ DevicePanel::DevicePanel(SettingsWindow *parent) : ListWidget(parent) {
});
addItem(resetCalibBtn);
if (!params.getBool("Passive")) {
auto retrainingBtn = new ButtonControl(tr("Review Training Guide"), tr("REVIEW"), tr("Review the rules, features, and limitations of openpilot"));
connect(retrainingBtn, &ButtonControl::clicked, [=]() {
if (ConfirmationDialog::confirm(tr("Are you sure you want to review the training guide?"), tr("Review"), this)) {
emit reviewTrainingGuide();
}
});
addItem(retrainingBtn);
}
auto retrainingBtn = new ButtonControl(tr("Review Training Guide"), tr("REVIEW"), tr("Review the rules, features, and limitations of openpilot"));
connect(retrainingBtn, &ButtonControl::clicked, [=]() {
if (ConfirmationDialog::confirm(tr("Are you sure you want to review the training guide?"), tr("Review"), this)) {
emit reviewTrainingGuide();
}
});
addItem(retrainingBtn);
if (Hardware::TICI()) {
auto regulatoryBtn = new ButtonControl(tr("Regulatory"), tr("VIEW"), "");
selfdrive/ui/qt/setup/setup.cc
+3 -3
View File
@@ -20,7 +20,7 @@
#include "selfdrive/ui/qt/widgets/input.h"
const std::string USER_AGENT = "AGNOSSetup-";
const QString DASHCAM_URL = "https://dashcam.comma.ai";
const QString TEST_URL = "https://openpilot.comma.ai";
bool is_elf(char *fname) {
FILE *fp = fopen(fname, "rb");
@@ -229,11 +229,11 @@ QWidget * Setup::network_setup() {
}
repaint();
});
request->sendRequest(DASHCAM_URL);
request->sendRequest(TEST_URL);
QTimer *timer = new QTimer(this);
QObject::connect(timer, &QTimer::timeout, [=]() {
if (!request->active() && cont->isVisible()) {
request->sendRequest(DASHCAM_URL);
request->sendRequest(TEST_URL);
}
});
timer->start(1000);
selfdrive/ui/qt/util.cc
+1 -1
View File
@@ -25,7 +25,7 @@ QString getVersion() {
}
QString getBrand() {
return Params().getBool("Passive") ? QObject::tr("dashcam") : QObject::tr("openpilot");
return QObject::tr("openpilot");
}
QString getUserAgent() {
selfdrive/ui/translations/main_ar.ts
-4
View File
@@ -562,10 +562,6 @@
<source>Exit</source>
<translation>إغلاق</translation>
</message>
<message>
<source>dashcam</source>
<translation>dashcam</translation>
</message>
<message>
<source>openpilot</source>
<translation>openpilot</translation>
selfdrive/ui/translations/main_de.ts
-4
View File
@@ -557,10 +557,6 @@
<source>Exit</source>
<translation>Verlassen</translation>
</message>
<message>
<source>dashcam</source>
<translation>dashcam</translation>
</message>
<message>
<source>openpilot</source>
<translation>openpilot</translation>
selfdrive/ui/translations/main_fr.ts
-4
View File
@@ -558,10 +558,6 @@
<source>Exit</source>
<translation>Quitter</translation>
</message>
<message>
<source>dashcam</source>
<translation>dashcam</translation>
</message>
<message>
<source>openpilot</source>
<translation>openpilot</translation>
selfdrive/ui/translations/main_ja.ts
-4
View File
@@ -556,10 +556,6 @@
<source>Exit</source>
<translation>閉じる</translation>
</message>
<message>
<source>dashcam</source>
<translation>ﾄﾞﾗｲﾌﾞﾚｺｰﾀﾞｰ</translation>
</message>
<message>
<source>openpilot</source>
<translation>openpilot</translation>
selfdrive/ui/translations/main_ko.ts
-4
View File
@@ -557,10 +557,6 @@
<source>Exit</source>
<translation>종료</translation>
</message>
<message>
<source>dashcam</source>
<translation>블랙박스</translation>
</message>
<message>
<source>openpilot</source>
<translation>openpilot</translation>
selfdrive/ui/translations/main_pt-BR.ts
-4
View File
@@ -558,10 +558,6 @@
<source>Exit</source>
<translation>Sair</translation>
</message>
<message>
<source>dashcam</source>
<translation>dashcam</translation>
</message>
<message>
<source>openpilot</source>
<translation>openpilot</translation>
selfdrive/ui/translations/main_th.ts
-4
View File
@@ -557,10 +557,6 @@
<source>Exit</source>
<translation>ปิด</translation>
</message>
<message>
<source>dashcam</source>
<translation>กล้องติดรถยนต์</translation>
</message>
<message>
<source>openpilot</source>
<translation>openpilot</translation>
selfdrive/ui/translations/main_tr.ts
-4
View File
@@ -556,10 +556,6 @@
<source>Exit</source>
<translation>Çık</translation>
</message>
<message>
<source>dashcam</source>
<translation>araç yol kamerası</translation>
</message>
<message>
<source>openpilot</source>
<translation>openpilot</translation>
selfdrive/ui/translations/main_zh-CHS.ts
-4
View File
@@ -557,10 +557,6 @@
<source>Exit</source>
<translation>退出</translation>
</message>
<message>
<source>dashcam</source>
<translation>行车记录仪</translation>
</message>
<message>
<source>openpilot</source>
<translation>openpilot</translation>
selfdrive/ui/translations/main_zh-CHT.ts
-4
View File
@@ -557,10 +557,6 @@
<source>Exit</source>
<translation>離開</translation>
</message>
<message>
<source>dashcam</source>
<translation>行車記錄器</translation>
</message>
<message>
<source>openpilot</source>
<translation>openpilot</translation>
selfdrive/updated.py
+1 -1
View File
@@ -342,7 +342,7 @@ class Updater:
def check_for_update(self) -> None:
cloudlog.info("checking for updates")
excluded_branches = ('release2', 'release2-staging', 'dashcam', 'dashcam-staging')
excluded_branches = ('release2', 'release2-staging')
try:
run(["git", "ls-remote", "origin", "HEAD"], OVERLAY_MERGED)