Commit Graph

32 Commits

Author SHA1 Message Date
George Hotz 344a9a3699 Fixups for Mac, and a bunch for PC (#1654)
* fix mac nui

* fix cereal

* builds on mac without warnings

* ui swap shouldn't be instant on pc

* camerad builds on mac

* modeld, and now everything, builds on mac

* ui draws pictures on mac now

* fix camerad shutdown

* support ui looping on pc

* python3 on that

* SCNu64 should be cross platform

* bump cereal and new apk

* clean up

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2020-06-11 18:21:59 -07:00
ZwX1616 681ef81ed8 fix dtype (#1676) 2020-06-10 15:15:51 -07:00
George Hotz 7770041f92 Getting PC openpilot working again (#1650)
* fixup keras_runner to work and be nicer

* truncate the lane lines based on the valid len
2020-06-05 17:40:56 -07:00
Dean Lee d720f28ecb 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
2020-06-05 15:33:45 -07:00
Dean Lee af36aa28ab driving.cc: Pass ModelDataRaw by reference (#1600)
* pass ModelDataRaw by reference

* pass NVGpaint by refer
2020-05-30 10:08:44 -07:00
Dean Lee 108a13ead8 UI: better read_model (#1586)
* update model struct inplace

* refer params

* pass path by refer
2020-05-28 15:10:49 -07:00
Willem Melching 50f3f1d335 -Werror (#1567)
* werror

* -Wno-inconsistent-missing-override

* Silence ffmpeg deprecation warnings

* add some more pragmas to ignore warnings

Co-authored-by: Comma Device <device@comma.ai>
2020-05-26 13:27:01 -07:00
Willem Melching 2ae2c40b29 Fix steering wheel icon showing (#1497)
* this should fix steering wheel icon showing

* fix syntax
2020-05-12 18:17:04 -07:00
Dean Lee ee725534bb UI: move c-capnp to c++ (#1455)
* ui:move c-capnp to c++

* move Subsockets into vector

* rename reader to msg

include cereal/gen/cpp/log.capnp

* fix some errors

restore some changes

restore previous

* cleanup codes

cleanup codes

* remove unused variable alert_size

* handle capnproto's enum in a robust way

add break to default

* switch -> std:map

* use static std::map instead of switch

do cleanup

* fix wrong variable name

* use FlatArrayMessageReader instead of custom MessageReader

remove messagehelp.h

Revert "use FlatArrayMessageReader instead of custom MessageReader"

This reverts commit 57d8b6b1e2b4bad908246f35eb068535b1627167.

use FlatArrayMessageReader instead of custom MessageReader

add header file

remove capnp_c lib,add kj lib

include serialize.h

fix

remove duplicate includes
2020-05-06 08:38:26 -07:00
Dean Lee 846a58507f simplify drawing text and rect (#1446)
* add ui_draw_text

remove draw textbox

make draw_text static

add blank line

* add ui_draw_text

remove draw textbox

make draw_text static

add blank line

add ui_draw_rect

draw rounded rect

fx typo

* remove used variables

* reduce lines

fix typo

* resolve confilit
2020-05-02 11:27:03 -07:00
Dean Lee 4857f45d6a simplify drawing circle images (#1445)
* simplify drawing circle images

add static

set default color to 0 0 0 0

remove lines

* fix img_weel_y

* use color macro
2020-05-01 19:16:17 -07:00
Dean Lee 3fe3afeede better ui_draw() (#1432)
* better ui_draw()

* fix missed border

reduce code

remove white line
2020-04-30 12:11:35 -07:00
Dean Lee b2be607974 replace duplicate codes with variable (#1431)
* eplace duplicate codes with variable

* remove space
2020-04-28 13:44:57 -07:00
Dean Lee 3e2e241a38 Remove redundant code (#1361)
* changing the coordinate system only once

* remove white space

* remove white space

* s->scene. to  scene->

* whitespace
2020-04-17 15:59:43 -07:00
ZwX1616 133b1a20b4 RHD support for driver monitoring (#1299) 2020-04-15 16:48:44 -07:00
Dean Lee ea055d169f assert after nvgCreateImage in ui_nvg_init() (#1360)
* assert after nvgCreateImage

* update apks
2020-04-14 12:27:55 -07:00
Dean Lee 1ecef2c6be add ui_draw_image to reduce code repetition 2020-04-13 15:38:45 -07:00
Willem Melching 54d8f9c27b ui.cc: use thermald to decide when to go onroad (#1351)
* use thermald to decide when to go onroad

* Check for stopped

* set alert timeout to 0 when going offroad

* set controls seen to false

* Don't mark as seen when already stopped

* Don't process controlsState when stopped

* Needs free

* Small cleanup

* Remove that again

* Process controlsState when started

* Need that back
2020-04-10 16:12:39 -07:00
George Hotz ef8aaa77b7 Remove bg_thread from ui (#1347)
* remove bg_thread

* debug print app

Co-authored-by: Comma Device <device@comma.ai>
2020-04-09 20:55:54 -07:00
Andy 35b34fb700 offroad/ui: Transparent layout mode and msgq-based layout control (#1337)
* offroadLayout

* replace broadcasts with offroadLayout socket

* apk

* set 'none' layoutstate for transparent offroad

* refactor, hide offroad when vision connected

* apk supporting transparency

* reset layout state when stopping

* apk

* cleanup includes

* permit offroad to mangae sidebar state only when vision disconnected

* apk

* use c-capnp

* always upd

* send that too

* sync layout state with offroad

* apk

* fix regression in onboarding (mock engage green border)

* apk

* bump apks

* simplify event processing

* bump cereal to master

* in case ui exited in a bad state

Co-authored-by: Comma Device <device@comma.ai>
2020-04-09 19:28:11 -07:00
Dean Lee ee52046957 remove unnecessary nvgLineTo (#1333) 2020-04-08 15:10:42 -07:00
Andy 41bb3ac7ca Sidebar Connectivity Status (#1268)
* store athena connected-at time

* refactor

* deref

* dt import

* Athena status based on last ping time param

* upd test for pingtime

* lower error timeout
2020-04-05 11:06:49 -07:00
Comma Device 6abbda1467 fix background on computer ui 2020-04-01 23:01:17 +00:00
eFini 47f17622d9 paint.cc uses color defined in ui.hpp (#1261)
* pain.cc uses color defined in ui.hpp

* use macro
2020-03-27 11:00:42 -07:00
DeanLee 993b0e9427 repace nvgFontFace with nvgFontFaceId (#1279) 2020-03-27 11:00:07 -07:00
Andrew Valish 0aafd67b56 fix sidebar shadow in network settings (#1245) 2020-03-16 13:02:45 -07:00
Andrew Valish 5ba6beed17 Refactor frame (#1192)
* start drawing new sidebar, add assets

* add thermal to ui, draw network_type and battery

* draw sidebar metrics, add freeSpace and paTemp

* draw static panda metric and network strength, start ubloxGnss messaging

* use array for network_img

* start sidebar touch events

* prevent multiple touch events with touch_timeout

* filter old touches, isolate sidebar events

* add hwType check with timeout for panda metric

* cleanup touch poll, handle vision touch, remove frame and black apks

* cleanup per willem comments

* update offroad, only read active_app from cereal

* tweak sidebar behavior, show active app status

* update offroad apk

* read networkstrength from thermal in sidebar
2020-03-09 19:13:32 -07:00
Willem Melching 049f2d0e1b Don't add 2.7 m to lead distance in ui. The reference frame shifted a while ago. 2020-02-20 14:29:09 -08:00
Arne Schwarck 175243af40 Draw leadTwo chevron in ui (#1133)
* Add leadTwo

* Add leadTwo

* Draw leadTwo car indicator

* Reuse leaddatad

* refactor draw_lead

No idea if this is the correct syntax

* Python is too good to us

Add ;

* Only show if more than 3m apart

* Delete unused scene
2020-02-20 14:27:11 -08:00
George Hotz 811b3b7a9a Fix ui on mac (#1044)
* remove line_shader dead code

* fix glfwCreateWindow

* don't assert on ipc socket failure

* window now appears on mac
2020-02-02 22:19:26 -08:00
George Hotz f72f78f2b9 Support scons build on Mac (#1034)
* fix clock and add Darwin sconstruct

* it builds, this changes should be simplifications too

* fix boardd build

* that's the real type of EGLClientBuffer

* remove extra lines

* ui needs opencl on phone
2020-02-01 23:36:50 -08:00
George Hotz aeb2fff068 selfdrive/ui 2020-01-17 11:05:23 -08:00