mawei/MoreTore
1
0
Fork 0
mirror of https://github.com/MoreTore/openpilot.git synced 2026-09-30 11:23:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

ui: fix finish setup button (#21538)

Browse Source 
old-commit-hash: c10d46d336
This commit is contained in:
sshane
2021-07-13 14:58:54 -07:00
committed by GitHub
parent 7198224cf2
commit 748adb4c63
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/qt/home.cc
+3 -3
View File
@@ -25,15 +25,15 @@ HomeWindow::HomeWindow(QWidget* parent) : QWidget(parent) {
slayout = new QStackedLayout();
main_layout->addLayout(slayout);
home = new OffroadHome();
slayout->addWidget(home);
onroad = new OnroadWindow(this);
slayout->addWidget(onroad);
QObject::connect(this, &HomeWindow::update, onroad, &OnroadWindow::update);
QObject::connect(this, &HomeWindow::offroadTransitionSignal, onroad, &OnroadWindow::offroadTransitionSignal);
home = new OffroadHome();
slayout->addWidget(home);
driver_view = new DriverViewWindow(this);
connect(driver_view, &DriverViewWindow::done, [=] {
showDriverView(false);
selfdrive/ui/ui.cc
+2 -2
View File
@@ -134,7 +134,7 @@ static void update_state(UIState *s) {
scene.engageable = sm["controlsState"].getControlsState().getEngageable();
scene.dm_active = sm["driverMonitoringState"].getDriverMonitoringState().getIsActiveMode();
}
if (sm.updated("radarState")) {
if (sm.updated("radarState") && s->vg) {
std::optional<cereal::ModelDataV2::XYZTData::Reader> line;
if (sm.rcv_frame("modelV2") > 0) {
line = sm["modelV2"].getModelV2().getPosition();
@@ -158,7 +158,7 @@ static void update_state(UIState *s) {
}
}
}
if (sm.updated("modelV2")) {
if (sm.updated("modelV2") && s->vg) {
update_model(s, sm["modelV2"].getModelV2());
}
if (sm.updated("pandaState")) {