move delete profile lists files to SCPI thread

Author: mvladic

src/eez/apps/psu/profile.cpp

@@ -31,8 +31,12 @@
 #if OPTION_SD_CARD
 #include <eez/apps/psu/sd_card.h>
 #endif
+#include <eez/scpi/scpi.h>
 
 namespace eez {
+
+using namespace scpi;
+
 namespace psu {
 namespace profile {
 
@@ -113,6 +117,15 @@ void deleteProfileList(Channel &channel, int location) {
     }
 }
 
+void deleteProfileLists(int location) {
+#if OPTION_SD_CARD
+    for (int i = 0; i < CH_NUM; ++i) {
+        Channel &channel = Channel::get(i);
+        deleteProfileList(channel, location);
+    }
+#endif
+}
+
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -537,12 +550,11 @@ bool deleteLocation(int location) {
         }
         result = persist_conf::saveProfile(location, &profile);
 
-#if OPTION_SD_CARD
-        for (int i = 0; i < CH_NUM; ++i) {
-            Channel &channel = Channel::get(i);
-            deleteProfileList(channel, location);
-        }
-#endif
+    if (osThreadGetId() != g_scpiTaskHandle) {
+        osMessagePut(g_scpiMessageQueueId, SCPI_QUEUE_MESSAGE(SCPI_QUEUE_MESSAGE_TARGET_NONE, SCPI_QUEUE_MESSAGE_TYPE_DELETE_PROFILE_LISTS, location), osWaitForever);
+        return true;
+    }
+
     }
     return result;
 }

src/eez/apps/psu/profile.h

@@ -113,6 +113,8 @@ bool saveAtLocation(int location, const char *name = nullptr);
 
 bool saveToFile(const char *filePath, int *err);
 
+void deleteProfileLists(int location);
+
 bool deleteLocation(int location);
 bool deleteAll();
 

src/eez/scpi/scpi.cpp

@@ -100,6 +100,8 @@ void oneIter() {
                 if (!eez::psu::list::saveList(param, &g_listFilePath[param][0], &err)) {
                     generateError(err);
                 }
+            } else if (type == SCPI_QUEUE_MESSAGE_TYPE_DELETE_PROFILE_LISTS) {
+                profile::deleteProfileLists(param);
             }
         }      
     } else {

src/eez/scpi/scpi.h

@@ -49,6 +49,7 @@ extern osMessageQId g_scpiMessageQueueId;
 #define SCPI_QUEUE_ETHERNET_MESSAGE(type, param) SCPI_QUEUE_MESSAGE(SCPI_QUEUE_MESSAGE_TARGET_ETHERNET, type, param)
 
 #define SCPI_QUEUE_MESSAGE_TYPE_SAVE_LIST 1
+#define SCPI_QUEUE_MESSAGE_TYPE_DELETE_PROFILE_LISTS 2
 
 extern char g_listFilePath[CH_MAX][MAX_PATH_LENGTH];