Commit Graph

66 Commits

Author SHA1 Message Date
Willem Melching e8892481ab ui: fix HUD drawing order (#24419) 2022-05-04 12:12:13 +02:00
Willem Melching a3cfa444d3 ui: combine OnroadHud into NvgWindow (#24369)
* ui: combine OnroadHUD and NVGWindow

* draw hud first

* cleanup

* removed commented line

* fix text rendering

* increase cpu usage
2022-04-29 10:55:44 -07:00
Adeeb Shihadeh de56544531 Revert "onroad UI: show negative speed (#23987)"
This reverts commit 62087a6368.
2022-04-25 15:16:06 -07:00
Joost Wooning 43f43b1c64 UI: use YUV stream instead of RGB (#24317)
* UI: use YUV stream instead of RGB

* cleanup

* cleanup
2022-04-25 21:07:08 +02:00
Adeeb Shihadeh 13e1c0b339 Revert "UI: remove RGB buffer usage (#24298)"
This reverts commit b9907e86b2.
2022-04-24 11:56:30 -07:00
Joost Wooning b9907e86b2 UI: remove RGB buffer usage (#24298)
* ui: use yuv buffer

* cleanup

* fix watch3

* replay always send yuv

* fix drawing of path

* fix onroad test

Co-authored-by: Willem Melching <willem.melching@gmail.com>
2022-04-22 12:55:37 -07:00
Shane Smiskol fdeb590ae6 ui: adjust laneless design (#24246)
* tune design

* adjust

* adjust

* fix and compromise!

* fix sl
2022-04-18 13:32:09 -07:00
Shane Smiskol 998cd7fa20 UI: new laneless design (#24169)
* stash

* Revert "stash"

This reverts commit f0019010e28ffb6d70b3c84666572f30c22077c9.

* new laneless ui

* clean up

* always draw lane lines

* no compensation

* make sure it's long enough

* debug time

* tune design

* tune design 2

* correct scaling with new updated curve hue

* debug time

* full test

* revert test

* move yellow back a bit
2022-04-14 20:09:51 -07:00
Adeeb Shihadeh 67e3a2c39a UI: better lag logging (#24042)
* UI: better lag logging

* remove print
2022-03-25 13:52:37 -07:00
Igor Biletskyy 62087a6368 onroad UI: show negative speed (#23987)
* show negative speed

* remove ()
2022-03-17 13:17:33 -07:00
Gijs Koning 57b6fdc17a Rename RGB vision streams to match YUV streams (#23961)
* Renaming VISION_STREAM_RGB_.. to match yuv names like VISION_STREAM_ROAD
VISION_STREAM_RGB_BACK -> VISION_STREAM_RGB_ROAD
VISION_STREAM_RGB_FRONT -> VISION_STREAM_RGB_DRIVER

* little more

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2022-03-14 14:03:54 -07:00
Lee Jong Mun 0b47800e74 ui: white color define (#23930) 2022-03-09 11:24:56 +01:00
royjr 82bc052dc6 UI: remove redundant condition (#23918) 2022-03-07 09:57:32 -08:00
Willem Melching e76ef93a83 ui: fix onroad transition with active nav (#23757) 2022-02-14 13:55:30 +01:00
Willem Melching 4e4cb07297 ui: configure tethering based on prime type (#23733)
* Store prime type in param

* set tethering metric based on prime type

* update existing connections

* returning zero is fine

* always set

* add callback on activate

* call systemctl

* match server enum

* add delay

* assume field is there

* snake case
2022-02-09 20:27:58 +01:00
Dean Lee bca92a95cc ui: fix lead vertex coordinates (#23550) 2022-01-21 15:14:18 -08:00
Dean Lee 5fe809b344 ui: set the bg color of controllerUnresponsivePermanent to blue (#23308)
* fix bg color

* blue
2021-12-27 23:50:24 -08:00
Dean Lee bf4d875c5a OnroadHud: use function loadPixmap (#23292) 2021-12-22 10:10:24 -08:00
Dean Lee 50cce27e34 UI: call map::offroadTransition after creating map (#23283) 2021-12-21 11:06:45 -08:00
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