From 9efc499ed9a7e72e17cabd76ca95bab57733c596 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Fri, 22 Jan 2021 22:40:53 +0800 Subject: [PATCH] ui: remove satelliteCount (#19878) --- selfdrive/ui/ui.cc | 9 +-------- selfdrive/ui/ui.hpp | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index acbe4bb7cc..7652d08c17 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -41,11 +41,10 @@ static void ui_init_vision(UIState *s) { void ui_init(UIState *s) { s->sm = new SubMaster({"modelV2", "controlsState", "uiLayoutState", "liveCalibration", "radarState", "thermal", "frame", - "health", "carParams", "ubloxGnss", "driverState", "dMonitoringState", "sensorEvents"}); + "health", "carParams", "driverState", "dMonitoringState", "sensorEvents"}); s->started = false; s->status = STATUS_OFFROAD; - s->scene.satelliteCount = -1; s->fb = framebuffer_init("ui", 0, true, &s->fb_w, &s->fb_h); assert(s->fb); @@ -161,12 +160,6 @@ static void update_sockets(UIState *s) { if (sm.updated("thermal")) { scene.thermal = sm["thermal"].getThermal(); } - if (sm.updated("ubloxGnss")) { - auto data = sm["ubloxGnss"].getUbloxGnss(); - if (data.which() == cereal::UbloxGnss::MEASUREMENT_REPORT) { - scene.satelliteCount = data.getMeasurementReport().getNumMeas(); - } - } if (sm.updated("health")) { auto health = sm["health"].getHealth(); scene.hwType = health.getHwType(); diff --git a/selfdrive/ui/ui.hpp b/selfdrive/ui/ui.hpp index 1363cddf72..5fdb746bf5 100644 --- a/selfdrive/ui/ui.hpp +++ b/selfdrive/ui/ui.hpp @@ -121,7 +121,6 @@ typedef struct UIScene { cereal::ControlsState::AlertSize alert_size; cereal::HealthData::HwType hwType; - int satelliteCount; NetStatus athenaStatus; cereal::ThermalData::Reader thermal;