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

Timestamp:

Jan 13, 2025, 11:56:09 AM (3 days ago)

Author:

Zed

Message:

GSM thread was added.

Location:

ctrl/firmware/Main/CubeMX/Core

Files:

• Inc/main.h (modified) (2 diffs)
• Inc/stm32h7xx_hal_conf.h (modified) (1 diff)
• Inc/usart.h (added)
• Src/app_threadx.c (modified) (5 diffs)
• Src/gpio.c (modified) (5 diffs)
• Src/main.c (modified) (3 diffs)
• Src/usart.c (added)

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

@@ -78 +78 @@
 #define RST_DISPLAY_Pin GPIO_PIN_15
 #define RST_DISPLAY_GPIO_Port GPIOE
+#define GSM_PWR_Pin GPIO_PIN_10
+#define GSM_PWR_GPIO_Port GPIOD
 #define SD_DETECT_Pin GPIO_PIN_8
 #define SD_DETECT_GPIO_Port GPIOA
@@ -92 +94 @@
 #define TX2_LED_Pin GPIO_PIN_13
 #define TX2_LED_GPIO_Port GPIOG
+#define BUZZER_Pin GPIO_PIN_15
+#define BUZZER_GPIO_Port GPIOG
 
 /* USER CODE BEGIN Private defines */

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

@@ -76 +76 @@
 /* #define HAL_SWPMI_MODULE_ENABLED   */
 #define HAL_TIM_MODULE_ENABLED
-/* #define HAL_UART_MODULE_ENABLED   */
+#define HAL_UART_MODULE_ENABLED
 /* #define HAL_USART_MODULE_ENABLED   */
 /* #define HAL_IRDA_MODULE_ENABLED   */

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

@@ -29 +29 @@
 
 #include "keys_thread.h"
+#include "gsm_thread.h"
 
 /* USER CODE END Includes */
@@ -40 +41 @@
 /* USER CODE BEGIN PD */
 
-#define MAIN_THREAD_STACK_SIZE_BYTES    (1024U)
+#define KEYS_THREAD_STACK_SIZE_BYTES    (1024U)
+#define GSM_THREAD_STACK_SIZE_BYTES             (1024U)
 
 /* USER CODE END PD */
@@ -53 +55 @@
 
 TX_THREAD scan_keys_thread_ptr;
+TX_THREAD gsm_thread_ptr;
 
 /* USER CODE END PV */
@@ -72 +75 @@
 
   TX_BYTE_POOL *byte_pool = (TX_BYTE_POOL*)memory_ptr;
-  VOID *pointer;
+  VOID *keys_thread_pointer;
+  VOID *gsm_thread_pointer;
 
   /* USER CODE END App_ThreadX_MEM_POOL */
@@ -79 +83 @@
 
   // Allocate the stack for main thread
-  ret = tx_byte_allocate(byte_pool, &pointer, MAIN_THREAD_STACK_SIZE_BYTES,
-                                                 TX_NO_WAIT);
+  ret = tx_byte_allocate(byte_pool, &keys_thread_pointer, KEYS_THREAD_STACK_SIZE_BYTES, TX_NO_WAIT);
   if (ret != TX_SUCCESS) { printf("Cannot allocate bytes of memory!\n"); return ret; }
 
-  ret = tx_thread_create(&scan_keys_thread_ptr, "Scan Keys Thread", scanKeysThread, 0x0001,
-                                                pointer, MAIN_THREAD_STACK_SIZE_BYTES, TX_MAX_PRIORITIES-1, TX_MAX_PRIORITIES-1,
-                                                TX_NO_TIME_SLICE, TX_AUTO_START);
-  if (ret != TX_SUCCESS) { printf("Cannot create Scan Keys Thread!\n"); return ret; }
+  char* scan_keys_thread_name = "Scan Keys Thread";
+  ret = tx_thread_create(&scan_keys_thread_ptr, scan_keys_thread_name, scanKeysThread, 0x0001,  keys_thread_pointer, KEYS_THREAD_STACK_SIZE_BYTES, TX_MAX_PRIORITIES-1, TX_MAX_PRIORITIES-1, TX_NO_TIME_SLICE, TX_AUTO_START);
+  if (ret != TX_SUCCESS) { printf("Cannot create %s!\n", scan_keys_thread_name); return ret; }
+
+
+
+  ret = tx_byte_allocate(byte_pool, &gsm_thread_pointer, GSM_THREAD_STACK_SIZE_BYTES, TX_NO_WAIT);
+  if (ret != TX_SUCCESS) { printf("Cannot allocate bytes of memory!\n"); return ret; }
+
+  char* gsm_thread_name = "GSM Thread";
+  ret = tx_thread_create(&gsm_thread_ptr, gsm_thread_name, gsmThread, 0x0001,   gsm_thread_pointer, GSM_THREAD_STACK_SIZE_BYTES, TX_MAX_PRIORITIES-1, TX_MAX_PRIORITIES-1, TX_NO_TIME_SLICE, TX_AUTO_START);
+  if (ret != TX_SUCCESS) { printf("Cannot create %s!\n", gsm_thread_name); return ret; }
+
+
 
   /* USER CODE END App_ThreadX_Init */

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

@@ -65 +65 @@
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(GPIOG, POWER_5V_EN_Pin|POWER_10V_EN_Pin|ERROR_LED_Pin|CHARGE_LED_Pin
-                          |RX2_LED_Pin|RX1_LED_Pin|TX2_LED_Pin, GPIO_PIN_RESET);
+                          |RX2_LED_Pin|RX1_LED_Pin|TX2_LED_Pin|BUZZER_Pin, GPIO_PIN_RESET);
 
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(OUTPUT_ON_LED_GPIO_Port, OUTPUT_ON_LED_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(GPIOD, GSM_PWR_Pin|OUTPUT_ON_LED_Pin, GPIO_PIN_RESET);
 
   /*Configure GPIO pins : PE2 PE3 PE4 PE5
@@ -141 +141 @@
 
   /*Configure GPIO pins : POWER_5V_EN_Pin POWER_10V_EN_Pin ERROR_LED_Pin CHARGE_LED_Pin
-                           RX2_LED_Pin RX1_LED_Pin TX2_LED_Pin */
+                           RX2_LED_Pin RX1_LED_Pin TX2_LED_Pin BUZZER_Pin */
   GPIO_InitStruct.Pin = POWER_5V_EN_Pin|POWER_10V_EN_Pin|ERROR_LED_Pin|CHARGE_LED_Pin
-                          |RX2_LED_Pin|RX1_LED_Pin|TX2_LED_Pin;
+                          |RX2_LED_Pin|RX1_LED_Pin|TX2_LED_Pin|BUZZER_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
@@ -149 +149 @@
   HAL_GPIO_Init(GPIOG, &GPIO_InitStruct);
 
-  /*Configure GPIO pins : PD8 PD9 PD10 PD11
-                           PD12 PD13 PD14 PD15
-                           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_3|GPIO_PIN_4
-                          |GPIO_PIN_5|GPIO_PIN_6;
+  /*Configure GPIO pins : GSM_PWR_Pin OUTPUT_ON_LED_Pin */
+  GPIO_InitStruct.Pin = GSM_PWR_Pin|OUTPUT_ON_LED_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+  HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
+
+  /*Configure GPIO pins : PD11 PD12 PD13 PD14
+                           PD15 PD0 PD1 PD3
+                           PD4 PD5 PD6 */
+  GPIO_InitStruct.Pin = GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14
+                          |GPIO_PIN_15|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;
@@ -162 +167 @@
 
   /*Configure GPIO pins : PG2 PG3 PG4 PG5
-                           PG6 PG7 PG8 PG14
-                           PG15 */
+                           PG6 PG7 PG8 PG14 */
   GPIO_InitStruct.Pin = GPIO_PIN_2|GPIO_PIN_3|GPIO_PIN_4|GPIO_PIN_5
-                          |GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8|GPIO_PIN_14
-                          |GPIO_PIN_15;
+                          |GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8|GPIO_PIN_14;
   GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
@@ -177 +180 @@
   HAL_GPIO_Init(SD_DETECT_GPIO_Port, &GPIO_InitStruct);
 
-  /*Configure GPIO pin : OUTPUT_ON_LED_Pin */
-  GPIO_InitStruct.Pin = OUTPUT_ON_LED_Pin;
-  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  HAL_GPIO_Init(OUTPUT_ON_LED_GPIO_Port, &GPIO_InitStruct);
-
 }
 

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

@@ -25 +25 @@
 #include "sdmmc.h"
 #include "spi.h"
+#include "usart.h"
 #include "gpio.h"
 
@@ -109 +110 @@
 
   /* USER CODE BEGIN SysInit */
-
+#define MX_SDMMC1_SD_Init DoNothing
   /* USER CODE END SysInit */
-#define MX_SDMMC1_SD_Init DoNothing
+
   /* Initialize all configured peripherals */
   MX_GPIO_Init();
@@ -118 +119 @@
   MX_SPI4_Init();
   MX_SDMMC1_SD_Init();
+  MX_USART3_UART_Init();
   /* USER CODE BEGIN 2 */
 #undef MX_SDMMC1_SD_Init