  
    // Used to show gps planner status
    bool gps_planner_active;
  
    cereal::ThermalData::NetworkType networkType;
    cereal::ThermalData::NetworkStrength networkStrength;
    int batteryPercent;
    bool batteryCharging;
    float freeSpace;
    cereal::ThermalData::ThermalStatus thermalStatus;
    int paTemp;
    cereal::HealthData::HwType hwType;
    int satelliteCount;
    uint8_t athenaStatus;
  } UIScene;
  
 
</s> remove   float alert_blinkingrate;

  float awareness_status;
 </s> add  </s> remove   bool map_valid;

  float curvature;
  int engaged;
  bool engageable;
  bool monitoring_active;
 </s> add  </s> remove   bool thermal_started, preview_started;
 </s> add   bool preview_started;
  
    // Used to show gps planner status
    bool gps_planner_active;
  







    cereal::HealthData::HwType hwType;
    int satelliteCount;
    uint8_t athenaStatus;
  } UIScene;
  
keep keep keep keep replace 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