diff --git a/selfdrive/ui/qt/sidebar.cc b/selfdrive/ui/qt/sidebar.cc index 631a07653e..09ab06398f 100644 --- a/selfdrive/ui/qt/sidebar.cc +++ b/selfdrive/ui/qt/sidebar.cc @@ -25,7 +25,7 @@ void Sidebar::drawMetric(QPainter &p, const QString &label, const QString &val, p.setPen(QColor(0xff, 0xff, 0xff)); if (val.isEmpty()) { configFont(p, "Open Sans", 35, "Bold"); - const QRect r = QRect(rect.x() + 35, rect.y(), rect.width() - 50, rect.height()); + const QRect r = QRect(rect.x() + 30, rect.y(), rect.width() - 40, rect.height()); p.drawText(r, Qt::AlignCenter, label); } else { configFont(p, "Open Sans", 58, "Bold"); @@ -85,6 +85,9 @@ void Sidebar::updateState(const UIState &s) { if (s.scene.pandaType == cereal::PandaState::PandaType::UNKNOWN) { pandaStatus = danger_color; pandaStr = "NO\nPANDA"; + } else if (!sm["liveLocationKalman"].getLiveLocationKalman().getGpsOK()) { + pandaStatus = warning_color; + pandaStr = "GPS\nSEARCHING"; } setProperty("pandaStr", pandaStr); setProperty("pandaStatus", pandaStatus); diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index bbf8468543..3dab4f4245 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -168,12 +168,6 @@ static void update_state(UIState *s) { } else if ((s->sm->frame - s->sm->rcv_frame("pandaState")) > 5*UI_FREQ) { scene.pandaType = cereal::PandaState::PandaType::UNKNOWN; } - if (sm.updated("ubloxGnss")) { - auto data = sm["ubloxGnss"].getUbloxGnss(); - if (data.which() == cereal::UbloxGnss::MEASUREMENT_REPORT) { - scene.satelliteCount = data.getMeasurementReport().getNumMeas(); - } - } if (sm.updated("carParams")) { scene.longitudinal_control = sm["carParams"].getCarParams().getOpenpilotLongitudinalControl(); } @@ -278,7 +272,7 @@ static void update_status(UIState *s) { QUIState::QUIState(QObject *parent) : QObject(parent) { ui_state.sm = std::make_unique>({ "modelV2", "controlsState", "liveCalibration", "radarState", "deviceState", "roadCameraState", - "pandaState", "carParams", "driverMonitoringState", "sensorEvents", "carState", "ubloxGnss", + "pandaState", "carParams", "driverMonitoringState", "sensorEvents", "carState", "liveLocationKalman", }); ui_state.fb_w = vwp_w; diff --git a/selfdrive/ui/ui.h b/selfdrive/ui/ui.h index c7752df775..db782c0a87 100644 --- a/selfdrive/ui/ui.h +++ b/selfdrive/ui/ui.h @@ -83,9 +83,6 @@ typedef struct UIScene { cereal::PandaState::PandaType pandaType; - // gps - int satelliteCount; - // modelV2 float lane_line_probs[4]; float road_edge_stds[2];