ui: remove satelliteCount (#19878)

pull/19882/head
Dean Lee 4 years ago committed by GitHub
parent c9aa9b0178
commit 9efc499ed9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      selfdrive/ui/ui.cc
  2. 1
      selfdrive/ui/ui.hpp

@ -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();

@ -121,7 +121,6 @@ typedef struct UIScene {
cereal::ControlsState::AlertSize alert_size;
cereal::HealthData::HwType hwType;
int satelliteCount;
NetStatus athenaStatus;
cereal::ThermalData::Reader thermal;

Loading…
Cancel
Save