From 3a46a853cb22efe0053cf7e99fc7c8e7e676a455 Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Mon, 28 Aug 2023 01:57:31 +0800
Subject: [PATCH] ui/driverview: use common SubMaster (#29660)

---
 selfdrive/ui/qt/offroad/driverview.cc | 4 ++--
 selfdrive/ui/qt/offroad/driverview.h  | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/selfdrive/ui/qt/offroad/driverview.cc b/selfdrive/ui/qt/offroad/driverview.cc
index ec4b567ca..693a0253b 100644
--- a/selfdrive/ui/qt/offroad/driverview.cc
+++ b/selfdrive/ui/qt/offroad/driverview.cc
@@ -35,7 +35,7 @@ void DriverViewWindow::mouseReleaseEvent(QMouseEvent* e) {
   closeView();
 }
 
-DriverViewScene::DriverViewScene(QWidget* parent) : sm({"driverStateV2"}), QWidget(parent) {
+DriverViewScene::DriverViewScene(QWidget* parent) : QWidget(parent) {
   face_img = loadPixmap("../assets/img_driver_face_static.png", {FACE_IMG_SIZE, FACE_IMG_SIZE});
 }
 
@@ -51,7 +51,6 @@ void DriverViewScene::hideEvent(QHideEvent* event) {
 
 void DriverViewScene::frameUpdated() {
   frame_updated = true;
-  sm.update(0);
   update();
 }
 
@@ -67,6 +66,7 @@ void DriverViewScene::paintEvent(QPaintEvent* event) {
     return;
   }
 
+  const auto &sm = *(uiState()->sm);
   cereal::DriverStateV2::Reader driver_state = sm["driverStateV2"].getDriverStateV2();
   cereal::DriverStateV2::DriverData::Reader driver_data;
 
diff --git a/selfdrive/ui/qt/offroad/driverview.h b/selfdrive/ui/qt/offroad/driverview.h
index a6ea2cbee..8bfc7a4b7 100644
--- a/selfdrive/ui/qt/offroad/driverview.h
+++ b/selfdrive/ui/qt/offroad/driverview.h
@@ -20,7 +20,6 @@ protected:
 
 private:
   Params params;
-  SubMaster sm;
   QPixmap face_img;
   bool is_rhd = false;
   bool frame_updated = false;