ui/driverview: use common SubMaster (#29660)

x-golf3
Dean Lee 2 years ago committed by GitHub
parent 4f915f4f1a
commit 3a46a853cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      selfdrive/ui/qt/offroad/driverview.cc
  2. 1
      selfdrive/ui/qt/offroad/driverview.h

@ -35,7 +35,7 @@ void DriverViewWindow::mouseReleaseEvent(QMouseEvent* e) {
closeView(); 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}); 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() { void DriverViewScene::frameUpdated() {
frame_updated = true; frame_updated = true;
sm.update(0);
update(); update();
} }
@ -67,6 +66,7 @@ void DriverViewScene::paintEvent(QPaintEvent* event) {
return; return;
} }
const auto &sm = *(uiState()->sm);
cereal::DriverStateV2::Reader driver_state = sm["driverStateV2"].getDriverStateV2(); cereal::DriverStateV2::Reader driver_state = sm["driverStateV2"].getDriverStateV2();
cereal::DriverStateV2::DriverData::Reader driver_data; cereal::DriverStateV2::DriverData::Reader driver_data;

@ -20,7 +20,6 @@ protected:
private: private:
Params params; Params params;
SubMaster sm;
QPixmap face_img; QPixmap face_img;
bool is_rhd = false; bool is_rhd = false;
bool frame_updated = false; bool frame_updated = false;

Loading…
Cancel
Save