    bool decel_for_model;
  
    float speedlimit;
    bool speedlimit_valid;
    bool map_valid;
  
    float curvature;
    int engaged;
    bool engageable;
    bool monitoring_active;
  
    bool uilayout_sidebarcollapsed;
    bool uilayout_mapenabled;
    bool uilayout_mockengaged;
    // responsive layout
 
</s> remove   bool uilayout_mockengaged;
 </s> add  </s> remove   float v_cruise;
  uint64_t v_cruise_update_ts;
  float v_ego;
  bool decel_for_model;

 </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 decel_for_model;
  
    float speedlimit;
    bool speedlimit_valid;






  
    bool uilayout_sidebarcollapsed;
    bool uilayout_mapenabled;
    bool uilayout_mockengaged;
    // responsive layout
keep keep keep keep replace 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