Commit Graph

129 Commits

Author SHA1 Message Date
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
Adeeb Shihadeh 781accd0b3 fix camera malfunction alert (#19757)
* fix camera alert malfunction

* remove old alert
old-commit-hash: 40830a216b70e4a68c0cb1d3495dde2f8e1eaa8b
2021-01-14 16:03:16 -08:00
Dean Lee 74dc639515 convert glutil.c to gltuil.cc & add class GLShader (#19720)
* c++ glutil

* function getUniformLocation

* rebase master
old-commit-hash: cef469cbed1d835e70e952d06e1fd8b4eabca450
2021-01-12 15:43:34 +01:00
Dean Lee 4b15f8a12d Refactor image texture stuff into class (#19719)
* Refactor image texture stuff into class

* cleanup

* Update selfdrive/common/visionimg.cc

Co-authored-by: Willem Melching <willem.melching@gmail.com>
old-commit-hash: b3107e153cca4aa98b623b80fdd13b8446f76d1c
2021-01-11 15:52:58 +01:00
Dean Lee 38443793da Refactor alert blinking (#19583)
* add function get_alert_alpha()

* continue simplify

* reset alpha to 1.0 if blink_rate is 0

* review

* sine wave

* rebase master

* use time

* use cos
old-commit-hash: de309b156d2e9b9c2b771ccdd84915708f64338a
2021-01-08 12:05:07 -08:00
Dean Lee e8936467f5 refactor ui_draw_driver_view (#19597)
* refactor ui_draw_driver_view

* continue simplify

* fix gap
old-commit-hash: 4231b5b329ee778facc3139ab0f2137d5efca576
2021-01-08 11:30:37 -08:00
Willem Melching 3f950832b9 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
old-commit-hash: fb496c692a9ebdcda15069a8d4eb95734b587d68
2021-01-08 14:54:25 +01:00
ffhspa 4ef1b8910f remove double semicolon in paint.cc (#19684)
old-commit-hash: dd9d8bba89c59164738e840609540ffc951d55e9
2021-01-07 11:15:59 +01:00
Dean Lee af4b8bb307 paint.cc car_space_to_full_frame less paramaters (#19676)
old-commit-hash: 93cd4eae55a788eb7530fe369db65c7fffc5d931
2021-01-06 16:34:29 +01:00
Willem Melching 1cc43f8d7d UI: refactor model related functions (#19657)
Squashed commit of the following:

commit 7d7fb15e4cdd0e47fa38f949f79581dc611db015
Author: Willem Melching <willem.melching@gmail.com>
Date:   Wed Jan 6 11:31:09 2021 +0100

    no extern

commit 901893966e3f908435bceb8777253dfa916a3d91
Merge: 9816e01e c0703a57
Author: Willem Melching <willem.melching@gmail.com>
Date:   Wed Jan 6 11:27:29 2021 +0100

    Merge branch 'master' into refactor_model_draw

commit 9816e01e6ff0284521fa18b07ec15b3900577687
Author: deanlee <deanlee3@gmail.com>
Date:   Wed Jan 6 04:02:08 2021 +0000

    fix lead_d

commit 6fa500dbce26544cc3fdeb4d9b0d2d654382a40b
Author: deanlee <deanlee3@gmail.com>
Date:   Tue Jan 5 13:18:20 2021 +0000

    populate model data in update_socket

commit e25db7e28c1b543a04c3e837aa44431c42dbb5b2
Author: deanlee <deanlee3@gmail.com>
Date:   Tue Jan 5 12:59:13 2021 +0000

    update model in function

commit 0834a3ffe7eaa080671f13c32dd6475ae5392d5b
Author: deanlee <deanlee3@gmail.com>
Date:   Tue Jan 5 12:50:21 2021 +0000

    continue

commit 95b08679c2593eb0770a68b3cf1a59f1fb3b74f4
Author: Willem Melching <willem.melching@gmail.com>
Date:   Tue Jan 5 13:26:34 2021 +0100

    Update selfdrive/ui/paint.cc

commit 0eef065ae4f96c2ee5d97b4ccdfdbf0ae4945385
Author: Dean Lee <deanlee3@gmail.com>
Date:   Tue Jan 5 20:11:01 2021 +0800

    Update selfdrive/ui/paint.cc

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

commit 955ad9b03a176174b86b28d5bb6f48d6e2a09281
Author: deanlee <deanlee3@gmail.com>
Date:   Thu Dec 31 04:45:31 2020 +0000

    refactor model related functions

old-commit-hash: 37cb4bec631197f6b369bf89f94786772bd05336
2021-01-06 11:34:52 +01:00
Willem Melching b56d44bbd2 dont show speed below zero
old-commit-hash: d8e864e33d08c60e9740d7433067382128962f92
2021-01-06 11:25:37 +01:00
Dean Lee ff7d537c96 fix problem with drawing path (#19670)
old-commit-hash: d0ba19fedb897443248ad0f096dc6ffdca983872
2021-01-06 11:19:10 +01:00
Dean Lee 4765ba9478 cleanup draw alert (#19655)
* cleanup

* use Rect

* Revert "use Rect"

This reverts commit 96d04339a0adc7f7f543828ae8ff8101dd9f5f60.

* remove None from static map
old-commit-hash: 20918d82b689c09c33a0fecef102fc91a65b00d5
2021-01-05 13:27:15 +01:00