sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
openpilot is an open source driver assistance system. openpilot performs the functions of Automated Lane Centering and Adaptive Cruise Control for over 200 supported car makes and models.
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
2856 Commits
123 Branches
82 Tags
5.0 GiB
Tag: Branch: Tree: 99b06dd837
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '99b06dd837'
${ noResults }
openpilot_comma/selfdrive/ui/SConscript

104 lines
3.6 KiB
Raw Normal View History Unescape

Qt setup + installer (#2511) * getting started * setup screens * cleanupg * url input * installer * setup * installer old-commit-hash: 7b72bbe9f3743a16edf31c44506c7f62a43b081b
5 years ago
import os
qt cleanup (#2476) old-commit-hash: b00cb389efa4e197eb2d9f7bf45d973f9f9dc97c
5 years ago
Import('env', 'arch', 'real_arch', 'common', 'messaging', 'gpucommon', 'visionipc', 'cereal')
qt_env = None
if arch in ["x86_64", "Darwin", "larch64"]:
qt_env = env.Clone()
if arch == "Darwin":
qt_env['QTDIR'] = "/usr/local/opt/qt"
QT_BASE = "/usr/local/opt/qt/"
qt_dirs = [
QT_BASE + "include/",
QT_BASE + "include/QtWidgets",
QT_BASE + "include/QtGui",
QT_BASE + "include/QtCore",
QT_BASE + "include/QtDBus",
QT_BASE + "include/QtMultimedia",
Qt Offroad stats (#19498) * probably broke a lot, need the commit though * finally works * make it work... * ... * kind of works * better styling * all should work * tiny cleanup * temp * looks nicer * create JWT in C++ * kilometers -> km * use correct free methods * dont put code in assert statement * Build JWT payload dynamically * get dongle id once * include cleanup * Remove qDebug * Update drive_stats.cc Github is a nice editor :) * swap week and all and fix sconscript * install openssl * openssl include dirs on mac * is this where openssl is? * It's here * small cleanup Co-authored-by: Comma Device <device@comma.ai> Co-authored-by: Willem Melching <willem.melching@gmail.com> old-commit-hash: 5b26c97141b65e3bcbddaec7e6526d5f2f1c910e
4 years ago
QT_BASE + "include/QtNetwork",
qt cleanup (#2476) old-commit-hash: b00cb389efa4e197eb2d9f7bf45d973f9f9dc97c
5 years ago
]
qt_env["LINKFLAGS"] += ["-F" + QT_BASE + "lib"]
else:
qt_env['QTDIR'] = "/usr"
qt_dirs = [
f"/usr/include/{real_arch}-linux-gnu/qt5",
f"/usr/include/{real_arch}-linux-gnu/qt5/QtWidgets",
f"/usr/include/{real_arch}-linux-gnu/qt5/QtGui",
f"/usr/include/{real_arch}-linux-gnu/qt5/QtCore",
f"/usr/include/{real_arch}-linux-gnu/qt5/QtDBus",
f"/usr/include/{real_arch}-linux-gnu/qt5/QtMultimedia",
Qt Offroad stats (#19498) * probably broke a lot, need the commit though * finally works * make it work... * ... * kind of works * better styling * all should work * tiny cleanup * temp * looks nicer * create JWT in C++ * kilometers -> km * use correct free methods * dont put code in assert statement * Build JWT payload dynamically * get dongle id once * include cleanup * Remove qDebug * Update drive_stats.cc Github is a nice editor :) * swap week and all and fix sconscript * install openssl * openssl include dirs on mac * is this where openssl is? * It's here * small cleanup Co-authored-by: Comma Device <device@comma.ai> Co-authored-by: Willem Melching <willem.melching@gmail.com> old-commit-hash: 5b26c97141b65e3bcbddaec7e6526d5f2f1c910e
4 years ago
f"/usr/include/{real_arch}-linux-gnu/qt5/QtNetwork",
qt cleanup (#2476) old-commit-hash: b00cb389efa4e197eb2d9f7bf45d973f9f9dc97c
5 years ago
f"/usr/include/{real_arch}-linux-gnu/qt5/QtGui/5.5.1/QtGui",
Tici Focal (#2459) * fix i2c * fix libi2c (again?) * qt 5.12.8 Co-authored-by: Willem Melching <willem.melching@gmail.com> old-commit-hash: c5c875bad990475a48dd01ec7dad0ff6a83010d3
5 years ago
f"/usr/include/{real_arch}-linux-gnu/qt5/QtGui/5.12.8/QtGui",
qt cleanup (#2476) old-commit-hash: b00cb389efa4e197eb2d9f7bf45d973f9f9dc97c
5 years ago
]
qt_env.Tool('qt')
stacked widget old-commit-hash: 394dc66a19bd1329ca3390cbf7caa7e2aa4cca60
4 years ago
qt_env['CPPPATH'] += qt_dirs + ["#selfdrive/ui/qt/"]
qt cleanup (#2476) old-commit-hash: b00cb389efa4e197eb2d9f7bf45d973f9f9dc97c
5 years ago
qt_flags = [
"-D_REENTRANT",
"-DQT_NO_DEBUG",
"-DQT_WIDGETS_LIB",
"-DQT_GUI_LIB",
"-DQT_CORE_LIB"
]
qt_env['CXXFLAGS'] += qt_flags
Qt cleanup (#2622) * scale * contain weston hack in one file * rest * no show * missed one old-commit-hash: efc30f4a83953363d665290f99b91c7b52652cc2
4 years ago
qt_env['LIBPATH'] += ['#selfdrive/ui']
qt cleanup (#2476) old-commit-hash: b00cb389efa4e197eb2d9f7bf45d973f9f9dc97c
5 years ago
selfdrive/ui old-commit-hash: aeb2fff068e13c5d99f350a92373eb905e1a1522
5 years ago
Refactor frame (#1192) * start drawing new sidebar, add assets * add thermal to ui, draw network_type and battery * draw sidebar metrics, add freeSpace and paTemp * draw static panda metric and network strength, start ubloxGnss messaging * use array for network_img * start sidebar touch events * prevent multiple touch events with touch_timeout * filter old touches, isolate sidebar events * add hwType check with timeout for panda metric * cleanup touch poll, handle vision touch, remove frame and black apks * cleanup per willem comments * update offroad, only read active_app from cereal * tweak sidebar behavior, show active app status * update offroad apk * read networkstrength from thermal in sidebar old-commit-hash: 5ba6beed17baf17081169d2e1d5b144df00cda76
5 years ago
src = ['ui.cc', 'paint.cc', 'sidebar.cc', '#phonelibs/nanovg/nanovg.c']
Remove czmq part 1 (#2332) * remove czmq * remove streaming mode from loggerd * Add include for usleep old-commit-hash: a4ccfcffe8247bf467bddfb0e6c5b3eb8851e21a
5 years ago
libs = [common, 'zmq', 'capnp', 'kj', 'm', cereal, messaging, gpucommon, visionipc]
selfdrive/ui old-commit-hash: aeb2fff068e13c5d99f350a92373eb905e1a1522
5 years ago
Qt ui for PC (#2023) * qt ui boilerplate * this kinda works * cleanup * render inside other widget * cleanup * more cleanup * Not needed * Handle click * Draw at 20Hz * create paint.hpp * move stuff around * update sidebar * Draw vision * this works again * add clickable settings button * Only collapse sidebar when started * always use qt on linux * fix width * scrollable area * talk to NetworkManager * code to add a connection * params toggles * small cleanup * add qt5 to dockerfile * Qt on mac * Add qt to release files * fix macos build * nore more ifdefs needed * add icons * make a bit nicer * Hide scrollbar Co-authored-by: Comma Device <device@comma.ai> old-commit-hash: e115c514521c7705112bd0cb2e4bf865b536501a
5 years ago
if qt_env is None:
Qt offroad (#2451) old-commit-hash: 06400af09f23525aa2c432e21a94ca774c01c1eb
5 years ago
libs += ['EGL', 'GLESv3', 'gnustl_shared', 'log', 'utils', 'gui', 'hardware',
'ui', 'CB', 'gsl', 'adreno_utils', 'OpenSLES', 'cutils', 'uuid', 'OpenCL']
Support scons build on Mac (#1034) * fix clock and add Darwin sconstruct * it builds, this changes should be simplifications too * fix boardd build * that's the real type of EGLClientBuffer * remove extra lines * ui needs opencl on phone old-commit-hash: f72f78f2b9e1028a8421dc8f57bccfa2fab3396a
5 years ago
linkflags = ['-Wl,-rpath=/system/lib64,-rpath=/system/comma/usr/lib']
Qt ui for PC (#2023) * qt ui boilerplate * this kinda works * cleanup * render inside other widget * cleanup * more cleanup * Not needed * Handle click * Draw at 20Hz * create paint.hpp * move stuff around * update sidebar * Draw vision * this works again * add clickable settings button * Only collapse sidebar when started * always use qt on linux * fix width * scrollable area * talk to NetworkManager * code to add a connection * params toggles * small cleanup * add qt5 to dockerfile * Qt on mac * Add qt to release files * fix macos build * nore more ifdefs needed * add icons * make a bit nicer * Hide scrollbar Co-authored-by: Comma Device <device@comma.ai> old-commit-hash: e115c514521c7705112bd0cb2e4bf865b536501a
5 years ago
QT UI: sounds (#2078) * move android into own dir * fix name * maybe this works? qt ui doesn't work on mac * fix that * pc sound works * fix pc build * lowercase * that needs to be real_arch * split into classes * fix typo in lib * Fix cycle alerts * Add qt multimedia libs to install scripts * Add ui/android folder * Fix android build * Raise exception if sound init fails * add missing return Co-authored-by: Willem Melching <willem.melching@gmail.com> Co-authored-by: Comma Device <device@comma.ai> old-commit-hash: acd1bde496904fbc0d97f4d89e630358c4d11f7f
5 years ago
src += ["android/ui.cc", "android/sl_sound.cc"]
Qt ui for PC (#2023) * qt ui boilerplate * this kinda works * cleanup * render inside other widget * cleanup * more cleanup * Not needed * Handle click * Draw at 20Hz * create paint.hpp * move stuff around * update sidebar * Draw vision * this works again * add clickable settings button * Only collapse sidebar when started * always use qt on linux * fix width * scrollable area * talk to NetworkManager * code to add a connection * params toggles * small cleanup * add qt5 to dockerfile * Qt on mac * Add qt to release files * fix macos build * nore more ifdefs needed * add icons * make a bit nicer * Hide scrollbar Co-authored-by: Comma Device <device@comma.ai> old-commit-hash: e115c514521c7705112bd0cb2e4bf865b536501a
5 years ago
env.Program('_ui', src,
LINKFLAGS=linkflags,
LIBS=libs)
selfdrive/ui old-commit-hash: aeb2fff068e13c5d99f350a92373eb905e1a1522
5 years ago
else:
Qt Offroad stats (#19498) * probably broke a lot, need the commit though * finally works * make it work... * ... * kind of works * better styling * all should work * tiny cleanup * temp * looks nicer * create JWT in C++ * kilometers -> km * use correct free methods * dont put code in assert statement * Build JWT payload dynamically * get dongle id once * include cleanup * Remove qDebug * Update drive_stats.cc Github is a nice editor :) * swap week and all and fix sconscript * install openssl * openssl include dirs on mac * is this where openssl is? * It's here * small cleanup Co-authored-by: Comma Device <device@comma.ai> Co-authored-by: Willem Melching <willem.melching@gmail.com> old-commit-hash: 5b26c97141b65e3bcbddaec7e6526d5f2f1c910e
4 years ago
qt_libs = ["pthread", "ssl", "crypto"]
Qt ui for PC (#2023) * qt ui boilerplate * this kinda works * cleanup * render inside other widget * cleanup * more cleanup * Not needed * Handle click * Draw at 20Hz * create paint.hpp * move stuff around * update sidebar * Draw vision * this works again * add clickable settings button * Only collapse sidebar when started * always use qt on linux * fix width * scrollable area * talk to NetworkManager * code to add a connection * params toggles * small cleanup * add qt5 to dockerfile * Qt on mac * Add qt to release files * fix macos build * nore more ifdefs needed * add icons * make a bit nicer * Hide scrollbar Co-authored-by: Comma Device <device@comma.ai> old-commit-hash: e115c514521c7705112bd0cb2e4bf865b536501a
5 years ago
Qt Offroad stats (#19498) * probably broke a lot, need the commit though * finally works * make it work... * ... * kind of works * better styling * all should work * tiny cleanup * temp * looks nicer * create JWT in C++ * kilometers -> km * use correct free methods * dont put code in assert statement * Build JWT payload dynamically * get dongle id once * include cleanup * Remove qDebug * Update drive_stats.cc Github is a nice editor :) * swap week and all and fix sconscript * install openssl * openssl include dirs on mac * is this where openssl is? * It's here * small cleanup Co-authored-by: Comma Device <device@comma.ai> Co-authored-by: Willem Melching <willem.melching@gmail.com> old-commit-hash: 5b26c97141b65e3bcbddaec7e6526d5f2f1c910e
4 years ago
qt_modules = ["Widgets", "Gui", "Core", "DBus", "Multimedia", "Network"]
Abstract common events + event cleanup (#1129) * too many if * unused * whitespace * key * sefldrive/car/* * no more gctx * lower * start abstracting common events * all cars * start small * all cars * reverse gear * wrongCarMode * wrongGear * espDisabled * steerUnvailable * make linter happy * c isn't used * fix esp_disabled in VW * update ref * more red * more cleanup * fix subaru * update ref old-commit-hash: e8cb6ea06a2470dd89a6ad8fd17bd1d1b62034cc
5 years ago
link ui against right opengl(ES) lib old-commit-hash: 7cd481577347529ba90d6b3454700d610e80941c
5 years ago
if arch == "larch64":
tici: fix ui rotation (#2222) * fix rotation using wayland * put back intrinsic matrix fix old-commit-hash: 53e71f44ceec181e40c4cbd3f14a403798bca7bb
5 years ago
qt_libs += ["GLESv2", "wayland-client"]
switch build flags to use opengl framework rather than gl library for OSX (#2467) * switch build flags to use opengl framework rather than library for OSX * little cleaner * arch Co-authored-by: thatsaboi <thatsa@boi.com> Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com> old-commit-hash: 029be4901217ba4aada3a24b5b3d113aee359369
5 years ago
elif arch != "Darwin":
link ui against right opengl(ES) lib old-commit-hash: 7cd481577347529ba90d6b3454700d610e80941c
5 years ago
qt_libs += ["GL"]
switch build flags to use opengl framework rather than gl library for OSX (#2467) * switch build flags to use opengl framework rather than library for OSX * little cleaner * arch Co-authored-by: thatsaboi <thatsa@boi.com> Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com> old-commit-hash: 029be4901217ba4aada3a24b5b3d113aee359369
5 years ago
if arch == "Darwin":
qt_env["FRAMEWORKS"] += [f"Qt{m}" for m in qt_modules] + ["OpenGL"]
else:
qt_libs += [f"Qt5{m}" for m in qt_modules]
Qt ui: improve toggle buttons (#2639) * works, but is still a bit ugly * works * looks much better now * fix compile error * reduce diff * write to params * cleanup old-commit-hash: 61884d2c502930c95a612ba3966dd77ec2749f61
4 years ago
Qt Offroad stats (#19498) * probably broke a lot, need the commit though * finally works * make it work... * ... * kind of works * better styling * all should work * tiny cleanup * temp * looks nicer * create JWT in C++ * kilometers -> km * use correct free methods * dont put code in assert statement * Build JWT payload dynamically * get dongle id once * include cleanup * Remove qDebug * Update drive_stats.cc Github is a nice editor :) * swap week and all and fix sconscript * install openssl * openssl include dirs on mac * is this where openssl is? * It's here * small cleanup Co-authored-by: Comma Device <device@comma.ai> Co-authored-by: Willem Melching <willem.melching@gmail.com> old-commit-hash: 5b26c97141b65e3bcbddaec7e6526d5f2f1c910e
4 years ago
widgets = qt_env.Library("qt_widgets",
["qt/qt_window.cc", "qt/qt_sound.cc", "qt/widgets/keyboard.cc", "qt/widgets/input_field.cc", "qt/widgets/drive_stats.cc",
"qt/offroad/wifi.cc", "qt/offroad/wifiManager.cc", "qt/widgets/toggle.cc", "qt/widgets/offroad_alerts.cc"],
Qt cleanup (#2622) * scale * contain weston hack in one file * rest * no show * missed one old-commit-hash: efc30f4a83953363d665290f99b91c7b52652cc2
4 years ago
LIBS=qt_libs)
Qt Offroad stats (#19498) * probably broke a lot, need the commit though * finally works * make it work... * ... * kind of works * better styling * all should work * tiny cleanup * temp * looks nicer * create JWT in C++ * kilometers -> km * use correct free methods * dont put code in assert statement * Build JWT payload dynamically * get dongle id once * include cleanup * Remove qDebug * Update drive_stats.cc Github is a nice editor :) * swap week and all and fix sconscript * install openssl * openssl include dirs on mac * is this where openssl is? * It's here * small cleanup Co-authored-by: Comma Device <device@comma.ai> Co-authored-by: Willem Melching <willem.melching@gmail.com> old-commit-hash: 5b26c97141b65e3bcbddaec7e6526d5f2f1c910e
4 years ago
qt_libs.append(widgets)
Qt cleanup (#2622) * scale * contain weston hack in one file * rest * no show * missed one old-commit-hash: efc30f4a83953363d665290f99b91c7b52652cc2
4 years ago
Qt Offroad stats (#19498) * probably broke a lot, need the commit though * finally works * make it work... * ... * kind of works * better styling * all should work * tiny cleanup * temp * looks nicer * create JWT in C++ * kilometers -> km * use correct free methods * dont put code in assert statement * Build JWT payload dynamically * get dongle id once * include cleanup * Remove qDebug * Update drive_stats.cc Github is a nice editor :) * swap week and all and fix sconscript * install openssl * openssl include dirs on mac * is this where openssl is? * It's here * small cleanup Co-authored-by: Comma Device <device@comma.ai> Co-authored-by: Willem Melching <willem.melching@gmail.com> old-commit-hash: 5b26c97141b65e3bcbddaec7e6526d5f2f1c910e
4 years ago
qt_src = ["qt/ui.cc", "qt/window.cc", "qt/home.cc", "qt/offroad/settings.cc", "qt/offroad/onboarding.cc"] + src
Qt ui for PC (#2023) * qt ui boilerplate * this kinda works * cleanup * render inside other widget * cleanup * more cleanup * Not needed * Handle click * Draw at 20Hz * create paint.hpp * move stuff around * update sidebar * Draw vision * this works again * add clickable settings button * Only collapse sidebar when started * always use qt on linux * fix width * scrollable area * talk to NetworkManager * code to add a connection * params toggles * small cleanup * add qt5 to dockerfile * Qt on mac * Add qt to release files * fix macos build * nore more ifdefs needed * add icons * make a bit nicer * Hide scrollbar Co-authored-by: Comma Device <device@comma.ai> old-commit-hash: e115c514521c7705112bd0cb2e4bf865b536501a
5 years ago
qt_env.Program("_ui", qt_src, LIBS=qt_libs + libs)
Qt text window (#2489) * qt text window * auto size * real text * this is cleaner * fix android build * exit on pc * tici fixes old-commit-hash: 68ba1649b91984c106491cf1894c3f44f21a34df
5 years ago
Qt spinner (#2494) * move android spinner * qt spinner * rotation * nothing by default * spin spin * fix rotate * style * spinner for all * -2 * unused old-commit-hash: 6c86afee16c706a3c8e787d576ead509373e6b55
5 years ago
# spinner and text window
Qt text window (#2489) * qt text window * auto size * real text * this is cleaner * fix android build * exit on pc * tici fixes old-commit-hash: 68ba1649b91984c106491cf1894c3f44f21a34df
5 years ago
qt_env.Program("qt/text", ["qt/text.cc"], LIBS=qt_libs + libs)
Qt spinner (#2494) * move android spinner * qt spinner * rotation * nothing by default * spin spin * fix rotate * style * spinner for all * -2 * unused old-commit-hash: 6c86afee16c706a3c8e787d576ead509373e6b55
5 years ago
qt_env.Program("qt/spinner", ["qt/spinner.cc"], LIBS=qt_libs + libs)
Qt setup + installer (#2511) * getting started * setup screens * cleanupg * url input * installer * setup * installer old-commit-hash: 7b72bbe9f3743a16edf31c44506c7f62a43b081b
5 years ago
Qt system reset (#19502) * qt factory reset * confirmation * better ui old-commit-hash: c4a05ba369a0b8ce5df69727999dd33baf8a0fd0
4 years ago
# build setup, factory resetter, and installer
Qt setup + installer (#2511) * getting started * setup screens * cleanupg * url input * installer * setup * installer old-commit-hash: 7b72bbe9f3743a16edf31c44506c7f62a43b081b
5 years ago
if "BUILD_SETUP" in os.environ:
Qt system reset (#19502) * qt factory reset * confirmation * better ui old-commit-hash: c4a05ba369a0b8ce5df69727999dd33baf8a0fd0
4 years ago
qt_env.Program("qt/setup/reset", ["qt/setup/reset.cc"], LIBS=qt_libs)
qt_env.Program("qt/setup/setup", ["qt/setup/setup.cc"], LIBS=qt_libs + ['curl', 'common'])
setup rest of installers old-commit-hash: c01e2df2c07cd6de484303113c06825ced2b97f3
4 years ago
installers = [
("openpilot", "master"),
("openpilot_test", "master"),
#("dashcam", "dashcam"),
#("dashcam_test", "dashcam"),
]
for name, branch in installers:
flags = qt_env["CXXFLAGS"] + [f"-D{branch}"]
qt_env.Program(f"qt/setup/installer_{name}", ["qt/setup/installer.cc"], LIBS=qt_libs, CXXFLAGS=flags)