Commit Graph

69 Commits

Author SHA1 Message Date
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 4fd0fe80f0 UI: rename frontview to driver_view (#20228)
old-commit-hash: 8db3eea6c5e25516445bb8345fe13f0a2b7e6348
2021-03-03 11:38:41 +01:00
Adeeb Shihadeh 70db46e752 Qt on NEOS (#20153)
* qt on neos

* cleanup

* check arch

* fix pc

* fix mac

* base libs

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 1c369a90096fee30116b14eed610f7ecb0514fe1
2021-02-25 01:03:37 -08:00
Adeeb Shihadeh 05eb44115e cereal cleanup part 2 (#20092)
* car stuff

* thermal

* Revert "car stuff"

This reverts commit 77fd1c65ebd01abfa8493ae12c9e6b14f7ada976.

* panda state

* camera stuff

* start deg

* most is building

* builds

* planner + controls run

* fix up paramsd

* cleanup

* process replay passes

* fix webcam build

* camerad

* no more frame

* thermald

* ui

* paramsd

* camera replay

* fix long tests

* fix camerad tests

* maxSteeringAngle

* bump cereal

* more frame

* cereal master
old-commit-hash: 312b681a46b8153314a8420611b6479dd6f70dfc
2021-02-16 21:39:32 -08:00
Adeeb Shihadeh 2950af53b5 use gpsOK flag from locationd
old-commit-hash: b3cf60cd0bf502b11a3fb6c24bd3ae2324198c2e
2021-02-09 19:31:30 -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
Adeeb Shihadeh 9168fa6d93 show sat count in sidebar (#20028)
* show sat count in sidebar

* fix

* revert that

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 54b59783cb3ad0e3d8c3c59bfa723ba41e09352a
2021-02-05 14:15:02 -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
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 7a086b3f3d convert framebuffer to class (#19800)
* class FrameBuffer

* fix build error

* remove bootlog
old-commit-hash: 6583206ed41c9277bb7509bcb66b7d5e058ea5fe
2021-01-28 14:47:05 +01:00
Dean Lee f920e1cd33 ui: remove satelliteCount (#19878)
old-commit-hash: 9efc499ed9a7e72e17cabd76ca95bab57733c596
2021-01-22 15:40:53 +01: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 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
Willem Melching ab5eef3a12 ui.cc: fix driverview (#19723)
old-commit-hash: 92257e4dfff411cd981ef7bad964531813d3f37f
2021-01-11 14:51:21 +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
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
Dean Lee 0ac1e659da UI:shorten variable name (#19633)
old-commit-hash: 0c4e2fadc82feee5a83ca03f05a6246b544d86ea
2021-01-03 12:25:24 -08:00
Adeeb Shihadeh 7dd876805f offroad home style (#19593)
* make drive stats look nicer

* offroad alerts style

* rest of alerts

* move that

* fix up colors

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: ce48d3c91eb66924ca20c0bcbd14a74e88207997
2020-12-25 01:02:47 -08:00
Dean Lee 8fb744e905 UI: add function ui_read_params (#19565)
* ui_read_params

* remove last_athena_ping from UIState

* use s->sm->frame
old-commit-hash: c1cde2d148a809178bf0accf2ed8536c40f2cb02
2020-12-21 18:44:23 -08:00
Dean Lee e89e1a185c small cleanup (#2715)
old-commit-hash: 232cb25683ef59a4cc1ce6a7a98eeb57a78a9968
2020-12-08 14:20:06 +01:00
Adeeb Shihadeh 86dd0f5df1 Qt offroad home screen (#2672)
* some cleanup first

* home sweet home

* basic home screen

* date

* fix touch

* fix mac

* hide when onroad

* box layout didn't do what i thought
old-commit-hash: fed642c4ed2fd668360bef480da8f0b7a8559916
2020-12-02 20:47:47 -08:00
HaraldSchafer 008f37c749 Torch model (#2452)
* refactor draw model

* rebase master

* correct valid_len

* rename function

* rename variables

* white space

* rebase to master

* e16c13ac-927d-455e-ae0a-81b482a2c787

* start rewriting

* save proress

* compiles!

* oops

* many fixes

* seems to work

* fix desires

* finally cleaned

* wrong std for ll

* dont pulse none

* compiles!

* ready to test

* WIP does not compile

* compiles

* various fixes

* does something!

* full 3d

* not needed

* draw up to 100m

* fix segfault

* wrong sign

* fix flicker

* add road edges

* finish v2 packet

* Added pytorch supercombo

* fix rebase

* no more keras

* Hacky solution to the NCHW/NHWC incompatibility between SNPE and our frame data

* dont break dmonitoringd, final model 229e3ce1-7259-412b-85e6-cc646d70f1d8/430

* fix hack

* Revert "fix hack"

This reverts commit 5550fc01a7881d065a5eddbbb42dac55ef7ec36c.

* Removed axis permutation hack

* Folded padding layers into conv layers

* Removed the last pad layer from the dlc

* Revert "Removed the last pad layer from the dlc"

This reverts commit b85f24b9e1d04abf64e85901a7ff49e00d82020a.

* Revert "Folded padding layers into conv layers"

This reverts commit b8d1773e4e76dea481acebbfad6a6235fbb58463.

* vision model: 5034ac8b-5703-4a49-948b-11c064d10880/780  temporal model: 229e3ce1-7259-412b-85e6-cc646d70f1d8/430  with permute + pool opt

* fix ui drawing with clips

* ./compile_torch.py 5034ac8b-5703-4a49-948b-11c064d10880/780 dfcd2375-81d8-49df-95bf-1d2d6ad86010/450 with variable history length

* std::clamp

* not sure how this compiled before

* 2895ace6-a296-47ac-86e6-17ea800a74e5/550

* db090195-8810-42de-ab38-bb835d775d87/601

* 5m is very little

* onnx runner

* add onnxruntime to pipfile

* run in real time without using the whole CPU

* bump cereal;

* add stds

* set road edge opacity based on stddev

* don't access the model packet in paint

* convert mat.h to a c++ header file (#2499)

* update tests

* safety first

Co-authored-by: deanlee <deanlee3@gmail.com>
Co-authored-by: mitchell <mitchell@comma.ai>
Co-authored-by: Comma Device <device@comma.ai>
Co-authored-by: George Hotz <george@comma.ai>
Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 08846b5c0ec3a5299c8cb73904da15a18d3aaccf
2020-11-11 20:31:46 -08:00
Willem Melching 65b397460e UI: get video aspect ratio from camera intrinsics (#2351)
* UI: get video aspect ratio from camera intrinsics

* cleanup video rect definition

* const zoom

* Match zoom level

* Fix comment

* Zoom out more
old-commit-hash: 9d0b89394429e6ee9f8f9c2849dd19b11fb9b0ce
2020-10-20 12:14:19 +02:00
Adeeb Shihadeh 53b2a39a90 tap to wake with accelerometer (#2267)
old-commit-hash: 9e03c2e9293eadd6853382b1b5c7e853ddc808f1
2020-10-18 19:03:41 -07:00
Willem Melching 498ecbdf3c Params refactor, simplified (#2300)
* always c++

* Create C++ params class

* get works

* tests hang now

* passes tests

* cleanup string formatting

* handle interrupt in blocking read

* fix memory leak

* remove unused constructor

* Use delete_db_value directly

* Rename put -> write_db_value

* filename cleanup

* no semicolons in cython

* Update common/SConscript

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

* add std::string version of delete_db_value

* This is handled

* cleanup encoding

* Add clear method to clear all

* add persistent params

* fix android build

* Should be called clear_all

* only import params when needed

* set params path on manager import

* recusrively create directories

* Fix function order

* cleanup mkdirp

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 2e182e5c574ea1468678b5fd8d0597e34ed5898d
2020-10-13 16:23:23 +02:00
Adeeb Shihadeh 51d59aefca UI cleanup + startup time improvement (#2295)
old-commit-hash: 671183184bd177d697285d397bce10c51afd5395
2020-10-08 19:29:56 -07:00
Adeeb Shihadeh f27bdfbee7 UI: refactor light sensor (#2129)
* refactor light thread

* qcom low power mode

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 06cb2f963ddd3a1e25d592ac4d2d25358e69c94a
2020-10-03 20:58:46 -07:00
Dean Lee 2baf5c7356 UI: simplify layout calculation (#2131)
* add Rect struct

* simplify layout calculation by using viz_rect

* fix

* add whitespace

* use the correct value for vwp_w

* correct vwp_w again

* rebase

* dd
old-commit-hash: 8417be6f40a0b1ee92524da7c1bd4e114cd32674
2020-09-12 18:35:36 -07:00
Adeeb Shihadeh 0ae5e7403e 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>
old-commit-hash: acd1bde496904fbc0d97f4d89e630358c4d11f7f
2020-09-09 19:04:28 +02:00
Adeeb Shihadeh 8a5dfc571e Always keep display on with ignition (#2138)
* keep display on with ignition

* fix typo

Co-authored-by: Willem Melching <willem.melching@gmail.com>
old-commit-hash: e386133c4b8bc2c27de2291257d6441d930b00a7
2020-09-07 13:13:10 +02:00
Adeeb Shihadeh c3f623e432 UI vision refactor (#2115)
* refactor vision

* don't show slow frame message when in preview mode

* change draws to uint32_t

* set vision_seen=false after destroy

* remove vision_connect_thread

* refactor ui_update

* seelp 30ms when vision is not connected

* remove should_swap

* call ui_update_sizes before ui_draw

* rebase

* start bigger UI refactor

* don't need the touch fd

* fix qt build

* more cleanup

* more responsive

* more refactor

* fix for pc

* poll for frames

* lower CPU usage

* cleanup

* no more zmq

* undo that

* cleanup speed limit

* fix sidebar severity for athena status

* not aarch64

Co-authored-by: deanlee <deanlee3@gmail.com>
Co-authored-by: Comma Device <device@comma.ai>
Co-authored-by: Willem Melching <willem.melching@gmail.com>
old-commit-hash: 848301b091af11e129ba6873f7d297d4890c562b
2020-09-03 16:32:55 -07:00
Adeeb Shihadeh cb3f689e36 remove read_param_timeout (#2095)
* remove read_param_timeout

* missed that
old-commit-hash: 9cd5180b43e03f84adb870fa25c91428a18394e0
2020-08-27 19:24:51 -07:00
Adeeb Shihadeh d2cdd7706c UI cleanup (#2091)
* remove unused UI code

* these params aren't used anymore

* this is cleaner

* remove one more timeout

* read that from carParams

* only android needs pm

* fix that

* fix that

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 43e3ec1bc1ee0d7b8044c5cabbe4022c5ddc9783
2020-08-27 11:57:31 -07:00
Willem Melching 473fb11d34 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>
old-commit-hash: e115c514521c7705112bd0cb2e4bf865b536501a
2020-08-20 17:16:44 +02:00
Dean Lee ebd4f68cba ui: refactor model related functions (#2026)
* remove read_model

* remove structs for c-capnp

* remove duplicate #define from modeld

* add function fill_path_points

* fix Indentation

* use MODEL_PATH_DISTANCE instead of 192

* fix type

use validLen

* rename left_path_points&right_path_points to xxx_lane_points
old-commit-hash: f8ab6bd009410a9f7ab9c30ce7b72a82c6d2507b
2020-08-18 15:26:43 +02:00
Dean Lee fb8c67ba1f paint.cc: remove redundant calls (#2025)
* remove redundant calls

* set MODEL_LANE_PATH_CNT=2
old-commit-hash: fe43d51686da19063c4ee3ebdb09eadfdd3a56ad
2020-08-17 12:06:09 +02:00
Adeeb Shihadeh 069bd4061e Driver view refactor (#1869)
* quick driver view cleanup

* send at correct freq

* let manager handle that

* don't block starting on driver view

* fix UI hacks

* ui cleanup

* move driver view functionality into dmonitoringd

* dmonitoring thresholds shouldnt be in UI

* remove driver view file from release files

* timeout on frontview

* bump cereal
old-commit-hash: a7ee2a53a8a832f3678171403471380a9a72b9cb
2020-08-01 17:26:35 -07:00
Dean Lee b35f7909ba UI cleanup (#1941)
* remove unused variables

* remove unused variables
old-commit-hash: 2953ae28104c3ccde59a7659c25b853ea0421adc
2020-07-28 11:13:37 -07:00
Dean Lee fa06882a72 better update_offroad_layout_state (#1808)
apply review suggestion
old-commit-hash: 9de015f588352ef1a81be1139733eea0c927f19c
2020-07-03 12:52:43 -07:00
Adeeb Shihadeh ab66589a46 fix engage/disengage sounds
old-commit-hash: 51b7dc0e385945faf0341c52b14555e75e804d04
2020-06-23 10:50:24 -07:00
Dean Lee dffb9800ad Sound refactor (#1589)
* Soud refactor

* remove files from  files_common

* add timeout to set_volumn

* add param volume to init

* done

* test.cc

* fix typo

* add repeat param instead of loop

* revert submodule

* add member function currentSound

* remove function create_player from class member

* fix build error

fix repeat

* rename CHECK_RESULT to ReturnOnError

* set currentSound_ before posible err

* use std::map to initialize sound table

cleanup

cleanup

cleanup

fix bug in stop

change paramater name

* done

* remove function CreatePlayer, create player in init()

* resolve conflict

* remove sound test

* rebase

* remove whitespace

* Apply great review suggestion

* use player's SLVolumeItf interface to set volume

* use float

* leave the volume control the way it is
old-commit-hash: 8cacc14b3180e831ed4fa0782102f973efe8851f
2020-06-15 15:26:38 -07:00
Dean Lee 92b5c00d0e ui.cc: remove variables from UIScene, use event::Reader to get data (#1585)
* use struct to store lead status

* remove white space

* use RadarState::LeadData::Reader

* use reader to get thermal data

* use reader

* continue

* remove variables

reset submodules,fix some errors

reset submodules

revert

* remove s->scene.gps_planner_active

* modify

* cleanup

* done

* resolve conflict

* remove irrelevant comment

* remove white space
old-commit-hash: d720f28ecb35c06a5ffb6004e79d82c80707fcde
2020-06-05 15:33:45 -07:00
Dean Lee b72fcb69e2 driving.cc: Pass ModelDataRaw by reference (#1600)
* pass ModelDataRaw by reference

* pass NVGpaint by refer
old-commit-hash: af36aa28abeb55a4445cbc1ff13ac55993d989d9
2020-05-30 10:08:44 -07:00