Changeset 51 for ctrl/firmware/Main/CubeMX/Core

Timestamp:

Dec 6, 2024, 11:57:29 AM (6 weeks ago)

Author:

Zed

Message:

SDMMC low level driver was added.

Location:

ctrl/firmware/Main/CubeMX/Core

Files:

• Inc/sdmmc.h (added)
• Inc/stm32h7xx_hal_conf.h (modified) (1 diff)
• Inc/stm32h7xx_it.h (modified) (1 diff)
• Src/gpio.c (modified) (2 diffs)
• Src/main.c (modified) (3 diffs)
• Src/sdmmc.c (added)
• Src/spi.c (modified) (1 diff)
• Src/stm32h7xx_it.c (modified) (2 diffs)

ctrl/firmware/Main/CubeMX/Core/Inc/stm32h7xx_hal_conf.h

@@ -70 +70 @@
 #define HAL_RTC_MODULE_ENABLED
 /* #define HAL_SAI_MODULE_ENABLED   */
-/* #define HAL_SD_MODULE_ENABLED   */
+#define HAL_SD_MODULE_ENABLED
 /* #define HAL_MMC_MODULE_ENABLED   */
 /* #define HAL_SPDIFRX_MODULE_ENABLED   */

ctrl/firmware/Main/CubeMX/Core/Inc/stm32h7xx_it.h

@@ -57 +57 @@
 void SysTick_Handler(void);
 void DMA1_Stream0_IRQHandler(void);
+void SDMMC1_IRQHandler(void);
 void SPI4_IRQHandler(void);
 /* USER CODE BEGIN EFP */

ctrl/firmware/Main/CubeMX/Core/Src/gpio.c

@@ -86 +86 @@
   /*Configure GPIO pins : PC13 PC0 PC1 PC2
                            PC3 PC4 PC5 PC6
-                           PC7 PC8 PC9 PC10
-                           PC11 PC12 */
+                           PC7 */
   GPIO_InitStruct.Pin = GPIO_PIN_13|GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2
                           |GPIO_PIN_3|GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_6
-                          |GPIO_PIN_7|GPIO_PIN_8|GPIO_PIN_9|GPIO_PIN_10
-                          |GPIO_PIN_11|GPIO_PIN_12;
+                          |GPIO_PIN_7;
   GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
@@ -144 +142 @@
   /*Configure GPIO pins : PD8 PD9 PD10 PD11
                            PD12 PD13 PD14 PD15
-                           PD0 PD1 PD2 PD3
-                           PD4 PD5 PD6 */
+                           PD0 PD1 PD3 PD4
+                           PD5 PD6 */
   GPIO_InitStruct.Pin = GPIO_PIN_8|GPIO_PIN_9|GPIO_PIN_10|GPIO_PIN_11
                           |GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14|GPIO_PIN_15
-                          |GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_3
-                          |GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_6;
+                          |GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_3|GPIO_PIN_4
+                          |GPIO_PIN_5|GPIO_PIN_6;
   GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
   GPIO_InitStruct.Pull = GPIO_NOPULL;

ctrl/firmware/Main/CubeMX/Core/Src/main.c

@@ -22 +22 @@
 #include "memorymap.h"
 #include "rtc.h"
+#include "sdmmc.h"
 #include "spi.h"
 #include "gpio.h"
@@ -114 +115 @@
   MX_RTC_Init();
   MX_SPI4_Init();
+  MX_SDMMC1_SD_Init();
   /* USER CODE BEGIN 2 */
 
@@ -170 +172 @@
   RCC_OscInitStruct.PLL.PLLN = 40;
   RCC_OscInitStruct.PLL.PLLP = 2;
-  RCC_OscInitStruct.PLL.PLLQ = 2;
+  RCC_OscInitStruct.PLL.PLLQ = 4;
   RCC_OscInitStruct.PLL.PLLR = 2;
   RCC_OscInitStruct.PLL.PLLRGE = RCC_PLL1VCIRANGE_2;

ctrl/firmware/Main/CubeMX/Core/Src/spi.c

@@ -85 +85 @@
   */
     PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SPI4;
-    PeriphClkInitStruct.PLL2.PLL2M = 3;
-    PeriphClkInitStruct.PLL2.PLL2N = 40;
-    PeriphClkInitStruct.PLL2.PLL2P = 2;
-    PeriphClkInitStruct.PLL2.PLL2Q = 11;
-    PeriphClkInitStruct.PLL2.PLL2R = 2;
-    PeriphClkInitStruct.PLL2.PLL2RGE = RCC_PLL2VCIRANGE_3;
-    PeriphClkInitStruct.PLL2.PLL2VCOSEL = RCC_PLL2VCOWIDE;
-    PeriphClkInitStruct.PLL2.PLL2FRACN = 0;
-    PeriphClkInitStruct.Spi45ClockSelection = RCC_SPI45CLKSOURCE_PLL2;
+    PeriphClkInitStruct.Spi45ClockSelection = RCC_SPI45CLKSOURCE_HSE;
     if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
     {

ctrl/firmware/Main/CubeMX/Core/Src/stm32h7xx_it.c

@@ -56 +56 @@
 
 /* External variables --------------------------------------------------------*/
+extern SD_HandleTypeDef hsd1;
 extern DMA_HandleTypeDef hdma_spi4_tx;
 extern SPI_HandleTypeDef hspi4;
@@ -215 +216 @@
 
 /**
+  * @brief This function handles SDMMC1 global interrupt.
+  */
+void SDMMC1_IRQHandler(void)
+{
+  /* USER CODE BEGIN SDMMC1_IRQn 0 */
+
+  /* USER CODE END SDMMC1_IRQn 0 */
+  HAL_SD_IRQHandler(&hsd1);
+  /* USER CODE BEGIN SDMMC1_IRQn 1 */
+
+  /* USER CODE END SDMMC1_IRQn 1 */
+}
+
+/**
   * @brief This function handles SPI4 global interrupt.
   */