Commit Graph

88 Commits

Author SHA1 Message Date
Dean Lee bc232d4346 ui.cc: rename update related functions (#19761)
* rename functions

* Trigger Build
old-commit-hash: 64d224b16c42ae7fb38e2b418304f35e72bef043
2021-01-15 11:14:18 +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 ad696592ec remove read_param from ui_init (#19745)
old-commit-hash: cf2585adf671c5777b8cedcf44d04614e0161845
2021-01-13 09:53:45 -08: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 aac74810a7 ui.cc: cleanup includes (#19704)
old-commit-hash: ccff89386150bd177a7ed6c85a41d2b9ee622068
2021-01-10 21:48:49 -08:00
Dean Lee 4c1919f41e merge utilpp.h into util.h (#19710)
old-commit-hash: 595830135bb79c8b23eb8339ae768ca7b6a822f8
2021-01-10 14:57:32 -08: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
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
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
Dean Lee 0ac1e659da UI:shorten variable name (#19633)
old-commit-hash: 0c4e2fadc82feee5a83ca03f05a6246b544d86ea
2021-01-03 12:25:24 -08:00
Dean Lee f8f6545143 simpilify ui_read_params (#19585)
* simpilify ui_read_params

* apply review
old-commit-hash: e3ffa91d177d5e9ec8c9735a489b582e71a96e74
2020-12-24 03:01:53 -08:00
Dean Lee d731984ad9 don't check dMonitorState's frame if frontview is false (#19584)
old-commit-hash: 81369a65bb68d150197f28b6a132afbccee1e24a
2020-12-23 11:20:18 -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 ce79fefe7b ui: delete the variable do_exit that is no longer used (#19551)
old-commit-hash: ff0d9c074f41eac949aca841b219fc6dd1d547a6
2020-12-20 21:33:44 -08:00
Comma Device 9a18d887dc increase controls alert timeout
old-commit-hash: 717e49019f7e25c091db74cc59d6fb4bdb792c73
2020-12-17 15:22:55 -08:00
Comma Device 80c5bfb44c fix camera malfunction ui timeout
old-commit-hash: 54c6931b5cbf1bc0e064f9a3c45d012ffcfbfdea
2020-12-15 14:16:47 -08:00
Dean Lee b81e9d63ae cleanup camera malfunction alert (#2751)
* cleanup alert

* move ui_draw_vision_alert out of ui_draw_vision
old-commit-hash: 1ee8287705f48015652ef54b50f1b7d6197dd74c
2020-12-15 13:06:22 -08:00
komma zwei 2fd54d6f1b increase startup timeout for camera malfunction
old-commit-hash: 41bc3c558ea2ae676f9b3add8b86e9c2a7c2ae0b
2020-12-11 20:07:27 -08:00
ZwX1616 8ab6ec02ad road camera malfunction alert (#2697)
* camera unresponsive

* blue and remove loge

* simplify

* should override to avoid blank screen

* let it be

* stop sound

Co-authored-by: WXEon <device@comma.ai>
old-commit-hash: 257c5f9d946b1392ce205140b4bb24843968976e
2020-12-09 20:05:47 -08:00
grekiki 2e07e45bed UI style improvements with improved keyboard (#2710)
* fix spaces and make spacebar dynamically sized

* some spaces and a comment

* more spaces

* const

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 3e466aa528dfaf40063c209189bb3c9ece3bf26b
2020-12-08 12:00:51 +01: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
Adeeb Shihadeh 2403db7084 stop sounds after going offroad
old-commit-hash: ffbd5e9f2d2660f6527219e4b4f2dc37aa475919
2020-10-27 14:05:13 -07: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 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
Adeeb Shihadeh be29b8f236 tici light sensor (#2238)
old-commit-hash: 2490be762ddb4c05d3ed8fc9c865138115d24666
2020-09-28 14:49:07 -07:00
Comma Device 934fce64ab wait 5s before showing waiting for controls
old-commit-hash: d6571aa633ba3a4602bcb1cf5f8cbad134e18c10
2020-09-09 13:19:20 -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
Willem Melching fff4680443 Fix camera view on PC
old-commit-hash: 01b30794518ef1e8d8a4315baf5678095f3a8283
2020-08-31 13:16:30 +02: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 3e083c1074 remove duplicate call to getDMonitoringState (#1964)
old-commit-hash: 56e63bafa87995eb6795bd77df931a29bf89c684
2020-08-02 10:55:24 -07: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
Adeeb Shihadeh cdfb090c7a Wunused (#1841)
* enable Wunused, first pass

* unused stuff in snpe model

* these are used on phone

* handle sigint and sigterm in modeld

* fix phone build

* camera qcom

* QCOM build works

* delete unused camerad vars

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: eb1aa3d831fd0d7fffd9aacec1accb0a5bdb0304
2020-07-09 09:25:32 -07:00
Dean Lee 9c33f51990 remove offroadLayout from sm (#1846)
old-commit-hash: 11fbe85c1436c67bf9e42fdc5f7a6f36f9a837a0
2020-07-08 21:24:55 -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 219b117c21 fix hardcoded frequencies in UI
old-commit-hash: 2f16349c4cffe592d9b97a37ded37e8215ed8892
2020-07-03 12:30:47 -07:00
Adeeb Shihadeh d10d3287a3 remove unused UI variables
old-commit-hash: e8259895f7d29b153aa2d5e9c86391f47413a133
2020-06-29 14:12:28 -07:00
Adeeb Shihadeh 3d56b4cc35 better alert when controls takes too long to start
old-commit-hash: f8ce6502a9d66008d3a90b521707c4d1cbc51756
2020-06-23 16:07:10 -07:00
Willem Melching 31e0931cee ui, fix vision_seen when starting with camerad already running
old-commit-hash: 99949cc27db23662bb97747ce911a99829e9cc15
2020-06-23 15:16:55 -07:00
Adeeb Shihadeh ab66589a46 fix engage/disengage sounds
old-commit-hash: 51b7dc0e385945faf0341c52b14555e75e804d04
2020-06-23 10:50:24 -07:00
Adeeb Shihadeh 4c19a49586 Fix some alert sounds not repeating (#1763)
* fix sounds not repeating

* fix PC build

* 3 loop

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: af22b282ff20201914a462488700971cfe32cb20
2020-06-22 19:22:02 -07:00
Adeeb Shihadeh dd3247d128 Alert when controls fails to start (#1750)
* alert when controls fails to start

* more friendly

* fix sound

* remove that

* just else

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 968443c545ab1443fb2aefe0583d414c384182a7
2020-06-19 19:28:56 -07:00