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

Timestamp:

Feb 7, 2025, 1:40:58 PM (3 months ago)

Author:

Zed

Message:

Modbus Master and Slave Hardware were tested.

Location:

ctrl/firmware/Main/CubeMX/Core/Src

Files:

• freertos.c (modified) (6 diffs)
• main.c (modified) (1 diff)
• sdmmc.c (modified) (1 diff)
• stm32h7xx_it.c (modified) (2 diffs)
• usart.c (modified) (1 diff)

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

@@ -23 +23 @@
 #include "main.h"
 #include "cmsis_os.h"
+#include "queue.h"
 
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
-#include "stdio.h"
+#include <stdio.h>
 
 #include "keys_task.h"
 #include "eth_task.h"
+#include "mb_slave_task.h"
+#include "beeper_task.h"
 
 /* USER CODE END Includes */
@@ -43 +46 @@
 /* USER CODE BEGIN PD */
 
-#define KEYS_TASK_STACK_DEPTH_WORDS                               (128U)
-#define ETH_TASK_STACK_DEPTH_WORDS                                (2048U)
+#define KEYS_TASK_STACK_DEPTH_WORDS                                     (128U)
+#define ETH_TASK_STACK_DEPTH_WORDS                                      (2048U)
+#define MB_SLAVE_TASK_STACK_DEPTH_WORDS                         (1024U)
+#define BEEPER_TASK_STACK_DEPTH_WORDS                           (128U)
 
 /* USER CODE END PD */
@@ -56 +61 @@
 /* USER CODE BEGIN Variables */
 
-static StackType_t keysTaskStackBuffer[KEYS_TASK_STACK_DEPTH_WORDS]                             __attribute__((section(".DTCM_RAM")));
-static StackType_t ethTaskStackBuffer[ETH_TASK_STACK_DEPTH_WORDS]                               __attribute__((section(".DTCM_RAM")));
+static StackType_t keysTaskStackBuffer[KEYS_TASK_STACK_DEPTH_WORDS]                                             __attribute__((section(".DTCM_RAM")));
+static StackType_t ethTaskStackBuffer[ETH_TASK_STACK_DEPTH_WORDS]                                               __attribute__((section(".DTCM_RAM")));
+static StackType_t mbSlaveTaskStackBuffer[MB_SLAVE_TASK_STACK_DEPTH_WORDS]                              __attribute__((section(".DTCM_RAM")));
+static StackType_t beeperTaskStackBuffer[BEEPER_TASK_STACK_DEPTH_WORDS]                                 __attribute__((section(".DTCM_RAM")));
+static uint8_t beeperQueueStorageArea[BEEPER_QUEUE_SIZE * BEEPER_QUEUE_ITEM_SIZE]               __attribute__((section(".DTCM_RAM")));
+
 static StaticTask_t keysTaskBuffer;
 static StaticTask_t ethTaskBuffer;
+static StaticTask_t mbSlaveTaskBuffer;
+static StaticTask_t beeperTaskBuffer;
+static StaticQueue_t beeperQueueBuffer;
+
 static const char* const keysTaskName = "ScanKeysTask";
 static const char* const ethTaskName = "EthTask";
+static const char* const mbSlaveTaskName = "MBSlaveTask";
+static const char* const beeperTaskName = "BeeperTask";
+
+
 
 /* USER CODE END Variables */
@@ -133 +150 @@
 
   /* USER CODE BEGIN RTOS_QUEUES */
-  /* add queues, ... */
+
+  beeperQueue = xQueueCreateStatic(BEEPER_QUEUE_SIZE, BEEPER_QUEUE_ITEM_SIZE, beeperQueueStorageArea, &beeperQueueBuffer);
+  if (beeperQueue == NULL) printf("Cannot create Beeper Queue!\n");
+
   /* USER CODE END RTOS_QUEUES */
 
@@ -148 +168 @@
   r = xTaskCreateStatic(ethTaskStart, ethTaskName, ETH_TASK_STACK_DEPTH_WORDS, NULL, 25, ethTaskStackBuffer, &ethTaskBuffer);
   if (r == NULL) printf("Cannot create %s!\n", ethTaskName);
+
+  r = xTaskCreateStatic(mbSlaveTaskStart, mbSlaveTaskName, MB_SLAVE_TASK_STACK_DEPTH_WORDS, NULL, 25, mbSlaveTaskStackBuffer, &mbSlaveTaskBuffer);
+  if (r == NULL) printf("Cannot create %s!\n", mbSlaveTaskName);
+
+  r = xTaskCreateStatic(beeperTaskStart, beeperTaskName, BEEPER_TASK_STACK_DEPTH_WORDS, NULL, 25, beeperTaskStackBuffer, &beeperTaskBuffer);
+  if (r == NULL) printf("Cannot create %s!\n", beeperTaskName);
 
   /* USER CODE END RTOS_THREADS */
@@ -167 +193 @@
 {
   /* USER CODE BEGIN mainTaskStart */
+
+  UNUSED(argument);
+
   /* Infinite loop */
   for(;;)

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

@@ -125 +125 @@
   MX_GPIO_Init();
   MX_DMA_Init();
-  MX_MDMA_Init();
+  //MX_MDMA_Init();
   MX_RTC_Init();
   MX_SPI4_Init();

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

@@ -46 +46 @@
   hsd1.Init.BusWide = SDMMC_BUS_WIDE_4B;
   hsd1.Init.HardwareFlowControl = SDMMC_HARDWARE_FLOW_CONTROL_ENABLE;
-  hsd1.Init.ClockDiv = 1;
+  hsd1.Init.ClockDiv = 2;
   /* USER CODE BEGIN SDMMC1_Init 2 */
 

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

@@ -298 +298 @@
   /* USER CODE BEGIN USART2_IRQn 0 */
 
+  extern modbus_t lb_mbData;
+  MODBUS_UART_IRQHandler(&huart2, &lb_mbData);
+  return;
+
   /* USER CODE END USART2_IRQn 0 */
   HAL_UART_IRQHandler(&huart2);
@@ -395 +399 @@
 {
   /* USER CODE BEGIN USART10_IRQn 0 */
-  extern modbus_t lb_mbData;
-  MODBUS_UART_IRQHandler(&huart10, &lb_mbData);
-  return;
-
+
+  //extern modbus_t lb_mbData;
+  //MODBUS_UART_IRQHandler(&huart10, &lb_mbData);
+  //return;
 
   /* USER CODE END USART10_IRQn 0 */

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

@@ -38 +38 @@
   /* USER CODE BEGIN USART2_Init 0 */
 
+  // This USART is responsible for Modbus Slave operations
+
   /* USER CODE END USART2_Init 0 */