spacecruft
/
nopenpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
pull/19844/head
ZwX1616 2021-01-19 15:11:15 -08:00 committed by GitHub
parent 348dc61c64
commit 88430f12f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cereal

@ -1 +1 @@
Subproject commit 610fa77bc41ddf58e57f52ef678222a435cb6748
Subproject commit ab79999e5dc2de25c3eb0c9acbed47c9e81f5d79

1
selfdrive/monitoring/dmonitoringd.py
View File

@ -76,6 +76,7 @@ def dmonitoringd_thread(sm=None, pm=None):
"isLowStd": driver_status.pose.low_std,
"hiStdCount": driver_status.hi_stds,
"isPreview": offroad,
"isActiveMode": driver_status.active_monitoring_mode,
}
pm.send('dMonitoringState', dat)

4
selfdrive/ui/paint.cc
View File

@ -266,7 +266,7 @@ static void ui_draw_vision_face(UIState *s) {
const int face_size = 96;
const int face_x = (s->scene.viz_rect.x + face_size + (bdr_s * 2));
const int face_y = (s->scene.viz_rect.bottom() - footer_h + ((footer_h - face_size) / 2));
ui_draw_circle_image(s, face_x, face_y, face_size, "driver_face", s->scene.dmonitoring_state.getFaceDetected());
ui_draw_circle_image(s, face_x, face_y, face_size, "driver_face", s->scene.dmonitoring_state.getIsActiveMode());
}
static void ui_draw_driver_view(UIState *s) {
@ -307,7 +307,7 @@ static void ui_draw_driver_view(UIState *s) {
const int face_size = 85;
const int icon_x = is_rhd ? rect.right() - face_size - bdr_s * 2 : rect.x + face_size + bdr_s * 2;
const int icon_y = rect.bottom() - face_size - bdr_s * 2.5;
ui_draw_circle_image(s, icon_x, icon_y, face_size, "driver_face", face_detected);
ui_draw_circle_image(s, icon_x, icon_y, face_size, "driver_face", s->scene.dmonitoring_state.getIsActiveMode());
}
static void ui_draw_vision_header(UIState *s) {