Commit Graph

141 Commits

Author SHA1 Message Date
Dean Lee f4d8621be1 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>
old-commit-hash: a034926264cd1025c69d6ceb3fe444965f960b75
2021-09-08 13:13:27 -07:00
Mitchell Goff b7b87efed9 Retuned desire model (#21919)
* New model: d8e7f76f-7bec-4a83-af00-c0fae792527f/950

* Updated process replay refs

* Updated model replay ref
old-commit-hash: 05b37552f3a38f914af41f44ccc7c633ad152a15
2021-08-12 21:06:26 -07:00
HaraldSchafer 331eb5d553 Draw model leads (#21864)
* draw model not radar

* compiles

* wrong way
old-commit-hash: 276b00ccb805b8071db4352b406f39233c2c3867
2021-08-05 20:35:03 -07:00
Dean Lee ae1b7a85f3 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>
old-commit-hash: f0389f7e2d45f7f42e35bdea6a3daff0cd3aa919
2021-07-23 21:45:47 -07:00
Dean Lee cc75e9ba9f UI: remove zoom from struct UIState (#21520)
old-commit-hash: 13b2ce9391ca132a1d4fbeb7e40c32cc1f3264e0
2021-07-08 10:42:34 +02:00
Willem Melching 182b3eb4c7 Fix triangle size (#21332)
old-commit-hash: 9086c377e245bf7ad668b834ef6dfa25a617559f
2021-06-19 11:21:54 +02:00
Dean Lee 147b355dde add space after function name and if statement (#21225)
old-commit-hash: e4e669bb0fc1a919dfb38800099f8e3ad52346f1
2021-06-11 10:17:52 +02:00
Dean Lee f70a79b838 Use C++ header files instead of C header files. (#21192)
* use cstring instead of string.h

* use cstdio instead of stdio.h

* remove inttypes.h

* use cstdlib instead of stdlib.h

* use cstdint instead of stdint.h

* #include <cstddef>

* cstdlib

* use cmath

* remove stddef.h

* use cassert

* use csignal

* use ctime

* use cerror

* rebase master
old-commit-hash: c53cb5d570adb82bc454fcabab458d7e7f09738c
2021-06-08 13:46:22 -07:00
Dean Lee 3a698faadc Use full include path (#21194)
old-commit-hash: b06b3ecb60c651dacf079513635f7d9d99228783
2021-06-08 12:09:30 -07:00
Adeeb Shihadeh 78d65db218 limit icon flickering in UI (#21132)
old-commit-hash: 2ddfd829134effcf9420019a92984a3133a3f20b
2021-06-03 23:06:14 -07:00
Adeeb Shihadeh 56e9dbcf99 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>
old-commit-hash: 9876723169ba0fd0c61169699caaa63246473e85
2021-06-01 20:59:41 -07:00
Willem Melching efa94a89ff 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>
old-commit-hash: 86aefbe7667f0693402c1883d286ce331e9d6215
2021-05-17 14:57:07 +02:00
Dean Lee ebe3a39909 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>
old-commit-hash: 533bc30c2e4ecac5e022f2ba4f3919842dfa0a1a
2021-05-14 22:47:06 -07:00
Dean Lee e333e4f189 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>
old-commit-hash: 7222d0f20dc8edfe0d2f3417d1ce7c84fbd32805
2021-05-08 22:15:17 -07:00
Willem Melching 78bf4f5867 Replace ifdef with hw abstraction layer (#20843)
* Replace ifdefs with hardware abstraction layer (#20801)

* add type to class hadwareXXX

* replace ifdefs with hardware layer

* continue

* continue

* new function get_driver_view_transform

* full path to hw.h

* fix build error setup.cc

* apply review

* fix typo

* fix deprecated error:replace deprecated fromPath with new

* fix build error

* Fixes after ifdef clenaup (#20842)

* inheritance doesnt work with static

* fix debayer

* small cleanup

* Update selfdrive/camerad/cameras/camera_common.cc

* Update selfdrive/ui/qt/offroad/settings.cc

* Update selfdrive/common/modeldata.h

* flip conditions

* fix comment

Co-authored-by: Dean Lee <deanlee3@gmail.com>
old-commit-hash: ab319d4f54a53e1a0aa1c2c0d94d56a9acef8362
2021-05-06 14:39:05 +02:00
Willem Melching 39c18d4c5a Revert "Replace ifdefs with hardware abstraction layer (#20801)"
This reverts commit 9f2ad462f39f4c880f283b71bffbc9248a2b577d.

old-commit-hash: 3a95d3ccaae7168073410cd7d392a9564d9d45ba
2021-05-06 12:29:30 +02:00
Dean Lee e0282ced49 Replace ifdefs with hardware abstraction layer (#20801)
* add type to class hadwareXXX

* replace ifdefs with hardware layer

* continue

* continue

* new function get_driver_view_transform

* full path to hw.h

* fix build error setup.cc

* apply review

* fix typo

* fix deprecated error:replace deprecated fromPath with new

* fix build error
old-commit-hash: 757d2923d2bfcda620b252e21a348ac3f87f3a63
2021-05-06 11:41:46 +02:00
Adeeb Shihadeh 5d82a760db Qt onroad alerts (#20776)
old-commit-hash: f9072199571742f9e349990bb58540401a863f67
2021-05-04 23:23:00 -07:00
Dean Lee 9a827fea20 c++ cleanup: standardize file extensions to .cc and .h (#20800)
* c++ cleanup: standardize file extensions to .cc and .h

* cleanup files_common
old-commit-hash: 81491dc57f5080c602a0be58dd5f9feba2fa31b9
2021-05-03 11:53:11 +02:00
Adeeb Shihadeh 16688e2170 small UI cleanup
old-commit-hash: ebceadf08905a40f7e019c6b680111ec2ee787ef
2021-04-29 15:21:40 -07:00
Adeeb Shihadeh f5e6a0c9a0 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>
old-commit-hash: db9319405b5a650627a45de78a81afaed4ae2128
2021-04-29 15:05:04 -07:00
Adeeb Shihadeh b263a8d934 UI: refactor GLWindow (#20764)
old-commit-hash: 140e6248e26cfa370ccdb13fda8edc4fae0321ca
2021-04-29 11:18:59 -07:00
ZwX1616 6c04391277 C2 dim displays: remap in shader to avoid screen deadzone (#20757)
old-commit-hash: 2c0b0f927fc517f728b6f35feded278e4f8152ce
2021-04-27 17:41:59 -07:00
Adeeb Shihadeh 994e25770f Revert "hide set speed for stock long (#20585)" (#20666)
This reverts commit 6f9453bdf4928410b9c7c19d503003e9da53a1eb.
old-commit-hash: aab822a352ecba400d4fc2fb9bb467751f543b84
2021-04-12 13:34:44 -07:00
Willem Melching 00b19b6351 ecam toggle (#20597)
* use ecam in ui

* needs reboot

* use in modeld

* typo

* effective FL is longer in center

* normalize zoom by focal dist

* read param before init

* make 2x as wide

* review comments

* more explicit

* fix camera offset

Co-authored-by: ZwX1616 <zwx1616@gmail.com>
old-commit-hash: 1fc7bcca43e9ef75d95ae8689e3b1cd8c4f8041e
2021-04-07 19:12:35 +02:00
Adeeb Shihadeh 421e27fabd hide set speed for stock long (#20585)
old-commit-hash: e4d7ee3716bd68d4128ea13796fec5d527293012
2021-04-05 13:46:26 -07:00
Dean Lee 808e187f42 refactor draw_circle_image (#20473)
old-commit-hash: a93f787cef6e6d8e57b1d78433f9810f142a176c
2021-03-30 13:32:07 +02:00
Dean Lee 8c09067b27 faster driverview start (#20507)
old-commit-hash: 32c4cf00c2d6bac059516cc44494808cf5a408ca
2021-03-30 11:51:18 +02:00
Adeeb Shihadeh 30f036680b Qt touchups (#20465)
* reduce minimum size

* clean that up

* consistent

* feels pretty good

* cleanup

* less laggy toggle

* openpilot

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 7f56991b41c40a765125635919a91bca55815bd6
2021-03-24 21:18:12 -07:00
HaraldSchafer eae1fa481c New KL model + laneless toggle (#20454)
* New model: 0bf38240-6b55-42b0-bcfb-da08ff5cd0b9/650

* laneless baby

* hardcode model difference for now

* kale toggle

* kale emoji

* sensible description

* make clear it is not just for ui

* emojis dont work yet

* 9671a8fe-539f-4a04-a163-54571df21139/650

* new model

* only read param on rising edge of ignition

* update toggle text

* fix that

* update refs

Co-authored-by: mitchell <mitchellgoffpc@gmail.com>
Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 7ee79c99236f749d02a6779b006ee1ab187e0612
2021-03-24 01:10:31 -07:00
Dean Lee 7c6b409b1d cleanup ui_draw_vision_event (#20386)
old-commit-hash: 00dcc94ae650629dd82a0e63ba71d7dbc6d8f23b
2021-03-21 20:27:16 -07:00
Dean Lee 1b4a583e89 paint.cc: fix indentation & code style (#20302)
old-commit-hash: 4e9e751ba5c070bd55ab7f421b8d8b00033d429a
2021-03-10 20:52:01 -08:00
Dean Lee 0818f7166d UI: Move the variables need to be updated by socket to UIScene (#19783)
* move variables into UIScene

* rebase master

* rebase master

* rebase master

* rebase master

* rebase master

* rebase master

* fix build error

* cleanup

Co-authored-by: Willem Melching <willem.melching@gmail.com>
old-commit-hash: dd603a89f642ea73d2c9b0def94d228adf9d52df
2021-03-03 17:40:50 +01:00
Dean Lee 2c8696ddac move function calib_frame_to_full_frame to ui.cc (#20230)
* move calib_frame_to_full_frame to ui.cc

* cleaup includes
old-commit-hash: a1b2bdb844432b7cf59de412c57e9ee7f27fa650
2021-03-03 13:10:17 +01:00
Dean Lee 5e19cdb0d3 move intrinsic_matrix into modeldata.h, removed duplicate definitions. (#20051)
* move intrinsic_matrix into modeldata.h

* def __cplusplus
old-commit-hash: ae72d34a42f23e9b295641e1b0f50515434d6d1f
2021-03-03 11:47:48 +01:00
Dean Lee 4fd0fe80f0 UI: rename frontview to driver_view (#20228)
old-commit-hash: 8db3eea6c5e25516445bb8345fe13f0a2b7e6348
2021-03-03 11:38:41 +01:00
ZwX1616 f8966cecae tici driverview support (#20223)
* add tici support and clean up

* not exactly 4/3

* keep c2 style

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 2a9e775bb9ab39b8042edae03591f32acfbb7345
2021-03-02 19:42:45 -08:00
HaraldSchafer 8bb63abe4f 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>
old-commit-hash: ab0456c0eb41090fd9292d8643975e93983ae85e
2021-02-09 17:23:46 -08:00
Dean Lee 99f19b5da6 UI: remove struct track_vertices_data (#20018)
* remove struct track_vertices_data

* space

* rebase master
old-commit-hash: c2aefab55349df15613675acec6b68c8377245f5
2021-02-08 12:06:14 +01:00
Dean Lee 766302fabe removed margin paramater from car_space_to_full_frame (#20017)
old-commit-hash: 40919a6f484042fc486c5da7d30b2fcc1d778e60
2021-02-07 18:00:56 -08:00
Dean Lee dc406c1b16 move global SET_SPEED_NA to function that uses it (#20026)
old-commit-hash: a7fe4560a64ce00741f53f9bb5a0de5467b095c8
2021-02-05 12:12:33 -08:00
Adeeb Shihadeh 966945880b Cereal cleanup (#20003)
* start cleanup

* fan speed

* cleanup dm

* fix cereal

* hwType -> pandaType

* update refs

* update refs

* bump cereal

* freeSpacePercent

* cereal master
old-commit-hash: 000bd226aa9902da01e6010bf26762fca2c20df0
2021-02-03 19:57:30 -08:00
Dean Lee 58cf6b8a80 UI: mv sidebar_collapsed&viz_rect to struct UIState (#19782)
* mv sidebar_collapsed&viz_rect to struct UIState

* rebase master

* rebase master

* rebase master

* revert that

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: c22d6e315d532bd802fd8dcf62105a1fee35afa6
2021-02-01 16:10:15 -08:00
Comma Device a2f322de6e match driverView with new model
old-commit-hash: 75d0802804500e3f7c785baff14cd6f4caabbd8a
2021-01-28 13:44:12 -08:00
Dean Lee 34952f246e draw lead indicator in 3D (#19793)
* lead indicator in 3D

* more

* Update selfdrive/ui/ui.cc

Co-authored-by: Willem Melching <willem.melching@gmail.com>

Co-authored-by: Willem Melching <willem.melching@gmail.com>
old-commit-hash: 6bd9e5ca6a67c73be68bbfd38a370f615ce6239a
2021-01-28 15:53:24 +01:00
Dean Lee 32dfaa9b2a UI: cleanup draw_alerts condition (#19875)
old-commit-hash: 8b4731ffc89dbaf06964620f3b8623e24b920f55
2021-01-22 12:16:45 -08:00
ZwX1616 d0726d1f7d face icon reflects DM policy (#19842)
* send that

* draw icon based on whether active

* Update selfdrive/monitoring/dmonitoringd.py

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 88430f12f426ada4691de93e0193ab1873df4eb4
2021-01-19 15:11:15 -08:00
Dean Lee f0fce01b85 use std::map for images (#19768)
* use std::map for fonts&images

* rebase master

* use std::string

* remove cmp_str

* Update selfdrive/ui/paint.cc

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 1796f63211abfde48164bfebfcc99d35d8288e6d
2021-01-16 13:50:06 -08:00
Dean Lee 3c9142a709 UI: refactor transform (#19658)
* refactor transform

* always draw chevron if there is a lead

* remove nvgSave&nvgRestore

* keep one point outside the screen

* zoom chevron

* more size

* still use margin

* still use margin
old-commit-hash: cc2d62a938349c2caea68510434f25aa368414d4
2021-01-15 11:41:20 +01:00
Dean Lee a6e3036aea Use Rect as the parameter of draw_rect (#19696)
* Use rect as the parameter of draw_rect

* add function ui_fill_rect

* simplify

* rebase master

* apply review
old-commit-hash: fcfba42c59126281204e1bd5bbd27d8164eca2e4
2021-01-15 11:15:48 +01:00