#48

eez-open · Aug 28, 2020 · 90a5502 · 90a5502
1 parent 0fde019
commit 90a5502
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/src/eez/modules/psu/profile.cpp b/src/eez/modules/psu/profile.cpp
@@ -622,7 +622,28 @@ static void saveState(Parameters &profile, List *lists) {
     profile.flags.isValid = true;
 }
 
+static struct {
+    Parameters *profile;
+    List *lists;
+    int recallOptions;
+    int *err;
+    bool result;
+} g_recallStateParams;
+
+void recallStateFromPsuThread() {
+    g_recallStateParams.result = recallState(*g_recallStateParams.profile, g_recallStateParams.lists, g_recallStateParams.recallOptions, g_recallStateParams.err);
+}
+
 static bool recallState(Parameters &profile, List *lists, int recallOptions, int *err) {
+    if (g_isBooted && !isPsuThread()) {
+        g_recallStateParams.profile = &profile;
+        g_recallStateParams.lists = lists;
+        g_recallStateParams.recallOptions = recallOptions;
+        g_recallStateParams.err= err;
+        sendMessageToPsu(PSU_MESSAGE_RECALL_STATE);
+        return g_recallStateParams.result;
+    }
+
     if (!(recallOptions & RECALL_OPTION_IGNORE_POWER)) {
         if (profile.flags.powerIsUp) {
             if (!powerUp()) {

diff --git a/src/eez/modules/psu/profile.h b/src/eez/modules/psu/profile.h
@@ -84,6 +84,8 @@ bool recallFromLocation(int location);
 bool recallFromLocation(int location, int recallOptions, bool showProgress, int *err);
 bool recallFromFile(const char *filePath, int recallOptions, bool showProgress, int *err);
 
+void recallStateFromPsuThread();
+
 bool saveToLocation(int location);
 bool saveToLocation(int location, const char *name, bool showProgress, int *err);
 bool saveToFile(const char *filePath, bool showProgress, int *err);

diff --git a/src/eez/modules/psu/psu.cpp b/src/eez/modules/psu/psu.cpp
@@ -542,6 +542,8 @@ void onThreadMessage(uint8_t type, uint32_t param) {
         bp3c::flash_slave::doStart();
     } else if (type == PSU_MESSAGE_FLASH_SLAVE_LEAVE_BOOTLOADER_MODE) {
         bp3c::flash_slave::leaveBootloaderMode();
+    } else if (type == PSU_MESSAGE_RECALL_STATE) {
+        profile::recallStateFromPsuThread();
     }
 }
 

diff --git a/src/eez/tasks.h b/src/eez/tasks.h
@@ -48,7 +48,8 @@ enum HighPriorityThreadMessage {
     PSU_MESSAGE_CALIBRATION_SELECT_CURRENT_RANGE,
     PSU_MESSAGE_CALIBRATION_STOP,
     PSU_MESSAGE_FLASH_SLAVE_START,
-    PSU_MESSAGE_FLASH_SLAVE_LEAVE_BOOTLOADER_MODE
+    PSU_MESSAGE_FLASH_SLAVE_LEAVE_BOOTLOADER_MODE,
+    PSU_MESSAGE_RECALL_STATE
 };
 
 enum LowPriorityThreadMessage {