zhudongjer/carrot
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Visuals - Screen Management - Screen Timeout

Browse Source 
Customize how long it takes for your screen to turn off.
This commit is contained in:
FrogAi 2024-05-11 15:53:46 -07:00
parent 14cd89f704
commit fb11cc7ff4
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
selfdrive/ui/qt/window.cc
View File

@ -93,7 +93,7 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event) {
case QEvent::MouseMove: { case QEvent::MouseMove: {
// ignore events when device is awakened by resetInteractiveTimeout // ignore events when device is awakened by resetInteractiveTimeout
ignore = !device()->isAwake(); ignore = !device()->isAwake();
device()->resetInteractiveTimeout(); device()->resetInteractiveTimeout(uiState()->scene.screen_timeout;
break; break;
} }
default: default:

5
selfdrive/ui/ui.cc
View File

@ -416,6 +416,7 @@ void ui_update_frogpilot_params(UIState *s) {
scene.screen_brightness = screen_management ? params.getInt("ScreenBrightness") : 101; scene.screen_brightness = screen_management ? params.getInt("ScreenBrightness") : 101;
scene.screen_brightness_onroad = screen_management ? params.getInt("ScreenBrightnessOnroad") : 101; scene.screen_brightness_onroad = screen_management ? params.getInt("ScreenBrightnessOnroad") : 101;
scene.screen_recorder = screen_management && params.getBool("ScreenRecorder"); scene.screen_recorder = screen_management && params.getBool("ScreenRecorder");
scene.screen_timeout = screen_management ? params.getInt("ScreenTimeout") : 30;
scene.speed_limit_controller = scene.longitudinal_control && params.getBool("SpeedLimitController"); scene.speed_limit_controller = scene.longitudinal_control && params.getBool("SpeedLimitController");
scene.show_slc_offset = scene.speed_limit_controller && params.getBool("ShowSLCOffset"); scene.show_slc_offset = scene.speed_limit_controller && params.getBool("ShowSLCOffset");
@ -537,6 +538,8 @@ void Device::setAwake(bool on) {
void Device::resetInteractiveTimeout(int timeout) { void Device::resetInteractiveTimeout(int timeout) {
if (timeout == -1) { if (timeout == -1) {
timeout = (ignition_on ? 10 : 30); timeout = (ignition_on ? 10 : 30);
} else {
timeout = timeout;
} }
interactive_timeout = timeout * UI_FREQ; interactive_timeout = timeout * UI_FREQ;
} }
@ -579,7 +582,7 @@ void Device::updateWakefulness(const UIState &s) {
ignition_on = s.scene.ignition; ignition_on = s.scene.ignition;
if (ignition_just_turned_off) { if (ignition_just_turned_off) {
resetInteractiveTimeout(); resetInteractiveTimeout(s.scene.screen_timeout);
} else if (interactive_timeout > 0 && --interactive_timeout == 0) { } else if (interactive_timeout > 0 && --interactive_timeout == 0) {
emit interactiveTimeout(); emit interactiveTimeout();
} }

1
selfdrive/ui/ui.h
View File

@ -306,6 +306,7 @@ typedef struct UIScene {
int obstacle_distance_stock; int obstacle_distance_stock;
int screen_brightness; int screen_brightness;
int screen_brightness_onroad; int screen_brightness_onroad;
int screen_timeout;
int steering_angle_deg; int steering_angle_deg;
int stopped_equivalence; int stopped_equivalence;
int wheel_icon; int wheel_icon;