From 2b32abe4677023245b955436762e62d802c91968 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Tue, 13 Sep 2016 18:35:03 +0200
Subject: [PATCH] [ARM boards] Model persistent timers / telemetry / pots
 positions were not always correctly saved

---
 radio/src/gui/128x64/gui.h           |  5 ++++-
 radio/src/gui/128x64/popups.cpp      |  4 ++--
 radio/src/opentx.cpp                 | 31 +++++-----------------------
 radio/src/storage/eeprom_common.cpp  |  2 +-
 radio/src/storage/storage.h          |  1 +
 radio/src/storage/storage_common.cpp | 26 +++++++++++++++++++++++
 radio/src/tasks_arm.cpp              |  6 ------
 radio/src/timers.cpp                 | 10 +--------
 8 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h
index 9be1b9ff0..cdee4a6cb 100644
--- a/radio/src/gui/128x64/gui.h
+++ b/radio/src/gui/128x64/gui.h
@@ -425,13 +425,16 @@ inline void drawProgressBar(const char * label)
 {
   // TODO
 }
+
 inline void updateProgressBar(int num, int den)
 {
   // TODO
 }
+
 inline void drawSleepBitmap()
 {
-  // TODO
+  lcdClear();
+  showMessageBox(STR_SHUTDOWN);
 }
 
 #if !defined(CPUM64)
diff --git a/radio/src/gui/128x64/popups.cpp b/radio/src/gui/128x64/popups.cpp
index a7e2e939e..a9e6e8a8d 100644
--- a/radio/src/gui/128x64/popups.cpp
+++ b/radio/src/gui/128x64/popups.cpp
@@ -45,9 +45,9 @@ void drawMessageBox()
   // could be a place for a warningInfoText
 }
 
-void showMessageBox(const pm_char * pstr)
+void showMessageBox(const pm_char * str)
 {
-  warningText = pstr;
+  warningText = str;
   drawMessageBox();
   warningText = NULL;
   lcdRefresh();
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index c9c7d9073..4aa9187cf 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -1882,15 +1882,12 @@ void opentxClose(uint8_t shutdown)
   logsClose();
 #endif
 
-  saveTimers();
+  storageFlushCurrentModel();
 
-#if defined(CPUARM)
-  for (int i=0; i<MAX_TELEMETRY_SENSORS; i++) {
-    TelemetrySensor & sensor = g_model.telemetrySensors[i];
-    if (sensor.type == TELEM_TYPE_CALCULATED && sensor.persistent && sensor.persistentValue != telemetryItems[i].value) {
-      sensor.persistentValue = telemetryItems[i].value;
-      storageDirty(EE_MODEL);
-    }
+#if defined(CPUARM) && !defined(REVA)
+  if (sessionTimer > 0) {
+    g_eeGeneral.globalTimer += sessionTimer;
+    sessionTimer = 0;
   }
 #endif
 
@@ -1901,25 +1898,7 @@ void opentxClose(uint8_t shutdown)
   }
 #endif
 
-#if defined(PCBTARANIS)
-  if (g_model.potsWarnMode == POTS_WARN_AUTO) {
-    for (int i=0; i<NUM_POTS+NUM_SLIDERS; i++) {
-      if (!(g_model.potsWarnEnabled & (1 << i))) {
-        SAVE_POT_POSITION(i);
-      }
-    }
-    storageDirty(EE_MODEL);
-  }
-#endif
-
-#if !defined(PCBTARANIS) && !defined(COLORLCD)
-  if (storageDirtyMsk & EE_MODEL) {
-    showMessageBox(STR_SAVEMODEL);
-  }
-#endif
-
   g_eeGeneral.unexpectedShutdown = 0;
-
   storageDirty(EE_GENERAL);
   storageCheck(true);
 
diff --git a/radio/src/storage/eeprom_common.cpp b/radio/src/storage/eeprom_common.cpp
index c644c3e07..5b05c5976 100644
--- a/radio/src/storage/eeprom_common.cpp
+++ b/radio/src/storage/eeprom_common.cpp
@@ -71,7 +71,7 @@ void selectModel(uint8_t sub)
 #if !defined(COLORLCD)
   showMessageBox(STR_LOADINGMODEL);
 #endif
-  saveTimers();
+  storageFlushCurrentModel();
   storageCheck(true); // force writing of current model data before this is changed
   g_eeGeneral.currModel = sub;
   storageDirty(EE_GENERAL);
diff --git a/radio/src/storage/storage.h b/radio/src/storage/storage.h
index ccc5966ca..f1b0dd495 100644
--- a/radio/src/storage/storage.h
+++ b/radio/src/storage/storage.h
@@ -50,6 +50,7 @@ void storageFormat();
 void storageReadAll();
 void storageDirty(uint8_t msk);
 void storageCheck(bool immediately);
+void storageFlushCurrentModel();
 
 void preModelLoad();
 void postModelLoad(bool alarms);
diff --git a/radio/src/storage/storage_common.cpp b/radio/src/storage/storage_common.cpp
index 2f3342c41..ac86630ab 100644
--- a/radio/src/storage/storage_common.cpp
+++ b/radio/src/storage/storage_common.cpp
@@ -106,3 +106,29 @@ void postModelLoad(bool alarms)
   SEND_FAILSAFE_1S();
   PLAY_MODEL_NAME();
 }
+
+void storageFlushCurrentModel()
+{
+  saveTimers();
+
+#if defined(CPUARM)
+  for (int i=0; i<MAX_TELEMETRY_SENSORS; i++) {
+    TelemetrySensor & sensor = g_model.telemetrySensors[i];
+    if (sensor.type == TELEM_TYPE_CALCULATED && sensor.persistent && sensor.persistentValue != telemetryItems[i].value) {
+      sensor.persistentValue = telemetryItems[i].value;
+      storageDirty(EE_MODEL);
+    }
+  }
+#endif
+
+#if defined(CPUARM)
+  if (g_model.potsWarnMode == POTS_WARN_AUTO) {
+    for (int i=0; i<NUM_POTS+NUM_SLIDERS; i++) {
+      if (!(g_model.potsWarnEnabled & (1 << i))) {
+        SAVE_POT_POSITION(i);
+      }
+    }
+    storageDirty(EE_MODEL);
+  }
+#endif
+}
diff --git a/radio/src/tasks_arm.cpp b/radio/src/tasks_arm.cpp
index c9b995ca6..21d319165 100644
--- a/radio/src/tasks_arm.cpp
+++ b/radio/src/tasks_arm.cpp
@@ -243,13 +243,7 @@ void menusTask(void * pdata)
   ledOff();
 #endif
 
-#if defined(COLORLCD) || defined(PCBTARANIS)
   drawSleepBitmap();
-#else
-  lcdClear();
-  showMessageBox(STR_SHUTDOWN);
-#endif
-
   opentxClose();
   boardOff(); // Only turn power off if necessary
 }
diff --git a/radio/src/timers.cpp b/radio/src/timers.cpp
index 92fbc9dfa..6f8e34e83 100644
--- a/radio/src/timers.cpp
+++ b/radio/src/timers.cpp
@@ -66,16 +66,8 @@ void saveTimers()
       }
     }
   }
-
-#if defined(CPUARM) && !defined(REVA)
-  if (sessionTimer > 0) {
-    g_eeGeneral.globalTimer += sessionTimer;
-    storageDirty(EE_GENERAL);
-    sessionTimer = 0;
-  }
-#endif
 }
-#endif  // #if defined(CPUARM) || defined(CPUM2560)
+#endif // #if defined(CPUARM) || defined(CPUM2560)
 
 #if defined(ACCURAT_THROTTLE_TIMER)
   #define THR_TRG_TRESHOLD    13      // approximately 10% full throttle