Ignore:
Timestamp:
Jan 15, 2025, 4:04:20 PM (9 hours ago)
Author:
Zed
Message:

USART3 TX DMA is working.

Location:
ctrl/firmware/Main/CubeMX
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r63 r64  
    5454void DebugMon_Handler(void);
    5555void DMA1_Stream0_IRQHandler(void);
     56void DMA1_Stream1_IRQHandler(void);
     57void DMA1_Stream2_IRQHandler(void);
    5658void USART3_IRQHandler(void);
    5759void SDMMC1_IRQHandler(void);

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

    r61 r64  
    8282  /* USER CODE BEGIN App_ThreadX_Init */
    8383
    84   // Allocate the stack for main thread
     84  // Allocate the stack for key thread
    8585  ret = tx_byte_allocate(byte_pool, &keys_thread_pointer, KEYS_THREAD_STACK_SIZE_BYTES, TX_NO_WAIT);
    8686  if (ret != TX_SUCCESS) { printf("Cannot allocate bytes of memory!\n"); return ret; }
    8787
    8888  char* scan_keys_thread_name = "Scan Keys Thread";
    89   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);
     89  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);
    9090  if (ret != TX_SUCCESS) { printf("Cannot create %s!\n", scan_keys_thread_name); return ret; }
    9191
    9292
    93 
     93  // Allocate the stack for gsm thread
    9494  ret = tx_byte_allocate(byte_pool, &gsm_thread_pointer, GSM_THREAD_STACK_SIZE_BYTES, TX_NO_WAIT);
    9595  if (ret != TX_SUCCESS) { printf("Cannot allocate bytes of memory!\n"); return ret; }

  • ctrl/firmware/Main/CubeMX/Core/Src/dma.c

    r47 r64  
    4747  HAL_NVIC_SetPriority(DMA1_Stream0_IRQn, 0, 0);
    4848  HAL_NVIC_EnableIRQ(DMA1_Stream0_IRQn);
     49  /* DMA1_Stream1_IRQn interrupt configuration */
     50  HAL_NVIC_SetPriority(DMA1_Stream1_IRQn, 0, 0);
     51  HAL_NVIC_EnableIRQ(DMA1_Stream1_IRQn);
     52  /* DMA1_Stream2_IRQn interrupt configuration */
     53  HAL_NVIC_SetPriority(DMA1_Stream2_IRQn, 0, 0);
     54  HAL_NVIC_EnableIRQ(DMA1_Stream2_IRQn);
    4955
    5056}

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

    r63 r64  
    6262extern DMA_HandleTypeDef hdma_spi4_tx;
    6363extern SPI_HandleTypeDef hspi4;
     64extern DMA_HandleTypeDef hdma_usart3_rx;
     65extern DMA_HandleTypeDef hdma_usart3_tx;
    6466extern UART_HandleTypeDef huart3;
    6567extern TIM_HandleTypeDef htim7;
    … …  
    182184
    183185/**
     186  * @brief This function handles DMA1 stream1 global interrupt.
     187  */
     188void DMA1_Stream1_IRQHandler(void)
     189{
     190  /* USER CODE BEGIN DMA1_Stream1_IRQn 0 */
     191
     192  /* USER CODE END DMA1_Stream1_IRQn 0 */
     193  HAL_DMA_IRQHandler(&hdma_usart3_rx);
     194  /* USER CODE BEGIN DMA1_Stream1_IRQn 1 */
     195
     196  /* USER CODE END DMA1_Stream1_IRQn 1 */
     197}
     198
     199/**
     200  * @brief This function handles DMA1 stream2 global interrupt.
     201  */
     202void DMA1_Stream2_IRQHandler(void)
     203{
     204  /* USER CODE BEGIN DMA1_Stream2_IRQn 0 */
     205
     206  /* USER CODE END DMA1_Stream2_IRQn 0 */
     207  HAL_DMA_IRQHandler(&hdma_usart3_tx);
     208  /* USER CODE BEGIN DMA1_Stream2_IRQn 1 */
     209
     210  /* USER CODE END DMA1_Stream2_IRQn 1 */
     211}
     212
     213/**
    184214  * @brief This function handles USART3 global interrupt.
    185215  */
    … …  
    239269/* USER CODE BEGIN 1 */
    240270
    241 void HAL_UART_RxCpltCallback(UART_HandleTypeDef * huart)
    242 {
    243         if (huart->Instance == USART3) gsmUnitSentData();
    244 }
    245 
    246271//------------------------------------------------------------------------------
    247272
     273void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Size)
     274{
     275        if (huart->Instance == USART3) gsmUnitSentData(Size);
     276}
     277
     278//------------------------------------------------------------------------------
     279
     280/*void HAL_UART_RxCpltCallback(UART_HandleTypeDef * huart)
     281{
     282        //if (huart->Instance == USART3) gsmUnitSentData();
     283}*/
     284
     285//------------------------------------------------------------------------------
     286
    248287/* USER CODE END 1 */

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

    r63 r64  
    2626
    2727UART_HandleTypeDef huart3;
     28DMA_HandleTypeDef hdma_usart3_rx;
     29DMA_HandleTypeDef hdma_usart3_tx;
    2830
    2931/* USART3 init function */
    … …  
    119121    HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
    120122
     123    /* USART3 DMA Init */
     124    /* USART3_RX Init */
     125    hdma_usart3_rx.Instance = DMA1_Stream1;
     126    hdma_usart3_rx.Init.Request = DMA_REQUEST_USART3_RX;
     127    hdma_usart3_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
     128    hdma_usart3_rx.Init.PeriphInc = DMA_PINC_DISABLE;
     129    hdma_usart3_rx.Init.MemInc = DMA_MINC_ENABLE;
     130    hdma_usart3_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
     131    hdma_usart3_rx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
     132    hdma_usart3_rx.Init.Mode = DMA_CIRCULAR;
     133    hdma_usart3_rx.Init.Priority = DMA_PRIORITY_LOW;
     134    hdma_usart3_rx.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
     135    if (HAL_DMA_Init(&hdma_usart3_rx) != HAL_OK)
     136    {
     137      Error_Handler();
     138    }
     139
     140    __HAL_LINKDMA(uartHandle,hdmarx,hdma_usart3_rx);
     141
     142    /* USART3_TX Init */
     143    hdma_usart3_tx.Instance = DMA1_Stream2;
     144    hdma_usart3_tx.Init.Request = DMA_REQUEST_USART3_TX;
     145    hdma_usart3_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
     146    hdma_usart3_tx.Init.PeriphInc = DMA_PINC_DISABLE;
     147    hdma_usart3_tx.Init.MemInc = DMA_MINC_ENABLE;
     148    hdma_usart3_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
     149    hdma_usart3_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
     150    hdma_usart3_tx.Init.Mode = DMA_NORMAL;
     151    hdma_usart3_tx.Init.Priority = DMA_PRIORITY_HIGH;
     152    hdma_usart3_tx.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
     153    if (HAL_DMA_Init(&hdma_usart3_tx) != HAL_OK)
     154    {
     155      Error_Handler();
     156    }
     157
     158    __HAL_LINKDMA(uartHandle,hdmatx,hdma_usart3_tx);
     159
    121160    /* USART3 interrupt Init */
    122161    HAL_NVIC_SetPriority(USART3_IRQn, 0, 0);
    … …  
    147186    HAL_GPIO_DeInit(GPIOD, GPIO_PIN_8|GPIO_PIN_9|GPIO_PIN_11|GPIO_PIN_12);
    148187
     188    /* USART3 DMA DeInit */
     189    HAL_DMA_DeInit(uartHandle->hdmarx);
     190    HAL_DMA_DeInit(uartHandle->hdmatx);
     191
    149192    /* USART3 interrupt Deinit */
    150193    HAL_NVIC_DisableIRQ(USART3_IRQn);

  • ctrl/firmware/Main/CubeMX/charger.ioc

    r63 r64  
    88CORTEX_M7.default_mode_Activation=1
    99Dma.Request0=SPI4_TX
    10 Dma.RequestsNb=1
     10Dma.Request1=USART3_RX
     11Dma.Request2=USART3_TX
     12Dma.RequestsNb=3
    1113Dma.SPI4_TX.0.Direction=DMA_MEMORY_TO_PERIPH
    1214Dma.SPI4_TX.0.EventEnable=DISABLE
    … …  
    2729Dma.SPI4_TX.0.SyncRequestNumber=1
    2830Dma.SPI4_TX.0.SyncSignalID=NONE
     31Dma.USART3_RX.1.Direction=DMA_PERIPH_TO_MEMORY
     32Dma.USART3_RX.1.EventEnable=DISABLE
     33Dma.USART3_RX.1.FIFOMode=DMA_FIFOMODE_DISABLE
     34Dma.USART3_RX.1.Instance=DMA1_Stream1
     35Dma.USART3_RX.1.MemDataAlignment=DMA_MDATAALIGN_BYTE
     36Dma.USART3_RX.1.MemInc=DMA_MINC_ENABLE
     37Dma.USART3_RX.1.Mode=DMA_CIRCULAR
     38Dma.USART3_RX.1.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
     39Dma.USART3_RX.1.PeriphInc=DMA_PINC_DISABLE
     40Dma.USART3_RX.1.Polarity=HAL_DMAMUX_REQ_GEN_RISING
     41Dma.USART3_RX.1.Priority=DMA_PRIORITY_LOW
     42Dma.USART3_RX.1.RequestNumber=1
     43Dma.USART3_RX.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,FIFOMode,SignalID,Polarity,RequestNumber,SyncSignalID,SyncPolarity,SyncEnable,EventEnable,SyncRequestNumber
     44Dma.USART3_RX.1.SignalID=NONE
     45Dma.USART3_RX.1.SyncEnable=DISABLE
     46Dma.USART3_RX.1.SyncPolarity=HAL_DMAMUX_SYNC_NO_EVENT
     47Dma.USART3_RX.1.SyncRequestNumber=1
     48Dma.USART3_RX.1.SyncSignalID=NONE
     49Dma.USART3_TX.2.Direction=DMA_MEMORY_TO_PERIPH
     50Dma.USART3_TX.2.EventEnable=DISABLE
     51Dma.USART3_TX.2.FIFOMode=DMA_FIFOMODE_DISABLE
     52Dma.USART3_TX.2.Instance=DMA1_Stream2
     53Dma.USART3_TX.2.MemDataAlignment=DMA_MDATAALIGN_BYTE
     54Dma.USART3_TX.2.MemInc=DMA_MINC_ENABLE
     55Dma.USART3_TX.2.Mode=DMA_NORMAL
     56Dma.USART3_TX.2.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
     57Dma.USART3_TX.2.PeriphInc=DMA_PINC_DISABLE
     58Dma.USART3_TX.2.Polarity=HAL_DMAMUX_REQ_GEN_RISING
     59Dma.USART3_TX.2.Priority=DMA_PRIORITY_HIGH
     60Dma.USART3_TX.2.RequestNumber=1
     61Dma.USART3_TX.2.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,FIFOMode,SignalID,Polarity,RequestNumber,SyncSignalID,SyncPolarity,SyncEnable,EventEnable,SyncRequestNumber
     62Dma.USART3_TX.2.SignalID=NONE
     63Dma.USART3_TX.2.SyncEnable=DISABLE
     64Dma.USART3_TX.2.SyncPolarity=HAL_DMAMUX_SYNC_NO_EVENT
     65Dma.USART3_TX.2.SyncRequestNumber=1
     66Dma.USART3_TX.2.SyncSignalID=NONE
    2967File.Version=6
    3068GPIO.groupedBy=Group By Peripherals
    … …  
    99137NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false
    100138NVIC.DMA1_Stream0_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:true\:true
     139NVIC.DMA1_Stream1_IRQn=true\:0\:0\:false\:false\:true\:true\:false\:true\:true
     140NVIC.DMA1_Stream2_IRQn=true\:0\:0\:false\:false\:true\:true\:false\:true\:true
    101141NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false
    102142NVIC.ForceEnableDMAVector=true
    … …  
    371411STMicroelectronics.X-CUBE-AZRTOS-H7.3.3.0.FileOoSystemJjInterfaces_Checked=true
    372412STMicroelectronics.X-CUBE-AZRTOS-H7.3.3.0.FileXCcFileOoSystemJjFileXJjCore=true
    373 STMicroelectronics.X-CUBE-AZRTOS-H7.3.3.0.IPParameters=TX_APP_MEM_POOL_SIZE,FX_APP_MEM_POOL_SIZE,TX_APP_GENERATE_INIT_CODE,TX_APP_CREATION,TX_ENABLE_STACK_CHECKING,TX_NO_FILEX_POINTER,TX_LOW_POWER,FX_ENABLE_EXFAT,FX_ENABLE_FAULT_TOLERANT,FX_FAULT_TOLERANT,FX_FAULT_TOLERANT_DATA,FX_DRIVER_SD_INIT,TX_TIMER_TICKS_PER_SECOND,ThreadXCcRTOSJjThreadXJjCore,ThreadXCcRTOSJjThreadXJjLowOoPowerOosupport,FileXCcFileOoSystemJjFileXJjCore,InterfacesCcFileOoSystemJjFileXOoSDOointerface
     413STMicroelectronics.X-CUBE-AZRTOS-H7.3.3.0.IPParameters=TX_APP_MEM_POOL_SIZE,FX_APP_MEM_POOL_SIZE,TX_APP_GENERATE_INIT_CODE,TX_APP_CREATION,TX_ENABLE_STACK_CHECKING,TX_NO_FILEX_POINTER,TX_LOW_POWER,FX_ENABLE_EXFAT,FX_ENABLE_FAULT_TOLERANT,FX_FAULT_TOLERANT,FX_FAULT_TOLERANT_DATA,FX_DRIVER_SD_INIT,TX_TIMER_TICKS_PER_SECOND,ThreadXCcRTOSJjThreadXJjCore,ThreadXCcRTOSJjThreadXJjLowOoPowerOosupport,FileXCcFileOoSystemJjFileXJjCore,InterfacesCcFileOoSystemJjFileXOoSDOointerface,TX_APP_MSG_QUEUE_CREATION,TX_MSG_QUEUE_NAME,TX_NB_MSG
    374414STMicroelectronics.X-CUBE-AZRTOS-H7.3.3.0.InterfacesCcFileOoSystemJjFileXOoSDOointerface=true
    375415STMicroelectronics.X-CUBE-AZRTOS-H7.3.3.0.RTOSJjThreadX_Checked=true
    … …  
    377417STMicroelectronics.X-CUBE-AZRTOS-H7.3.3.0.TX_APP_GENERATE_INIT_CODE=false
    378418STMicroelectronics.X-CUBE-AZRTOS-H7.3.3.0.TX_APP_MEM_POOL_SIZE=8192
     419STMicroelectronics.X-CUBE-AZRTOS-H7.3.3.0.TX_APP_MSG_QUEUE_CREATION=1
    379420STMicroelectronics.X-CUBE-AZRTOS-H7.3.3.0.TX_ENABLE_STACK_CHECKING=1
    380421STMicroelectronics.X-CUBE-AZRTOS-H7.3.3.0.TX_LOW_POWER=1
     422STMicroelectronics.X-CUBE-AZRTOS-H7.3.3.0.TX_MSG_QUEUE_NAME=gsm queue
     423STMicroelectronics.X-CUBE-AZRTOS-H7.3.3.0.TX_NB_MSG=512
    381424STMicroelectronics.X-CUBE-AZRTOS-H7.3.3.0.TX_NO_FILEX_POINTER=1
    382425STMicroelectronics.X-CUBE-AZRTOS-H7.3.3.0.TX_TIMER_TICKS_PER_SECOND=1000
Note: See TracChangeset for help on using the changeset viewer.