wip

selfdrive/ui/ui.h

@@ -155,16 +155,6 @@ struct Alert {
   }
 };
 
-enum PrimeType {
-  UNKNOWN = -1,
-  NONE = 0,
-  MAGENTA = 1,
-  LITE = 2,
-  BLUE = 3,
-  MAGENTA_NEW = 4,
-  PURPLE = 5,
-};
-  
 
 typedef struct UIScene {
   bool calibration_valid = false;
@@ -191,7 +181,6 @@ typedef struct UIScene {
   float driver_pose_coss[3];
   vec3 face_kpts_draw[std::size(default_face_kpts_3d)];
 
-  bool navigate_on_openpilot = false;
   cereal::LongitudinalPersonality personality;
 
   float light_sensor;
@@ -204,7 +193,6 @@ typedef struct UIScene {
   bool adjacent_path;
   bool adjacent_path_metrics;
   bool always_on_lateral_active;
-  bool big_map;
   bool blind_spot_left;
   bool blind_spot_path;
   bool blind_spot_right;
@@ -219,7 +207,6 @@ typedef struct UIScene {
   bool experimental_mode_via_screen;
   bool fahrenheit;
   bool fps_counter;
-  bool full_map;
   bool has_auto_tune;
   bool hide_alerts;
   bool hide_lead_marker;
@@ -230,7 +217,6 @@ typedef struct UIScene {
   bool holiday_themes;
   bool lead_info;
   bool live_valid;
-  bool map_open;
   bool model_ui;
   bool numerical_temp;
   bool online;
@@ -328,10 +314,6 @@ public:
     return scene.started && (*sm)["controlsState"].getControlsState().getEnabled();
   }
 
-  void setPrimeType(PrimeType type);
-  inline PrimeType primeType() const { return prime_type; }
-  inline bool hasPrime() const { return prime_type != PrimeType::UNKNOWN && prime_type != PrimeType::NONE; }
-
   int fb_w = 0, fb_h = 0;
 
   std::unique_ptr<SubMaster> sm;
@@ -349,8 +331,6 @@ public:
 signals:
   void uiUpdate(const UIState &s);
   void offroadTransition(bool offroad);
-  void primeChanged(bool prime);
-  void primeTypeChanged(PrimeType prime_type);
 
 private slots:
   void update();
@@ -358,7 +338,6 @@ private slots:
 private:
   QTimer *timer;
   bool started_prev = false;
-  PrimeType prime_type = PrimeType::UNKNOWN;
 
   // FrogPilot variables
   Params paramsMemory{"/dev/shm/params"};