Commit Graph

47 Commits

Author SHA1 Message Date
Dean Lee e4de82f906 ui: remove variable world_objects_visible, use rcv_frame (#23264) 2021-12-17 21:37:29 -08:00
Dean Lee 2483fc5d5d ui: singleton uistate (#22789)
* singleton uistate

* merge master

* merge master

* merge master

* connect uistate in sidebar

* move to device
2021-12-14 22:28:12 -08:00
Comma Device 20dc4df024 fix UI build on comma two 2021-12-06 14:34:20 -08:00
Dean Lee 20f571db3c UI: move rest of NVG to Qt (#23133)
* move ui_draw_world to qt

* draw world if world_objects_visible is true

* cleanup

* cleanup includes

* continue

* cleanup

* cleanup

* enable  multisampling on all devices
2021-12-06 14:02:39 -08:00
Dean Lee 8545901c0c UI: draw header gradient in OnroadHud (#23137) 2021-12-05 21:06:47 -08:00
Dean Lee 5ab6bff670 OnroadHud: update engageability and DM icons at 2Hz (#23134) 2021-12-05 12:54:35 -08:00
Dean Lee ad09507e1b UI: move onroad hud to Qt (#23040)
* onroad hud

* improve boudingrect, same as nanvg

* QRect

* Update selfdrive/ui/paint.cc

* stacked with nvgWindow

* cleanup ui.h

* rename to road_view_layout

* no lambda

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2021-12-04 23:02:10 -08:00
Willem Melching 5069852573 navd: render map into VisionIPC (#22800)
* navd: render simple map

* render route

* offscreen rendering

* cleanup

* more cleanup

* render into visionIPC

* rename class

* split position update from route update

* stop broadcast if not active

* gate vipc server behind flag

* add python library

* faster

* no vipc from python

* put behind extras

* only send when loaded

* add glFlush just to be sure

* cleanup settings into helper function

* function ordering

* broadcast thumbnails

* put behind param

* adjust zoom level

* add route to python bindings

* revert that freq change

* add logging if map rendering is enabled

* use rlogs if available

* bump cereal
2021-11-26 14:38:02 +01:00
Adeeb Shihadeh 0e35db7c05 UI: fix wrong background on controls unresponsive alert 2021-11-16 13:17:32 -08:00
Dean Lee 9062085043 ui: update params on the show event (#22927) 2021-11-16 12:13:16 -08:00
Adeeb Shihadeh 2f90f04f8d UI: fix alert flicker when controlsState not updated (#22921) 2021-11-15 16:27:19 -08:00
Dean Lee 797bb1acb0 soundd: misc cleanup + tests (#22796)
* pass AudibleAlert to setAlert

* apply reviews

* remove trailing underscore

* add current_alert_type

* common function get_alert

* same freq as ui

* small cleanup

* setvolumne on change

* static Alert::get

* test_sounds

* remove old test files

* loop twice

* assert loopsRemaining

* assert stop

* init to min_volumne

* Revert "remove old test files"

This reverts commit 12e8bfefae1ae7f8649d3eda1e4126ff8eb1fe17.

* move to ui/soundd

* move test to tests/test_sound.cc

* remove old tests

* cleanup

* lower volume

* Revert "remove old tests"

This reverts commit e6bb12abfa3d5cd0aa8986d2b8da0b1edc7ea31b.

* return Alert

* cleanup

* remove #include <optional>

* cleanup .gitignore

* revert to std::optional

* Revert "revert to std::optional"

This reverts commit a66291c51f3a846652837cc4a43d5d60dd81896b.

* cleanup

* remove volume check

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2021-11-09 14:18:29 -08:00
Willem Melching bef686f275 Move navigation into separate daemon (#22767)
* Add navd folder

* prints route instructions to console

* broadcast NavInstuction without lanes

* show basic instructions and eta

* parse out lane info

* use swaglog

* clip distance on ui side

* draw lane directions

* show route

* add to process config

* add to release files

* small cleanup

* show route without gps

* pop open map on initial route

* fix error messages around no gps

* done

* make persistent process

* handle end of route

* clear route on offroad

* only one timer

* fix layout hacks

* explicit rendering at 20Hz
2021-11-04 14:32:32 +01:00
Willem Melching 0ba40954b9 maps: allow using MAPBOX_TOKEN env variable (#22721) 2021-10-28 16:13:44 +02:00
Willem Melching cca07c0c73 navigation: use mapbox proxy server (#22660)
* use mapbox proxy

* remove MapboxToken param

* do not log jwt

* remove import

* move to staging url

* put has_prime in ui state

* logic was flipped

* Update selfdrive/ui/qt/maps/map.h
2021-10-26 18:59:17 +02:00
Adeeb Shihadeh c4de1fef4f UI: don't block UI on vipc recv (#22644)
* UI: don't block UI on vipc recv

* use a timer

* move that
2021-10-22 14:16:14 -07:00
Dean Lee a034926264 Qt/onroad: use CameraViewWidget (#21821)
* use CameraViewWidget

* no timer, updateFrame after frameSwapped

* use QOpenGLShaderProgram

* merge master

* remove that

* new function setStreamType

* continue

* remove showEvent

* cleanup

* cleanup

* little more

* fix black screen on startup

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2021-09-08 13:13:27 -07:00
Dean Lee 579fb8072a HomeWindow: cleanup mousePressEvent (#21683)
* cleanup mousePressEvent

* show/hide map in onroad

* merge master
2021-09-01 13:30:33 -07:00
Comma Device 175d53e460 fix fullscreen map on startup 2021-07-29 22:41:41 -07:00
Dean Lee f0389f7e2d Qt: draw border in OnroadWindow (#21594)
* draw border in OnroadAlerts

* non transparent

* no scissor

* set video_rect to the full size

* fix header gradient

* Revert "fix header gradient"

This reverts commit f5565c19d5cabda22fe6b60af23dc26727ecd5bc.

* Revert "set video_rect to the full size"

This reverts commit c012db105a8cabd140971208431d83ae3592b70e.

* fix scissor

* fix header gradient

* set scissor box to video_rect when draw lines

* move up eta

* init alert_size to NONE

* remove glScissor

* cleanup

* rename draw_video_frame to draw_vision_frame

* remove space

* add comment

* move border to OnroadWindow

* cleanup signals

* fw declare MapWindow

* fix build err

* remove viz_rect

* fix build err

* continue

* cleanup

* text rect:no border

* use signals

* remove space

cleanup

* merge master

* fix map eta

* get bgColor from alerts

* update alerts in OnroadWindow

* add function clearAlert

* repaint border

* init bg color to STATUS_DISENGAGED

* no black frame

* cleanup

Co-authored-by: Willem Melching <willem.melching@gmail.com>
Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2021-07-23 21:45:47 -07:00
Adeeb Shihadeh ced26b806f wait longer to show controls waiting alert (#21657) 2021-07-20 11:15:27 -07:00
Adeeb Shihadeh 12948e661a soundd (#21619)
* refactor alerts

* doesn't go here anymore

* soudd

* handle controls unresponsive

* same check

* fix path

* update sound test

* nice

* fix c2

* add script

* update tests

Co-authored-by: Comma Device <device@comma.ai>
2021-07-16 17:30:00 -07:00
Willem Melching 54b6a9f121 Qt logging through cloudlog (#21452)
* Qt logging through cloudlog

* sort imports

* rename to swaLogMessageHandler

* move to util

* info is high enough

* smaller diff
2021-07-02 14:01:59 +02:00
Dean Lee 6816b6d8f8 onroad: remove sound_map from OnroadAlert (#21258)
* remove sound_map from OnroadAlert

* fix indentation

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2021-06-14 14:52:14 -07:00
Dean Lee d07b45f50a OnroadAlerts: construct QPainter only when needed (#21260) 2021-06-14 17:42:59 +02:00
Dean Lee 8f5c7e7bb5 UI widgets: remove unnecessary setLayout (#21232)
* remove setlayout

* remove setLayout

* space

* Update selfdrive/ui/qt/maps/map.cc

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2021-06-12 21:28:17 -07:00
ShaneSmiskol ae77f693a2 Fixup joystick (#21129)
* some common changes

* rename to joystick

* add alert and update controlsd to work with joystick

* update joystickd

* Update Joystick readme

* assume we have inputs

* only send gb or steer when engaged_toggle is true

* Update instructions

* fix --ip

* Easier to understand at a glance

* much better

* -a

* receive events and send msg in same loop

* always import

* Update selfdrive/controls/lib/events.py

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

* Update selfdrive/controls/lib/events.py

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

* combine logic and clean up

* use argparse

* outdated, and use normal class

* rm

* bit of a refactor

* refactor part 2 / 3

* much better (3 / 3)

* Simplify

* bump cereal and update readme

* capitalize

* Update tools/joystick/joystickd.py

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

* Update tools/joystick/joystickd.py

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

* make joystick abstraction class clearer

* use interp, clearer without comments

* no need to use apply_deadzone

* more explicit

* define btns and axes once

* split function by use_keyboard again, but simpler

* we can use handle_button as a reset function

* need to flip sign

* remove

* invert axes map for kb, easier to read the button mapping

* apply changes from review

* new lateral log for debug mode

* bump

* add saturated

* static alert

* joystick_mode

* conditionally subscribe

* Update selfdrive/controls/controlsd.py

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

* move params instantiation

* Spoof active and enabled

* Only allow car to engage

* no startup alert if joystick

* Update controlsd.py

* Should be orange not enabled, green enabled

* no more button states

* should work

* blue

* submaster conflates, so only send when we have an update

* final change

* remove msg

* clean up a bit

sort of clean up

clean up a bit

remove msg

* this was right

* Apply suggestions from code review

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

* lowercase

* suggestions from code review

* forgot laptop

* bump to latest

* fixes

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Co-authored-by: vanillagorillaa <31773928+vanillagorillaa@users.noreply.github.com>
2021-06-11 14:33:17 -07:00
Dean Lee e4e669bb0f add space after function name and if statement (#21225) 2021-06-11 10:17:52 +02:00
Willem Melching a361441fe2 alerts: fix gradient 2021-06-09 15:06:29 +02:00
Willem Melching 6cfc7d5af1 nav: only use cache on device 2021-06-09 12:37:14 +02:00
Willem Melching ace39431eb alerts: fix alpha blending 2021-06-09 12:17:48 +02:00
Willem Melching 21be443499 Fetch mapbox token from API (#21136)
* delay widget creation until going onroad

* let athena fetch mapbox token

* only tici

* add token

* cleaner

* rename slots

* that was missing
2021-06-07 12:14:08 +02:00
Adeeb Shihadeh 9876723169 Qt driverview (#21063)
* CameraViewWidget

* continue

* cleanup

* mv DriverViewWindow to ui/qt/offroad

* write IsDriverViewEnabled in showEvent/hideEvnet

* sm.update(0) in onTimeout()

* CameraViewWidget

* use unique_ptr for vipc_client

* virtual draw

* fix viewport

* connected()->frameReceived()

* bg_colors use QColor

* fix draw

* rebase master

* whitespace

* apply reviews

* indent

* like onroad

continue

* white space

* continue

* show == false

* remove border

* use widget's size

* fix shadowed rect

* cleanup driverview

* fix transform

* remove video_rect

Co-authored-by: deanlee <deanlee3@gmail.com>
Co-authored-by: Comma Device <device@comma.ai>
2021-06-01 20:59:41 -07:00
Willem Melching 80ffbe9136 maps: fix pan and zoom 2021-05-21 17:06:01 +02:00
Willem Melching f9b20095a2 strip whitespace from token 2021-05-18 12:14:16 +02:00
Willem Melching 86aefbe766 Mapbox widget (#20751)
* squash mapbox stuff

* only hacks for pc

* no hack there

* only update when needed

* get destination from param

* no need for user agent

* add athena method

* change nav path color

* layout cleanups

* margin top

* add build scripts

* rename header file

* set pitch

* fix icon blinking

* keep both options

* draw on top to fix last blinking

* only recomput with gps

* fix include

* put map in onroadwidget

* update mapbox plugin to allow specifying directions url

* cycle through views

* dynamic resize

* only when present

* add map_helpers

* whitespace

* small fixes

* let scons decide

* update setup files

* implicit dependency

* fix alerts

* Update selfdrive/ui/SConscript

* move clearLayout to util.h

* only build when map.cc present

* move maps to own folder

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2021-05-17 14:57:07 +02:00
Dean Lee 533bc30c2e UI: remove duplicate capnp readers (#20855)
* refactor submaster

* rebase master

* CAPNP best pratice

* zero initialize

* vwp_w has not been initialized before UIState()

* no static

* rebase master

* Minimize refactoring

* cleanup

* remove gpsOk

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2021-05-14 22:47:06 -07:00
Adeeb Shihadeh ff16145f4d fix reverse gear alert text cutoff (#20888)
* fix reverse gear alert text cutoff

* offset removed
2021-05-12 18:18:06 -07:00
Adeeb Shihadeh 5f5bbd64f2 onroad UI optimizations (#20871)
* onroad UI optimizations

* remove that

Co-authored-by: Comma Device <device@comma.ai>
2021-05-10 23:19:32 -07:00
Adeeb Shihadeh 38741b2e08 remove offset from full screen onroad alerts 2021-05-10 22:39:28 -07:00
Adeeb Shihadeh e06f9828ea match nvg onroad alerts (#20854) 2021-05-10 22:09:36 -07:00
Dean Lee 7222d0f20d Cleanup selfdrive/ includes (#20822)
* cleanup include path

* continue

* format includes

* fix testraw.cc

* remove include path from SConstruct

* regroup

* rebase master

* almost done

* apply review

* rename FileReader.xx to filereader.xx

* rename Unlogger.x->unlogger.x

* rename FrameReader.xx -> framereader.xx

* apply reviews

* ui.h

* continue

* fix framebuffer.cc build error:mv util.h up

* full path to msm_media_info

* fix qcom2 camerad

Co-authored-by: Comma Device <device@comma.ai>
2021-05-08 22:15:17 -07:00
Adeeb Shihadeh f907219957 Qt onroad alerts (#20776) 2021-05-04 23:23:00 -07:00
Dean Lee 81491dc57f c++ cleanup: standardize file extensions to .cc and .h (#20800)
* c++ cleanup: standardize file extensions to .cc and .h

* cleanup files_common
2021-05-03 11:53:11 +02:00
Adeeb Shihadeh ebceadf089 small UI cleanup 2021-04-29 15:21:40 -07:00
Adeeb Shihadeh db9319405b Qt Sidebar (#20775)
* revive #19877

* looks like a sidebar

* more like a sidebar

* cleanup

* fix qcom2

* style

* that's the sidebar

* more space

Co-authored-by: Comma Device <device@comma.ai>
2021-04-29 15:05:04 -07:00
Adeeb Shihadeh 140e6248e2 UI: refactor GLWindow (#20764) 2021-04-29 11:18:59 -07:00