Bsongis/modules sync issue 7288 (#7294)

Fixes #7288
2020-01-13 23:43:13 +01:00
parent 013cf6e968
commit 8c3f226a6e
11 changed files with 68 additions and 63 deletions
@@ -169,7 +169,8 @@ void checkEeprom()
 {
 #if defined(RTC_BACKUP_RAM) && !defined(SIMU)
  if (TIME_TO_BACKUP_RAM()) {
-    rambackupWrite();
+    if (!globalData.unexpectedShutdown)
+      rambackupWrite();
    rambackupDirtyMsk = 0;
  }
 #endif
@@ -486,10 +487,10 @@ void perMain()
  periodicTick();
  DEBUG_TIMER_STOP(debugTimerPerMain1);

-  if (mainRequestFlags & (1 << REQUEST_FLIGHT_RESET)) {
+  if (mainRequestFlags & (1u << REQUEST_FLIGHT_RESET)) {
    TRACE("Executing requested Flight Reset");
    flightReset();
-    mainRequestFlags &= ~(1 << REQUEST_FLIGHT_RESET);
+    mainRequestFlags &= ~(1u << REQUEST_FLIGHT_RESET);
  }

  checkBacklight();