Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove Qt wrapper scripts #30454

Merged
merged 2 commits into from
Dec 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ selfdrive/boardd/boardd
selfdrive/logcatd/logcatd
selfdrive/mapd/default_speeds_by_region.json
system/proclogd/proclogd
selfdrive/ui/_ui
selfdrive/ui/translations/alerts_generated.h
selfdrive/ui/translations/tmp
selfdrive/test/longitudinal_maneuvers/out
Expand Down
1 change: 0 additions & 1 deletion release/files_common
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,6 @@ selfdrive/ui/.gitignore
selfdrive/ui/SConscript
selfdrive/ui/*.cc
selfdrive/ui/*.h
selfdrive/ui/ui
selfdrive/ui/text
selfdrive/ui/spinner
selfdrive/ui/soundd.py
Expand Down
4 changes: 2 additions & 2 deletions selfdrive/test/test_onroad.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"./locationd": 11.0,
"./mapsd": (1.0, 10.0),
"selfdrive.controls.plannerd": 11.0,
"./_ui": 18.0,
"./ui": 18.0,
"selfdrive.locationd.paramsd": 9.0,
"./sensord": 7.0,
"selfdrive.controls.radard": 4.5,
Expand Down Expand Up @@ -303,7 +303,7 @@ def test_memory_usage(self):
self.assertLessEqual(max(mems) - min(mems), 3.0)

def test_gpu_usage(self):
self.assertEqual(self.gpu_procs, {"weston", "_ui", "camerad", "selfdrive.modeld.modeld"})
self.assertEqual(self.gpu_procs, {"weston", "ui", "camerad", "selfdrive.modeld.modeld"})

def test_camera_processing_time(self):
result = "\n"
Expand Down
1 change: 1 addition & 0 deletions selfdrive/ui/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ moc_*

translations/main_test_en.*

ui
watch3
installer/installers/*
qt/text
Expand Down
2 changes: 1 addition & 1 deletion selfdrive/ui/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ qt_env.Program("qt/text", ["qt/text.cc"], LIBS=qt_libs)
qt_env.Program("qt/spinner", ["qt/spinner.cc"], LIBS=qt_libs)

# build main UI
qt_env.Program("_ui", qt_src + [asset_obj], LIBS=qt_libs)
qt_env.Program("ui", qt_src + [asset_obj], LIBS=qt_libs)
if GetOption('extras'):
qt_src.remove("main.cc") # replaced by test_runner
qt_env.Program('tests/test_translations', [asset_obj, 'tests/test_runner.cc', 'tests/test_translations.cc'] + qt_src, LIBS=qt_libs)
Expand Down
2 changes: 2 additions & 0 deletions selfdrive/ui/qt/util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ void initApp(int argc, char *argv[], bool disable_hidpi) {
#endif
}

qputenv("QT_DBL_CLICK_DIST", QByteArray::number(150));

setQtSurfaceFormat();
}

Expand Down
4 changes: 0 additions & 4 deletions selfdrive/ui/ui

This file was deleted.

Loading