  
    bool world_objects_visible;
    mat4 extrinsic_matrix;      // Last row is 0 so we can use mat4.
  
    float v_cruise;
    uint64_t v_cruise_update_ts;
    float v_ego;
    bool decel_for_model;
  
    float speedlimit;
    bool speedlimit_valid;
    bool map_valid;
  
    float curvature;
 
</s> remove   bool map_valid;

  float curvature;
  int engaged;
  bool engageable;
  bool monitoring_active;
 </s> add  </s> remove   float alert_blinkingrate;

  float awareness_status;
 </s> add  </s> remove   bool thermal_started, preview_started;
 </s> add   bool preview_started; </s> remove   int lead_status;
  float lead_d_rel, lead_y_rel, lead_v_rel;

  int lead_status2;
  float lead_d_rel2, lead_y_rel2, lead_v_rel2;

  float face_prob;
  bool is_rhd;
  float face_x, face_y;

 </s> add 
  
    bool world_objects_visible;
    mat4 extrinsic_matrix;      // Last row is 0 so we can use mat4.
  





    float speedlimit;
    bool speedlimit_valid;
    bool map_valid;
  
    float curvature;
keep keep keep keep replace replace replace replace replace keep keep keep keep keep
 ui.cc: remove variables from UIScene, use event::Reader to get data  (#1585)

* use struct to store lead status

* remove white space

* use RadarState::LeadData::Reader

* use reader to get thermal data

* use reader

* continue

* remove variables

reset submodules,fix some errors

reset submodules

revert

* remove s->scene.gps_planner_active

* modify

* cleanup

* done

* resolve conflict

* remove irrelevant comment

* remove white space 
selfdrive/ui/ui.hpp