ui: fix timeout typo (#28905)

tim is out -> timeout
pull/28909/head
Shane Smiskol 2 years ago committed by GitHub
parent 72579a0e10
commit d68bd905fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      selfdrive/ui/qt/window.cc
  2. 8
      selfdrive/ui/ui.cc
  3. 4
      selfdrive/ui/ui.h

@ -38,7 +38,7 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) {
closeSettings(); closeSettings();
} }
}); });
QObject::connect(&device, &Device::interactiveTimout, [=]() { QObject::connect(&device, &Device::interactiveTimeout, [=]() {
if (main_layout->currentWidget() == settingsWindow) { if (main_layout->currentWidget() == settingsWindow) {
closeSettings(); closeSettings();
} }
@ -90,9 +90,9 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event) {
case QEvent::TouchEnd: case QEvent::TouchEnd:
case QEvent::MouseButtonPress: case QEvent::MouseButtonPress:
case QEvent::MouseMove: { case QEvent::MouseMove: {
// ignore events when device is awakened by resetInteractiveTimout // ignore events when device is awakened by resetInteractiveTimeout
ignore = !uiState()->awake; ignore = !uiState()->awake;
device.resetInteractiveTimout(); device.resetInteractiveTimeout();
break; break;
} }
default: default:

@ -275,7 +275,7 @@ void UIState::setPrimeType(int type) {
Device::Device(QObject *parent) : brightness_filter(BACKLIGHT_OFFROAD, BACKLIGHT_TS, BACKLIGHT_DT), QObject(parent) { Device::Device(QObject *parent) : brightness_filter(BACKLIGHT_OFFROAD, BACKLIGHT_TS, BACKLIGHT_DT), QObject(parent) {
setAwake(true); setAwake(true);
resetInteractiveTimout(); resetInteractiveTimeout();
QObject::connect(uiState(), &UIState::uiUpdate, this, &Device::update); QObject::connect(uiState(), &UIState::uiUpdate, this, &Device::update);
} }
@ -297,7 +297,7 @@ void Device::setAwake(bool on) {
} }
} }
void Device::resetInteractiveTimout() { void Device::resetInteractiveTimeout() {
interactive_timeout = (ignition_on ? 10 : 30) * UI_FREQ; interactive_timeout = (ignition_on ? 10 : 30) * UI_FREQ;
} }
@ -335,9 +335,9 @@ 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) {
resetInteractiveTimout(); resetInteractiveTimeout();
} else if (interactive_timeout > 0 && --interactive_timeout == 0) { } else if (interactive_timeout > 0 && --interactive_timeout == 0) {
emit interactiveTimout(); emit interactiveTimeout();
} }
setAwake(s.scene.ignition || interactive_timeout > 0); setAwake(s.scene.ignition || interactive_timeout > 0);

@ -203,10 +203,10 @@ private:
signals: signals:
void displayPowerChanged(bool on); void displayPowerChanged(bool on);
void interactiveTimout(); void interactiveTimeout();
public slots: public slots:
void resetInteractiveTimout(); void resetInteractiveTimeout();
void update(const UIState &s); void update(const UIState &s);
}; };

Loading…
Cancel
Save