From 0b385a5650c4e0b06eb83e44bdba3fcff117beeb Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 4 Nov 2022 21:04:53 -0700 Subject: [PATCH] ui: fade to default path color when inactive (#26375) * fade to default path color when inactive * long! --- selfdrive/ui/qt/onroad.cc | 2 +- selfdrive/ui/ui.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index 85b55697be..c4e4beb76a 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -463,7 +463,7 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) { if (scene.end_to_end_long) { const auto &acceleration = (*s->sm)["modelV2"].getModelV2().getAcceleration(); float acceleration_future = 0; - if (acceleration.getZ().size() > 10) { + if (acceleration.getZ().size() > 10 && (*s->sm)["carControl"].getCarControl().getLongActive()) { acceleration_future = acceleration.getX()[10]; // 1.0 second } // speed up: 148, slow down: 0 diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index 945218ec11..0198405769 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -214,7 +214,7 @@ void UIState::updateStatus() { UIState::UIState(QObject *parent) : QObject(parent) { sm = std::make_unique>({ - "modelV2", "controlsState", "liveCalibration", "radarState", "deviceState", "roadCameraState", + "modelV2", "carControl", "controlsState", "liveCalibration", "radarState", "deviceState", "roadCameraState", "pandaStates", "carParams", "driverMonitoringState", "carState", "liveLocationKalman", "wideRoadCameraState", "managerState", "navInstruction", "navRoute", "gnssMeasurements", });