diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index f98d7fc8..18707d88 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -219,6 +219,10 @@ void Device::updateBrightness(const UIState &s, const FrogPilotUIState &fs) { int brightness = brightness_filter.update(clipped_brightness); if (!awake) { brightness = 0; + } else if (s.scene.started && frogpilot_toggles.value("screen_brightness_onroad").toInt() != 101) { + brightness = interactive_timeout > 0 ? fmax(5, frogpilot_toggles.value("screen_brightness_onroad").toInt()) : frogpilot_toggles.value("screen_brightness_onroad").toInt(); + } else if (frogpilot_toggles.value("screen_brightness").toInt() != 101) { + brightness = frogpilot_toggles.value("screen_brightness").toInt(); } if (brightness != last_brightness) { @@ -239,6 +243,8 @@ void Device::updateWakefulness(const UIState &s, const FrogPilotUIState &fs) { if (ignition_just_turned_off) { resetInteractiveTimeout(); + } else if (ignition_on && frogpilot_toggles.value("screen_brightness_onroad").toInt() == 0) { + resetInteractiveTimeout(0, 0); } else if (interactive_timeout > 0 && --interactive_timeout == 0) { emit interactiveTimeout(); }