profiles handling redesign #3

eez-open · Feb 9, 2020 · 2c81ab5 · 2c81ab5
1 parent 0183651
commit 2c81ab5
Show file tree

Hide file tree

Showing 6 changed files with 1,049 additions and 954 deletions.
diff --git a/src/eez/firmware.cpp b/src/eez/firmware.cpp
@@ -324,6 +324,13 @@ void shutdown() {
 
     g_shutdownInProgress = true;
 
+    // shutdown SCPI thread
+    using namespace eez::scpi;
+    osMessagePut(g_scpiMessageQueueId, SCPI_QUEUE_MESSAGE(SCPI_QUEUE_MESSAGE_TARGET_NONE, SCPI_QUEUE_MESSAGE_TYPE_SHUTDOWN, 0), osWaitForever);
+    do {
+        osDelay(10);
+    } while (isThreadAlive());
+
     profile::shutdownSave();
 
     if (psu::isPowerUp()) {
@@ -332,13 +339,6 @@ void shutdown() {
 
     osDelay(50);
 
-    // shutdown SCPI thread
-    using namespace eez::scpi;
-    osMessagePut(g_scpiMessageQueueId, SCPI_QUEUE_MESSAGE(SCPI_QUEUE_MESSAGE_TARGET_NONE, SCPI_QUEUE_MESSAGE_TYPE_SHUTDOWN, 0), osWaitForever);
-    do {
-        osDelay(10);
-    } while (isThreadAlive());
-
     // save on-time counters
     persist_conf::writeTotalOnTime(ontime::g_mcuCounter.getType(), ontime::g_mcuCounter.getTotalTime());
     for (int slotIndex = 0; slotIndex < NUM_SLOTS; slotIndex++) {