Changeset 36 for trunk/firmware/App/SES/Core

Timestamp:

Oct 20, 2026, 2:17:01 PM (2 weeks ago)

Author:

Zed

Message:

Commiting the project to add SDMMC2 device into FSBL to be able to deal with it correctly in debugger.

Location:

trunk/firmware/App/SES/Core/Tasks

Files:

• Inc/sdmmcTask.h (modified) (1 diff)
• Src/mainTask.cpp (modified) (1 diff)
• Src/sdmmcTask.cpp (modified) (5 diffs)

trunk/firmware/App/SES/Core/Tasks/Inc/sdmmcTask.h

@@ -1 +1 @@
 #ifndef __SDMMCTASK_H
 #define __SDMMCTASK_H
+
+typedef enum SdCardCmd
+{
+    SDMMC_Initialize,
+    SDMMC_Deinitialize,
+} SdCardCmd_t;
 
 #ifdef __cplusplus

trunk/firmware/App/SES/Core/Tasks/Src/mainTask.cpp

@@ -12 +12 @@
 void StartMainTask(void* arg)
 {
+        osDelay(6000U);
         while(1)
         {

trunk/firmware/App/SES/Core/Tasks/Src/sdmmcTask.cpp

@@ -16 +16 @@
     NotPresent,
     Inserted,
-    Initialized,
-    Deinitialized,
-    Error
 };
 
+extern osMessageQueueId_t sdmmcCmdQueueHandle;
+
 constexpr unsigned SD_PRESENCE_SCAN_RATE_ms = 50U;
-constexpr unsigned MEDIA_CLOSED = 1U;
-constexpr unsigned MEDIA_OPENED = 0U;
 
 CHAR FX_SD_VOLUME_NAME[] = "SDMMC";
@@ -53 +50 @@
                                                         sdLastState = sdCurrentState = SdCardState::Inserted;
                                                         printf("SD-card was inserted\n");
+                                                        SdCardCmd_t msg = SDMMC_Initialize;
+                                                        osStatus_t status = osMessageQueuePut(sdmmcCmdQueueHandle, &msg, 0U, osWaitForever);
+                                                        if (status != osOK) printf("Cannot put SDMMC_INIT message into queue!\n");
                                                 }
                                         }
@@ -63 +63 @@
 
                         case SdCardState::Inserted:
-                                if (HAL_GPIO_ReadPin(SD_PRESENCE_GPIO_Port, SD_PRESENCE_Pin) == SD_PRESENT)
+                                if (HAL_GPIO_ReadPin(SD_PRESENCE_GPIO_Port, SD_PRESENCE_Pin) == SD_NOT_PRESENT)
                                 {
                                         insertionDetectionCnt = 0;
@@ -72 +72 @@
                                                         sdLastState = sdCurrentState = SdCardState::NotPresent;
                                                         printf("SD-card was extracted\n");
+                                                        SdCardCmd_t msg = SDMMC_Deinitialize;
+                                                        osStatus_t status = osMessageQueuePut(sdmmcCmdQueueHandle, &msg, 0U, osWaitForever);
+                                                        if (status != osOK) printf("Cannot put SDMMC_DEINIT message into queue!\n");
                                                 }
                                         }
@@ -80 +83 @@
                                         extractionDetectionCnt = 0;
                                 break;
+                } // switch(sdCurrentState)
 
-                        case SdCardState::Initialized: break;
-                        case SdCardState::Deinitialized: break;
-                        case SdCardState::Error: break;
+                UINT sd_status;
+                SdCardCmd_t msg;
+                osStatus_t status = osMessageQueueGet(sdmmcCmdQueueHandle, &msg, NULL, SD_PRESENCE_SCAN_RATE_ms);   // wait for a message
+                if (status == osOK)
+                {
+                        switch(msg)
+                        {
+                                case SDMMC_Initialize:
+                                        printf("Initializing...\n");
+                                        // Open the SD disk driver
+                                        sd_status =  fx_media_open(&sdio_disk, FX_SD_VOLUME_NAME, fx_stm32_sd_driver, (VOID*)FX_NULL, (VOID*)fx_sd_media_memory, sizeof(fx_sd_media_memory));
+                                        // Check the media open sd_status
+                                        if (sd_status == FX_SUCCESS)
+                                        {
+                                        }
+                                        else
+                                                printf("Cannot open media!\n");
+
+                                        break;
+
+                                case SDMMC_Deinitialize:
+                                        printf("Deinitializing...\n");
+                                        break;
+                        }
                 }
-                osDelay(SD_PRESENCE_SCAN_RATE_ms);
-        }
-
-        /*UINT sd_status = FX_SUCCESS;
-        fx_system_initialize();                                                                                                         // Initialize FileX
-
-        // Open the SD disk driver
-        sd_status =  fx_media_open(&sdio_disk, FX_SD_VOLUME_NAME, fx_stm32_sd_driver, (VOID *)FX_NULL, (VOID *) fx_sd_media_memory, sizeof(fx_sd_media_memory));
-
-        fx_media_close_notify_set(&sdio_disk, [](FX_MEDIA* media_ptr) { UNUSED(media_ptr); media_status = MEDIA_CLOSED; });
-
-
-        // Check the media open sd_status
-        if (sd_status != FX_SUCCESS)
-        {
-                Error_Handler();
-        }*/
-
-
-        while(1)
-        {
-                osDelay(1000U);
-        }
+        } // while(1)
 }