From 020cd7b1f88d8bbc228f5f1a26aba5409e2da8f5 Mon Sep 17 00:00:00 2001
From: Jason Wen <haibin.wen3@gmail.com>
Date: Thu, 14 Sep 2023 13:54:33 -0400
Subject: [PATCH] ui: Feature Status cleanup (#270)

---
 selfdrive/ui/qt/onroad.cc | 7 +++++--
 selfdrive/ui/qt/onroad.h  | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc
index a80f00fcf4..d40a6abe7f 100644
--- a/selfdrive/ui/qt/onroad.cc
+++ b/selfdrive/ui/qt/onroad.cc
@@ -605,6 +605,9 @@ void AnnotatedCameraWidget::updateState(const UIState &s) {
     curveSign = lp.getTurnSign();
   }
 
+  longitudinalPersonality = s.scene.longitudinal_personality;
+  dynamicLaneProfile = s.scene.dynamic_lane_profile;
+
   static int reverse_delay = 0;
   bool reverse_allowed = false;
   if (int(car_state.getGearShifter()) != 4) {
@@ -1465,11 +1468,11 @@ void AnnotatedCameraWidget::drawFeatureStatusText(QPainter &p, int x, int y) {
   p.setFont(InterFont(32, QFont::Bold));
   p.setPen(whiteColor());
 
-  status_text.sprintf("GAC: %s\n", QString::number(uiState()->scene.longitudinal_personality).toStdString().c_str());
+  status_text.sprintf("GAP: %s\n", QString::number(longitudinalPersonality).toStdString().c_str());
   p.drawText(x, y, status_text);
 
   y += text_height;
-  status_text.sprintf("DLP: %s\n", QString::number(uiState()->scene.dynamic_lane_profile).toStdString().c_str());
+  status_text.sprintf("DLP: %s\n", QString::number(dynamicLaneProfile).toStdString().c_str());
   p.drawText(x, y, status_text);
 
   y += text_height;
diff --git a/selfdrive/ui/qt/onroad.h b/selfdrive/ui/qt/onroad.h
index c1e1826038..2be0f120fe 100644
--- a/selfdrive/ui/qt/onroad.h
+++ b/selfdrive/ui/qt/onroad.h
@@ -213,6 +213,10 @@ private:
   int blinker_frame;
   int blinker_state = 0;
 
+  cereal::LongitudinalPlan::SpeedLimitControlState slcState;
+  int longitudinalPersonality;
+  int dynamicLaneProfile;
+
 protected:
   void paintGL() override;
   void initializeGL() override;
@@ -231,8 +235,6 @@ protected:
   FirstOrderFilter fps_filter;
   void rocketFuel(QPainter &p);
 
-  cereal::LongitudinalPlan::SpeedLimitControlState slcState;
-
 // neokii
 #ifdef ENABLE_DASHCAM
 private: