|
|
|
@ -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<SubMaster, const std::initializer_list<const char *>>({ |
|
|
|
|
"modelV2", "controlsState", "liveCalibration", "radarState", "deviceState", "roadCameraState", |
|
|
|
|
"pandaState", "carParams", "driverMonitoringState", "sensorEvents", "carState", "ubloxGnss", |
|
|
|
|
"pandaState", "carParams", "driverMonitoringState", "sensorEvents", "carState", "liveLocationKalman", |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
ui_state.fb_w = vwp_w; |
|
|
|
|