diff --git a/cereal b/cereal index 610fa77bc4..ab79999e5d 160000 --- a/cereal +++ b/cereal @@ -1 +1 @@ -Subproject commit 610fa77bc41ddf58e57f52ef678222a435cb6748 +Subproject commit ab79999e5dc2de25c3eb0c9acbed47c9e81f5d79 diff --git a/selfdrive/monitoring/dmonitoringd.py b/selfdrive/monitoring/dmonitoringd.py index 63df16c795..1fd0353569 100755 --- a/selfdrive/monitoring/dmonitoringd.py +++ b/selfdrive/monitoring/dmonitoringd.py @@ -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) diff --git a/selfdrive/ui/paint.cc b/selfdrive/ui/paint.cc index 88549a9eb7..67bf8673c2 100644 --- a/selfdrive/ui/paint.cc +++ b/selfdrive/ui/paint.cc @@ -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) {