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

Timestamp:

Feb 6, 2025, 8:27:24 AM (3 months ago)

Author:

Zed

Message:

DMA transfer to µSD-card was implemented.

Location:

ctrl/firmware/Main/CubeMX/Core

Files:

• Inc/stm32h7xx_it.h (modified) (1 diff)
• Src/main.c (modified) (4 diffs)
• Src/stm32h7xx_it.c (modified) (4 diffs)

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

@@ -67 +67 @@
 void TIM7_IRQHandler(void);
 void SPI4_IRQHandler(void);
+void MDMA_IRQHandler(void);
 void USART10_IRQHandler(void);
 /* USER CODE BEGIN EFP */

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

@@ -22 +22 @@
 #include "dma.h"
 #include "fatfs.h"
+#include "mdma.h"
 #include "memorymap.h"
 #include "rtc.h"
@@ -105 +106 @@
   /* USER CODE BEGIN Init */
 
-  SCB_DisableDCache();
+  //SCB_DisableDCache();
 
   /* USER CODE END Init */
@@ -124 +125 @@
   MX_GPIO_Init();
   MX_DMA_Init();
+  MX_MDMA_Init();
   MX_RTC_Init();
   MX_SPI4_Init();
@@ -280 +282 @@
 
   HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /** Initializes and configures the Region and the memory to be protected
+  */
+  MPU_InitStruct.Number = MPU_REGION_NUMBER1;
+  MPU_InitStruct.BaseAddress = 0x24000000;
+  MPU_InitStruct.Size = MPU_REGION_SIZE_128KB;
+  MPU_InitStruct.SubRegionDisable = 0x0;
+  MPU_InitStruct.TypeExtField = MPU_TEX_LEVEL1;
+  MPU_InitStruct.AccessPermission = MPU_REGION_FULL_ACCESS;
+  MPU_InitStruct.IsShareable = MPU_ACCESS_NOT_SHAREABLE;
+
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
   /* Enables the MPU */
   HAL_MPU_Enable(MPU_PRIVILEGED_DEFAULT);

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

@@ -25 +25 @@
 
 #include "FreeRTOS.h"
-#include "semphr.h"
+#include "modbus.h"
+//#include "semphr.h"
 
 /* USER CODE END Includes */
@@ -60 +61 @@
 
 /* External variables --------------------------------------------------------*/
+extern MDMA_HandleTypeDef hmdma_mdma_channel0_sdmmc1_end_data_0;
 extern SD_HandleTypeDef hsd1;
 extern DMA_HandleTypeDef hdma_spi2_rx;
@@ -374 +376 @@
 
 /**
+  * @brief This function handles MDMA global interrupt.
+  */
+void MDMA_IRQHandler(void)
+{
+  /* USER CODE BEGIN MDMA_IRQn 0 */
+
+  /* USER CODE END MDMA_IRQn 0 */
+  HAL_MDMA_IRQHandler(&hmdma_mdma_channel0_sdmmc1_end_data_0);
+  /* USER CODE BEGIN MDMA_IRQn 1 */
+
+  /* USER CODE END MDMA_IRQn 1 */
+}
+
+/**
   * @brief This function handles USART10 global interrupt.
   */
@@ -379 +395 @@
 {
   /* USER CODE BEGIN USART10_IRQn 0 */
+  extern modbus_t lb_mbData;
+  MODBUS_UART_IRQHandler(&huart10, &lb_mbData);
+  return;
+
 
   /* USER CODE END USART10_IRQn 0 */