diff --git a/sdk b/sdk index 8fc2748..9757cd5 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit 8fc2748774fd16aa3d3f3b53d7b0b5b8cf89dd32 +Subproject commit 9757cd58b49db7604f6aba0483937b505c0f9497 diff --git a/usrc/subboards/subboard80_cliptip/subboard80_cliptip_board.c b/usrc/subboards/subboard80_cliptip/subboard80_cliptip_board.c index 020ae03..058efe9 100644 --- a/usrc/subboards/subboard80_cliptip/subboard80_cliptip_board.c +++ b/usrc/subboards/subboard80_cliptip/subboard80_cliptip_board.c @@ -53,7 +53,7 @@ static void UART2_Init() { huart2.Init.Mode = UART_MODE_TX_RX; huart2.Init.HwFlowCtl = UART_HWCONTROL_NONE; huart2.Init.OverSampling = UART_OVERSAMPLING_16; - if (HAL_UART_Init(&huart3) != HAL_OK) { + if (HAL_UART_Init(&huart2) != HAL_OK) { Error_Handler(); } /*********************************************************************************************************************** @@ -108,15 +108,14 @@ static void UART2_Init() { * INIT_IRQ * ***********************************************************************************************************************/ - HAL_NVIC_SetPriority(DMA1_Stream1_IRQn, 5, 0); - HAL_NVIC_EnableIRQ(DMA1_Stream1_IRQn); - - HAL_NVIC_SetPriority(DMA1_Stream3_IRQn, 5, 0); - HAL_NVIC_EnableIRQ(DMA1_Stream3_IRQn); + HAL_NVIC_SetPriority(DMA1_Stream5_IRQn, 5, 0); + HAL_NVIC_EnableIRQ(DMA1_Stream5_IRQn); + /* DMA1_Stream6_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(DMA1_Stream6_IRQn, 5, 0); + HAL_NVIC_EnableIRQ(DMA1_Stream6_IRQn); HAL_NVIC_SetPriority(USART2_IRQn, 5, 0); HAL_NVIC_EnableIRQ(USART2_IRQn); - /*********************************************************************************************************************** * LINK * ***********************************************************************************************************************/ @@ -178,6 +177,6 @@ static void UART4_Init() { void subboard80_cliptip_board_init() { common_hardware_init(); MX_SPI1_Init(); - UART2_Init(); + UART2_Init(); UART4_Init(); }