Merge with latest 2.3

2020-05-30 11:57:03 +02:00
parent ae99f18375 b324145d10
commit bddccb9765
240 changed files with 16050 additions and 14404 deletions
@@ -227,7 +227,7 @@ void showAlertBox(const char * title, const char * text, const char * action , u
  lcdRefresh();
  lcdSetContrast();
  waitKeysReleased();
-  backlightOn();
+  resetBacklightTimeout();
  checkBacklight();
 }