sd card fixes

eez-open · Oct 3, 2019 · 0c8c27f · 0c8c27f
1 parent f34f093
commit 0c8c27f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/modular-psu-firmware.eez-project b/modular-psu-firmware.eez-project
@@ -26853,7 +26853,7 @@
                   {
                     "type": "Text",
                     "style": {
-                      "inheritFrom": "event_info",
+                      "inheritFrom": "value_S",
                       "padding": 0
                     },
                     "activeStyle": {
@@ -26869,7 +26869,7 @@
                   {
                     "type": "Text",
                     "style": {
-                      "inheritFrom": "value_S",
+                      "inheritFrom": "event_error",
                       "padding": 0
                     },
                     "activeStyle": {

diff --git a/src/eez/apps/psu/list_program.cpp b/src/eez/apps/psu/list_program.cpp
@@ -214,7 +214,7 @@ bool loadList(int iChannel, const char *filePath, int *err) {
         return false;
     }
 
-    if (!sd_card::exists(filePath, NULL)) {
+    if (!sd_card::exists(filePath, err)) {
         if (err) {
             *err = SCPI_ERROR_LIST_NOT_FOUND;
         }

diff --git a/src/eez/apps/psu/sd_card.cpp b/src/eez/apps/psu/sd_card.cpp
@@ -80,7 +80,8 @@ void unmount() {
 	FATFS_UnLinkDriver(SDPath);
 #endif
 	g_mounted = false;
-	g_testResult = TEST_SKIPPED;
+    g_lastError = SCPI_ERROR_MISSING_MASS_MEDIA;
+	g_testResult = TEST_FAILED;
 	setQuesBits(QUES_MMEM, false);
 }
 
@@ -91,7 +92,8 @@ void init() {
 	if (g_sdCardIsPresent) {
 		mount();
 	} else {
-		g_testResult = TEST_SKIPPED;
+        g_lastError = SCPI_ERROR_MISSING_MASS_MEDIA;
+        g_testResult = TEST_FAILED;
 	}
 #endif
 
@@ -107,7 +109,7 @@ bool test() {
 void tick() {
 #if defined(EEZ_PLATFORM_STM32)
 	g_sdCardIsPresent = HAL_GPIO_ReadPin(SD_DETECT_GPIO_Port, SD_DETECT_Pin) == GPIO_PIN_RESET ? 1 : 0;
-	if (g_sdCardIsPresent && !g_mounted && g_testResult == TEST_SKIPPED) {
+	if (g_sdCardIsPresent && !g_mounted && g_lastError == SCPI_ERROR_MISSING_MASS_MEDIA) {
 		mount();
 	}
 #endif
@@ -128,16 +130,15 @@ void onSdDetectInterruptHandler() {
 
 bool isMounted(int *err) {
 	if (g_mounted) {
-		*err = SCPI_RES_OK;
+        if (err != nullptr) {
+            *err = SCPI_RES_OK;
+        }
 	    return true;
 	}
 
-	if (g_testResult == TEST_SKIPPED) {
-		*err = SCPI_ERROR_MISSING_MASS_MEDIA;
-		return false;
-	}
-
-	*err = g_lastError;
+    if (err != nullptr) {
+        *err = g_lastError;
+    }
 	return false;
 }