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

Timestamp:

Jan 29, 2025, 1:36:43 PM (3 months ago)

Author:

Zed

Message:

FatFs? with DMA were implemented.

Location:

ctrl/firmware/Main/CubeMX/Core/Src

Files:

• freertos.c (modified) (5 diffs)
• main.c (modified) (2 diffs)
• sdmmc.c (modified) (2 diffs)

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

@@ -27 +27 @@
 /* USER CODE BEGIN Includes */
 
+#include "stdio.h"
+
 #include "keys_task.h"
 
@@ -40 +42 @@
 /* USER CODE BEGIN PD */
 
+#define KEYS_TASK_STACK_DEPTH_WORDS                               (128U)
+
 /* USER CODE END PD */
 
@@ -50 +54 @@
 /* USER CODE BEGIN Variables */
 
-const uint16_t KEYS_TASK_STACK_DEPTH_WORDS = 128U;
+static StackType_t keysTaskStackBuffer[KEYS_TASK_STACK_DEPTH_WORDS]                             __attribute__((section(".DTCM_RAM")));
+static StaticTask_t keysTaskBuffer;
+static const char* const keysTaskName = "ScanKeysTask";
 
 /* USER CODE END Variables */
 /* Definitions for mainTask */
 osThreadId_t mainTaskHandle;
-uint32_t mainTaskBuffer[ 128 ];
+uint32_t mainTaskBuffer[ 512 ];
 osStaticThreadDef_t mainTaskControlBlock;
 const osThreadAttr_t mainTask_attributes = {
@@ -73 +79 @@
 void mainTaskStart(void *argument);
 
-//void MX_FREERTOS_Init(void); /* (MISRA C 2004 rule 8.1) */
+void MX_FREERTOS_Init(void); /* (MISRA C 2004 rule 8.1) */
 
 /* Hook prototypes */
@@ -132 +138 @@
   /* add threads, ... */
 
-  BaseType_t r = xTaskCreate(keysTaskStart, "ScanKeysTask", KEYS_TASK_STACK_DEPTH_WORDS, NULL, 0, NULL);
+  TaskHandle_t r = xTaskCreateStatic(keysTaskStart, keysTaskName, KEYS_TASK_STACK_DEPTH_WORDS, NULL, 25, keysTaskStackBuffer, &keysTaskBuffer);
+  if (r == NULL) printf("Cannot create %s!\n", keysTaskName);
 
   /* USER CODE END RTOS_THREADS */

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

@@ -21 +21 @@
 #include "cmsis_os.h"
 #include "dma.h"
+#include "fatfs.h"
 #include "memorymap.h"
 #include "rtc.h"
@@ -123 +124 @@
   MX_TIM3_Init();
   MX_TIM8_Init();
+  MX_FATFS_Init();
   /* USER CODE BEGIN 2 */
 

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

@@ -47 +47 @@
   hsd1.Init.HardwareFlowControl = SDMMC_HARDWARE_FLOW_CONTROL_ENABLE;
   hsd1.Init.ClockDiv = 0;
-  if (HAL_SD_Init(&hsd1) != HAL_OK)
-  {
-    Error_Handler();
-  }
   /* USER CODE BEGIN SDMMC1_Init 2 */
 
@@ -106 +102 @@
 
     /* SDMMC1 interrupt Init */
-    HAL_NVIC_SetPriority(SDMMC1_IRQn, 5, 0);
+    HAL_NVIC_SetPriority(SDMMC1_IRQn, 15, 0);
     HAL_NVIC_EnableIRQ(SDMMC1_IRQn);
   /* USER CODE BEGIN SDMMC1_MspInit 1 */