summaryrefslogtreecommitdiff
path: root/stm32cubemx/Src/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'stm32cubemx/Src/main.c')
-rw-r--r--stm32cubemx/Src/main.c38
1 files changed, 24 insertions, 14 deletions
diff --git a/stm32cubemx/Src/main.c b/stm32cubemx/Src/main.c
index 7c5f9d3..f57b555 100644
--- a/stm32cubemx/Src/main.c
+++ b/stm32cubemx/Src/main.c
@@ -53,6 +53,8 @@
TIM_HandleTypeDef htim1;
DMA_HandleTypeDef hdma_tim1_ch1;
+UART_HandleTypeDef huart2;
+
/* USER CODE BEGIN PV */
/* Private variables ---------------------------------------------------------*/
@@ -64,7 +66,7 @@ void Error_Handler(void);
static void MX_GPIO_Init(void);
static void MX_DMA_Init(void);
static void MX_TIM1_Init(void);
-static void MX_NVIC_Init(void);
+static void MX_USART2_UART_Init(void);
/* USER CODE BEGIN PFP */
/* Private function prototypes -----------------------------------------------*/
@@ -95,9 +97,7 @@ int main(void)
MX_DMA_Init();
MX_TIM1_Init();
MX_USB_DEVICE_Init();
-
- /* Initialize interrupts */
- MX_NVIC_Init();
+ MX_USART2_UART_Init();
/* USER CODE BEGIN 2 */
main_post_init();
@@ -172,15 +172,6 @@ void SystemClock_Config(void)
HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
}
-/** NVIC Configuration
-*/
-static void MX_NVIC_Init(void)
-{
- /* TIM1_TRG_COM_IRQn interrupt configuration */
- HAL_NVIC_SetPriority(TIM1_TRG_COM_IRQn, 1, 0);
- HAL_NVIC_EnableIRQ(TIM1_TRG_COM_IRQn);
-}
-
/* TIM1 init function */
static void MX_TIM1_Init(void)
{
@@ -191,7 +182,7 @@ static void MX_TIM1_Init(void)
htim1.Instance = TIM1;
htim1.Init.Prescaler = RX_TIMER_PRESCALER;
htim1.Init.CounterMode = TIM_COUNTERMODE_UP;
- htim1.Init.Period = 0;
+ htim1.Init.Period = 65535;
htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
htim1.Init.RepetitionCounter = 0;
if (HAL_TIM_IC_Init(&htim1) != HAL_OK)
@@ -217,6 +208,25 @@ static void MX_TIM1_Init(void)
}
+/* USART2 init function */
+static void MX_USART2_UART_Init(void)
+{
+
+ huart2.Instance = USART2;
+ huart2.Init.BaudRate = 115200;
+ huart2.Init.WordLength = UART_WORDLENGTH_8B;
+ huart2.Init.StopBits = UART_STOPBITS_1;
+ huart2.Init.Parity = UART_PARITY_NONE;
+ huart2.Init.Mode = UART_MODE_TX_RX;
+ huart2.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+ huart2.Init.OverSampling = UART_OVERSAMPLING_16;
+ if (HAL_UART_Init(&huart2) != HAL_OK)
+ {
+ Error_Handler();
+ }
+
+}
+
/**
* Enable DMA controller clock
*/