chenzongxiong/secs2-bootloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update:

Browse Source 
1.将原来使用的串口2改为使用串口1
This commit is contained in:
chenzongxiong
2026-07-27 14:14:11 +08:00
parent 2c3e2c4dc2
commit 1e3c618fd2
172 changed files with 1234 additions and 9998 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/Src/main.c
+1 -1
View File
@@ -86,7 +86,7 @@ int main(void)
/* Initialize all configured peripherals */
MX_GPIO_Init();
MX_USART2_UART_Init();
MX_USART1_UART_Init();
/* USER CODE BEGIN 2 */
App_Init();
/* USER CODE END 2 */
Core/Src/stm32f1xx_it.c
+12 -11
View File
@@ -22,6 +22,8 @@
#include "stm32f1xx_it.h"
/* Private includes ----------------------------------------------------------*/
/* USER CODE BEGIN Includes */
#include "bsp_Uart.h"
#include "os_timer.h"
/* USER CODE END Includes */
/* Private typedef -----------------------------------------------------------*/
@@ -185,7 +187,7 @@ void SysTick_Handler(void)
/* USER CODE BEGIN SysTick_IRQn 0 */
OsTimer_Increment(1);
COM_Uart1.Rx_TimeIncrementInt(&COM_Uart1,1);
COM_Uart2.Rx_TimeIncrementInt(&COM_Uart2,1);
// COM_Uart2.Rx_TimeIncrementInt(&COM_Uart2,1);
/* USER CODE END SysTick_IRQn 0 */
HAL_IncTick();
/* USER CODE BEGIN SysTick_IRQn 1 */
@@ -201,21 +203,20 @@ void SysTick_Handler(void)
/******************************************************************************/
/**
* @brief This function handles USART2 global interrupt.
* @brief This function handles USART1 global interrupt.
*/
void USART2_IRQHandler(void)
void USART1_IRQHandler(void)
{
/* USER CODE BEGIN USART2_IRQn 0 */
if(LL_USART_IsActiveFlag_RXNE(USART2))
/* USER CODE BEGIN USART1_IRQn 0 */
if(LL_USART_IsActiveFlag_RXNE(USART1))
{
// // ��������жϱ�־
LL_USART_IsActiveFlag_RXNE(USART2);
COM_Uart2.Rx_IdleInt(&COM_Uart2); //�����յ����ֽڣ�ͬʱ��ر�־�Զ����
LL_USART_IsActiveFlag_RXNE(USART1);
COM_Uart1.Rx_IdleInt(&COM_Uart1);
}
/* USER CODE END USART2_IRQn 0 */
/* USER CODE BEGIN USART2_IRQn 1 */
/* USER CODE END USART1_IRQn 0 */
/* USER CODE BEGIN USART1_IRQn 1 */
/* USER CODE END USART2_IRQn 1 */
/* USER CODE END USART1_IRQn 1 */
}
/* USER CODE BEGIN 1 */
Core/Src/usart.c
+20 -20
View File
@@ -24,44 +24,44 @@
/* USER CODE END 0 */
/* USART2 init function */
/* USART1 init function */
void MX_USART2_UART_Init(void)
void MX_USART1_UART_Init(void)
{
/* USER CODE BEGIN USART2_Init 0 */
/* USER CODE BEGIN USART1_Init 0 */
/* USER CODE END USART2_Init 0 */
/* USER CODE END USART1_Init 0 */
LL_USART_InitTypeDef USART_InitStruct = {0};
LL_GPIO_InitTypeDef GPIO_InitStruct = {0};
/* Peripheral clock enable */
LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_USART2);
LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_USART1);
LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_GPIOA);
/**USART2 GPIO Configuration
PA2 ------> USART2_TX
PA3 ------> USART2_RX
/**USART1 GPIO Configuration
PA9 ------> USART1_TX
PA10 ------> USART1_RX
*/
GPIO_InitStruct.Pin = LL_GPIO_PIN_2;
GPIO_InitStruct.Pin = LL_GPIO_PIN_9;
GPIO_InitStruct.Mode = LL_GPIO_MODE_ALTERNATE;
GPIO_InitStruct.Speed = LL_GPIO_SPEED_FREQ_HIGH;
GPIO_InitStruct.OutputType = LL_GPIO_OUTPUT_PUSHPULL;
LL_GPIO_Init(GPIOA, &GPIO_InitStruct);
GPIO_InitStruct.Pin = LL_GPIO_PIN_3;
GPIO_InitStruct.Pin = LL_GPIO_PIN_10;
GPIO_InitStruct.Mode = LL_GPIO_MODE_FLOATING;
LL_GPIO_Init(GPIOA, &GPIO_InitStruct);
/* USART2 interrupt Init */
NVIC_SetPriority(USART2_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
NVIC_EnableIRQ(USART2_IRQn);
/* USART1 interrupt Init */
NVIC_SetPriority(USART1_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
NVIC_EnableIRQ(USART1_IRQn);
/* USER CODE BEGIN USART2_Init 1 */
/* USER CODE BEGIN USART1_Init 1 */
/* USER CODE END USART2_Init 1 */
/* USER CODE END USART1_Init 1 */
USART_InitStruct.BaudRate = 115200;
USART_InitStruct.DataWidth = LL_USART_DATAWIDTH_8B;
USART_InitStruct.StopBits = LL_USART_STOPBITS_1;
@@ -69,12 +69,12 @@ void MX_USART2_UART_Init(void)
USART_InitStruct.TransferDirection = LL_USART_DIRECTION_TX_RX;
USART_InitStruct.HardwareFlowControl = LL_USART_HWCONTROL_NONE;
USART_InitStruct.OverSampling = LL_USART_OVERSAMPLING_16;
LL_USART_Init(USART2, &USART_InitStruct);
LL_USART_ConfigAsyncMode(USART2);
LL_USART_Enable(USART2);
/* USER CODE BEGIN USART2_Init 2 */
LL_USART_Init(USART1, &USART_InitStruct);
LL_USART_ConfigAsyncMode(USART1);
LL_USART_Enable(USART1);
/* USER CODE BEGIN USART1_Init 2 */
/* USER CODE END USART2_Init 2 */
/* USER CODE END USART1_Init 2 */
}