    bool monitoring_active;
  
    bool uilayout_sidebarcollapsed;
    bool uilayout_mapenabled;
    bool uilayout_mockengaged;
    // responsive layout
    int ui_viz_rx;
    int ui_viz_rw;
    int ui_viz_ro;
  
 
</s> remove   bool map_valid;

  float curvature;
  int engaged;
  bool engageable;
  bool monitoring_active;
 </s> add  </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  </s> remove   bool thermal_started, preview_started;
 </s> add   bool preview_started; </s> remove   cereal::ThermalData::NetworkType networkType;
  cereal::ThermalData::NetworkStrength networkStrength;
  int batteryPercent;
  bool batteryCharging;
  float freeSpace;
  cereal::ThermalData::ThermalStatus thermalStatus;
  int paTemp;
 </s> add 
    bool monitoring_active;
  
    bool uilayout_sidebarcollapsed;
    bool uilayout_mapenabled;

    // responsive layout
    int ui_viz_rx;
    int ui_viz_rw;
    int ui_viz_ro;
  
keep keep keep keep 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