From f1568b960a3da819c41c62dcaeafb4eb6dd109eb Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Thu, 17 Aug 2023 13:22:39 +0800
Subject: [PATCH] ui: longer screen timeout for driver view (#27457)

* longer driverview timeout

* Update ui.cc

* reset timeout

* do cleanup

* Apply suggestions from code review

* Update selfdrive/ui/ui.cc

* reset to default timeout on hidden

---------

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Co-authored-by: Shane Smiskol <shane@smiskol.com>
---
 selfdrive/ui/qt/offroad/driverview.cc | 2 ++
 selfdrive/ui/ui.cc                    | 7 +++++--
 selfdrive/ui/ui.h                     | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/selfdrive/ui/qt/offroad/driverview.cc b/selfdrive/ui/qt/offroad/driverview.cc
index 0a216766a2..cc715c6755 100644
--- a/selfdrive/ui/qt/offroad/driverview.cc
+++ b/selfdrive/ui/qt/offroad/driverview.cc
@@ -33,10 +33,12 @@ DriverViewScene::DriverViewScene(QWidget* parent) : sm({"driverStateV2"}), QWidg
 void DriverViewScene::showEvent(QShowEvent* event) {
   frame_updated = false;
   params.putBool("IsDriverViewEnabled", true);
+  device()->resetInteractiveTimeout(60);
 }
 
 void DriverViewScene::hideEvent(QHideEvent* event) {
   params.putBool("IsDriverViewEnabled", false);
+  device()->resetInteractiveTimeout();
 }
 
 void DriverViewScene::frameUpdated() {
diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc
index 95be0e3ed9..32d8ae80ad 100644
--- a/selfdrive/ui/ui.cc
+++ b/selfdrive/ui/ui.cc
@@ -293,8 +293,11 @@ void Device::setAwake(bool on) {
   }
 }
 
-void Device::resetInteractiveTimeout() {
-  interactive_timeout = (ignition_on ? 10 : 30) * UI_FREQ;
+void Device::resetInteractiveTimeout(int timeout) {
+  if (timeout == -1) {
+    timeout = (ignition_on ? 10 : 30);
+  }
+  interactive_timeout = timeout * UI_FREQ;
 }
 
 void Device::updateBrightness(const UIState &s) {
diff --git a/selfdrive/ui/ui.h b/selfdrive/ui/ui.h
index 572065d961..31488431b1 100644
--- a/selfdrive/ui/ui.h
+++ b/selfdrive/ui/ui.h
@@ -212,7 +212,7 @@ signals:
   void interactiveTimeout();
 
 public slots:
-  void resetInteractiveTimeout();
+  void resetInteractiveTimeout(int timeout = -1);
   void update(const UIState &s);
 };