  
    bool started;
    bool is_metric;
    bool longitudinal_control;
    uint64_t last_athena_ping;
    uint64_t started_frame;
 
</s> remove     scene.hwType = sm["health"].getHealth().getHwType();
 </s> add     auto health = sm["health"].getHealth();
    scene.hwType = health.getHwType();
    s->ignition = health.getIgnitionLine() || health.getIgnitionCan(); </s> remove     if (s->started) {
 </s> add     if (s->started || s->ignition) {
  bool ignition;
  
    bool started;
  bool ignition;
    bool is_metric;
    bool longitudinal_control;
    uint64_t last_athena_ping;
    uint64_t started_frame;
keep add keep keep keep keep
 Always keep display on with ignition (#2138)

* keep display on with ignition

* fix typo

Co-authored-by: Willem Melching <willem.melching@gmail.com> 
selfdrive/ui/ui.hpp