Changeset 65 for ctrl/firmware/Main/CubeMX

Timestamp:

Jan 21, 2025, 11:26:15 AM (4 days ago)

Author:

Zed

Message:

GSM, USB, BLE and GPS are working.

Location:

ctrl/firmware/Main/CubeMX

Files:

• Core/Src/app_threadx.c (modified) (5 diffs)
• Core/Src/stm32h7xx_it.c (modified) (2 diffs)
• Core/Src/usart.c (modified) (1 diff)
• Middlewares/ST/threadx/common/inc/tx_queue.h (added)
• Middlewares/ST/threadx/common/src/tx_queue_cleanup.c (added)
• Middlewares/ST/threadx/common/src/tx_queue_create.c (added)
• Middlewares/ST/threadx/common/src/tx_queue_receive.c (added)
• Middlewares/ST/threadx/common/src/tx_queue_send.c (added)
• Middlewares/ST/threadx/common/src/txe_queue_create.c (added)
• Middlewares/ST/threadx/common/src/txe_queue_receive.c (added)
• Middlewares/ST/threadx/common/src/txe_queue_send.c (added)
• charger.ioc (modified) (2 diffs)

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

@@ -28 +28 @@
 #include <stdio.h>
 
+#include "tx_queue.h"
+
 #include "keys_thread.h"
 #include "gsm_thread.h"
+#include "gsm_rx_thread.h"
 
 /* USER CODE END Includes */
@@ -41 +44 @@
 /* USER CODE BEGIN PD */
 
-#define KEYS_THREAD_STACK_SIZE_BYTES    (1024U)
-#define GSM_THREAD_STACK_SIZE_BYTES             (1024U)
+#define KEYS_THREAD_STACK_SIZE_BYTES            (1024U)
+#define GSM_THREAD_STACK_SIZE_BYTES                     (1024U)
+#define GSM_RX_THREAD_STACK_SIZE_BYTES          (1024U)
 
 /* USER CODE END PD */
@@ -56 +60 @@
 TX_THREAD scan_keys_thread_ptr;
 TX_THREAD gsm_thread_ptr;
+TX_THREAD gsm_rx_thread_ptr;
 
 /* USER CODE END PV */
@@ -77 +82 @@
   VOID *keys_thread_pointer;
   VOID *gsm_thread_pointer;
+  VOID *gsm_rx_thread_pointer;
 
   /* USER CODE END App_ThreadX_MEM_POOL */
@@ -98 +104 @@
   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; }
+
+  // Allocate the stack for gsm send thread
+  ret = tx_byte_allocate(byte_pool, &gsm_rx_thread_pointer, GSM_RX_THREAD_STACK_SIZE_BYTES, TX_NO_WAIT);
+  if (ret != TX_SUCCESS) { printf("Cannot allocate bytes of memory!\n"); return ret; }
+
+  char* gsm_rx_thread_name = "GSM RX Thread";
+  ret = tx_thread_create(&gsm_rx_thread_ptr, gsm_rx_thread_name, gsmRxThread, 0x0001,   gsm_rx_thread_pointer, GSM_RX_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_rx_thread_name); return ret; }
 
 

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

@@ -24 +24 @@
 /* USER CODE BEGIN Includes */
 
-#include "gsm_thread.h"
+#include "gsm_rx_thread.h"
 
 /* USER CODE END Includes */
@@ -273 +273 @@
 void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Size)
 {
-        if (huart->Instance == USART3) gsmUnitSentData(Size);
+        if (huart->Instance == USART3) gsmRxData(Size);
 }
 

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

@@ -130 +130 @@
     hdma_usart3_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
     hdma_usart3_rx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
-    hdma_usart3_rx.Init.Mode = DMA_CIRCULAR;
+    hdma_usart3_rx.Init.Mode = DMA_NORMAL;
     hdma_usart3_rx.Init.Priority = DMA_PRIORITY_LOW;
     hdma_usart3_rx.Init.FIFOMode = DMA_FIFOMODE_DISABLE;

ctrl/firmware/Main/CubeMX/charger.ioc

@@ -3 +3 @@
 CAD.pinconfig=
 CAD.provider=
+CORTEX_M7.AccessPermission_S-Cortex_Memory_Protection_Unit_Region1_Settings_S=MPU_REGION_FULL_ACCESS
+CORTEX_M7.BaseAddress_S-Cortex_Memory_Protection_Unit_Region1_Settings_S=0x30000000
 CORTEX_M7.CPU_DCache=Enabled
 CORTEX_M7.CPU_ICache=Enabled
-CORTEX_M7.IPParameters=default_mode_Activation,CPU_ICache,CPU_DCache
+CORTEX_M7.DisableExec_S-Cortex_Memory_Protection_Unit_Region1_Settings_S=MPU_INSTRUCTION_ACCESS_DISABLE
+CORTEX_M7.Enable_S-Cortex_Memory_Protection_Unit_Region1_Settings_S=MPU_REGION_ENABLE
+CORTEX_M7.IPParameters=default_mode_Activation,CPU_ICache,CPU_DCache,Enable_S-Cortex_Memory_Protection_Unit_Region1_Settings_S,BaseAddress_S-Cortex_Memory_Protection_Unit_Region1_Settings_S,Size_S-Cortex_Memory_Protection_Unit_Region1_Settings_S,AccessPermission_S-Cortex_Memory_Protection_Unit_Region1_Settings_S,DisableExec_S-Cortex_Memory_Protection_Unit_Region1_Settings_S,IsShareable_S-Cortex_Memory_Protection_Unit_Region1_Settings_S
+CORTEX_M7.IsShareable_S-Cortex_Memory_Protection_Unit_Region1_Settings_S=MPU_ACCESS_SHAREABLE
+CORTEX_M7.Size_S-Cortex_Memory_Protection_Unit_Region1_Settings_S=MPU_REGION_SIZE_1KB
 CORTEX_M7.default_mode_Activation=1
 Dma.Request0=SPI4_TX
@@ -35 +41 @@
 Dma.USART3_RX.1.MemDataAlignment=DMA_MDATAALIGN_BYTE
 Dma.USART3_RX.1.MemInc=DMA_MINC_ENABLE
-Dma.USART3_RX.1.Mode=DMA_CIRCULAR
+Dma.USART3_RX.1.Mode=DMA_NORMAL
 Dma.USART3_RX.1.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
 Dma.USART3_RX.1.PeriphInc=DMA_PINC_DISABLE