spacecruft
/
nopenpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
nopenpilot/selfdrive/ui/SConscript

60 lines
2.4 KiB
Python
Raw Normal View History

Qt setup + installer (#2511) * getting started * setup screens * cleanupg * url input * installer * setup * installer
2020-11-12 12:31:02 -07:00
import os
fixup ui (#20049) * fixup ui * works * new formate * more cleanup * works I assume we need a library somehow * more readable * fix lead sign * put on road * transformations lib Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2021-02-09 18:23:46 -07:00
Import('env', 'qt_env', 'arch', 'common', 'messaging', 'gpucommon', 'visionipc',
'cereal', 'transformations')
build Qt UI with clazy (#19537) * clazy, level0 * level1
2020-12-18 20:26:59 -07:00
selfdrive/ui
2020-01-17 12:05:23 -07:00
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
2020-03-09 20:13:32 -06:00
src = ['ui.cc', 'paint.cc', 'sidebar.cc', '#phonelibs/nanovg/nanovg.c']
fixup ui (#20049) * fixup ui * works * new formate * more cleanup * works I assume we need a library somehow * more readable * fix lead sign * put on road * transformations lib Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2021-02-09 18:23:46 -07:00
libs = [gpucommon, common, 'zmq', 'capnp', 'kj', 'm', 'OpenCL', cereal, messaging, visionipc, transformations]
selfdrive/ui
2020-01-17 12:05:23 -07:00
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>
2020-08-20 09:16:44 -06:00
if qt_env is None:
Qt offroad (#2451)
2020-10-30 18:03:51 -06:00
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
2020-02-02 00:36:50 -07:00
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>
2020-08-20 09:16:44 -06:00
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>
2020-09-09 11:04:28 -06:00
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>
2020-08-20 09:16:44 -06:00
env.Program('_ui', src,
LINKFLAGS=linkflags,
LIBS=libs)
selfdrive/ui
2020-01-17 12:05:23 -07:00
else:
build nui with scons (#19561) * it builds * cleanup * remove that
2020-12-20 20:39:59 -07:00
qt_libs = qt_env["LIBS"] + libs + ["pthread", "ssl", "crypto"]
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
2020-11-27 09:55:07 -07:00
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>
2020-12-18 05:29:20 -07:00
widgets = qt_env.Library("qt_widgets",
Qt UI refactoring + improvements (#20033)
2021-02-07 18:33:48 -07:00
["qt/qt_sound.cc", "qt/widgets/keyboard.cc", "qt/widgets/input_field.cc", "qt/widgets/drive_stats.cc", "qt/widgets/ssh_keys.cc",
Add Github SSH keys (#19879)
2021-01-27 04:07:17 -07:00
"qt/offroad/networking.cc", "qt/offroad/wifiManager.cc", "qt/widgets/toggle.cc", "qt/widgets/offroad_alerts.cc", "qt/widgets/setup.cc"],
Qt cleanup (#2622) * scale * contain weston hack in one file * rest * no show * missed one
2020-11-24 23:07:03 -07:00
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>
2020-12-18 05:29:20 -07:00
qt_libs.append(widgets)
Qt cleanup (#2622) * scale * contain weston hack in one file * rest * no show * missed one
2020-11-24 23:07:03 -07:00
Qt offroad: pairing (#19675) * kind of works now * QR code is now on screen * testing is needed * works, waiting for server update * reduce diff * refactoring part1 * refactor part2 * refactor part3 * works on PC * fix build, annoying bug though... * git is annoying * more classes, still crashes after a while * better style * clearer qr code * less code and test new ssh key * no more AA * rename and collect garbage * no pairing widget without the internet connection * No network connection * more logs * refactor the network calls * no more leaking * works * cleanup * spaces * works on device * fix merge * don't run if screen is off * always initialized * stats updating, not running without scrren * formatting * nicer QR code * ensure the registration * no qr code if no IMEI or no HWSerial * all works * refactor * better networking * all functionality seems to work * small cleanup * get serial once * Small cleanup * No internet text * Don't crash if private key not found * no network should say so * new qr code every 30 minutes * 20FPS sidebar * more responsive networking and QR * more logs * no log spam * fix merge * no running onroad Co-authored-by: Comma Device <device@comma.ai> Co-authored-by: Willem Melching <willem.melching@gmail.com>
2021-01-18 04:07:55 -07:00
VisionIPC 2.0 (#19641) * Squashed vipc * Update release files * Remove else * add visionipc to release files * use poller in vipc receive * opencl framework instead of lib on macos * Fix camera webcam * Fix opencl on mac in ui * more webcam fixes * typo in ui sconsfile * Use cur_yuv_buf * visionbuf c++ class * Camera qcom was still using visionbuf_allocate * Turn loggerd back on * fix snapshot * No build needed * update test camerad * no more release callback * make encoder c++ * Revert "no more release callback" This reverts commit e5707b07002fee665d0483d90713154efc2d70d4. * fix exit handlers * No need to check errno * move release callback call * s/VIPCBufExtra/VisionIpcBufExtra/g * use non blocking connect * ui use non blocking connect * Lower condition variable wait time * Snapshot cleanup * bump cereal * bump cereal
2021-01-08 06:54:25 -07:00
if arch == "Darwin":
# fix OpenCL
del qt_libs[qt_libs.index('OpenCL')]
qt_env['FRAMEWORKS'] += ['OpenCL']
move Qr code lib to phonelibs (#19871)
2021-01-21 12:17:21 -07:00
qt_src = ["qt/ui.cc", "qt/window.cc", "qt/home.cc", "qt/api.cc", "qt/offroad/settings.cc", "qt/offroad/onboarding.cc", "#phonelibs/qrcode/QrCode.cc"] + src
build nui with scons (#19561) * it builds * cleanup * remove that
2020-12-20 20:39:59 -07:00
qt_env.Program("_ui", qt_src, LIBS=qt_libs)
Qt text window (#2489) * qt text window * auto size * real text * this is cleaner * fix android build * exit on pc * tici fixes
2020-11-06 13:05:24 -07:00
Qt spinner (#2494) * move android spinner * qt spinner * rotation * nothing by default * spin spin * fix rotate * style * spinner for all * -2 * unused
2020-11-06 19:44:04 -07:00
# spinner and text window
build nui with scons (#19561) * it builds * cleanup * remove that
2020-12-20 20:39:59 -07:00
qt_env.Program("qt/text", ["qt/text.cc"], LIBS=qt_libs)
qt_env.Program("qt/spinner", ["qt/spinner.cc"], LIBS=qt_libs)
Qt setup + installer (#2511) * getting started * setup screens * cleanupg * url input * installer * setup * installer
2020-11-12 12:31:02 -07:00
Qt system reset (#19502) * qt factory reset * confirmation * better ui
2020-12-14 20:49:01 -07:00
# build setup, factory resetter, and installer
Qt setup + installer (#2511) * getting started * setup screens * cleanupg * url input * installer * setup * installer
2020-11-12 12:31:02 -07:00
if "BUILD_SETUP" in os.environ:
Qt system reset (#19502) * qt factory reset * confirmation * better ui
2020-12-14 20:49:01 -07:00
qt_env.Program("qt/setup/reset", ["qt/setup/reset.cc"], LIBS=qt_libs)
qt; fix setup build
2021-02-15 08:41:26 -07:00
qt_env.Program("qt/setup/setup", ["qt/setup/setup.cc"], LIBS=qt_libs + ['curl', 'common', 'json11'])
setup rest of installers
2020-12-01 12:36:18 -07:00
installers = [
("openpilot", "master"),
Qt UI refactoring + improvements (#20033)
2021-02-07 18:33:48 -07:00
#("openpilot_test", "release3-staging"),
#("openpilot_internal", "master"),
#("dashcam", "dashcam3-staging"),
#("dashcam_test", "dashcam3-staging"),
setup rest of installers
2020-12-01 12:36:18 -07:00
]
for name, branch in installers:
Qt UI refactoring + improvements (#20033)
2021-02-07 18:33:48 -07:00
d = {'BRANCH': f"'\"{branch}\"'"}
if "internal" in name:
import requests
r = requests.get("https://github.com/commaci2.keys")
r.raise_for_status()
d['SSH_KEYS'] = f'\\"{r.text.strip()}\\"'
qt_env.Program(f"qt/setup/installer_{name}", ["qt/setup/installer.cc"], LIBS=qt_libs, CPPDEFINES=d)