diff --git a/Core/Src/dma.c b/Core/Src/dma.c
index 8f59bf1..255c6f7 100644
--- a/Core/Src/dma.c
+++ b/Core/Src/dma.c
@@ -45,24 +45,26 @@ void MX_DMA_Init(void)
/* DMA interrupt init */
/* DMA1_Channel5_IRQn interrupt configuration */
- //HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 2, 0);
- //HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
+ // USART2
+ HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 2, 0);
+ HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
// I2C2
/* DMA1_Channel4_IRQn interrupt configuration */
HAL_NVIC_SetPriority(DMA1_Channel4_IRQn, 0, 0);
HAL_NVIC_EnableIRQ(DMA1_Channel4_IRQn);
/* DMA1_Channel5_IRQn interrupt configuration */
- HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 0, 0);
- HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
+ //HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 0, 0);
+ //HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
- // USART2
/* DMA1_Channel6_IRQn interrupt configuration */
HAL_NVIC_SetPriority(DMA1_Channel6_IRQn, 0, 0);
HAL_NVIC_EnableIRQ(DMA1_Channel6_IRQn);
+
+
/* DMA1_Channel7_IRQn interrupt configuration */
- HAL_NVIC_SetPriority(DMA1_Channel7_IRQn, 0, 0);
- HAL_NVIC_EnableIRQ(DMA1_Channel7_IRQn);
+ //HAL_NVIC_SetPriority(DMA1_Channel7_IRQn, 0, 0);
+ //HAL_NVIC_EnableIRQ(DMA1_Channel7_IRQn);
}
diff --git a/Core/Src/i2c.c b/Core/Src/i2c.c
index d05d555..b79760b 100644
--- a/Core/Src/i2c.c
+++ b/Core/Src/i2c.c
@@ -134,7 +134,7 @@ void HAL_I2C_MspInit(I2C_HandleTypeDef* i2cHandle)
__HAL_LINKDMA(i2cHandle,hdmarx,hdma_i2c2_rx);
/* I2C2_TX Init */
- hdma_i2c2_tx.Instance = DMA1_Channel5;
+ hdma_i2c2_tx.Instance = DMA1_Channel6;
hdma_i2c2_tx.Init.Request = DMA_REQUEST_I2C2_TX;
hdma_i2c2_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
hdma_i2c2_tx.Init.PeriphInc = DMA_PINC_DISABLE;
diff --git a/Core/Src/stm32wlxx_it.c b/Core/Src/stm32wlxx_it.c
index 2d24ed2..be9bff4 100644
--- a/Core/Src/stm32wlxx_it.c
+++ b/Core/Src/stm32wlxx_it.c
@@ -284,7 +284,7 @@ void DMA1_Channel5_IRQHandler(void)
/* USER CODE BEGIN DMA1_Channel5_IRQn 0 */
/* USER CODE END DMA1_Channel5_IRQn 0 */
- HAL_DMA_IRQHandler(&hdma_i2c2_tx);
+ HAL_DMA_IRQHandler(&hdma_usart2_tx);
/* USER CODE BEGIN DMA1_Channel5_IRQn 1 */
/* USER CODE END DMA1_Channel5_IRQn 1 */
@@ -298,7 +298,7 @@ void DMA1_Channel6_IRQHandler(void)
/* USER CODE BEGIN DMA1_Channel6_IRQn 0 */
/* USER CODE END DMA1_Channel6_IRQn 0 */
- HAL_DMA_IRQHandler(&hdma_usart2_tx);
+ HAL_DMA_IRQHandler(&hdma_i2c2_tx);
/* USER CODE BEGIN DMA1_Channel6_IRQn 1 */
/* USER CODE END DMA1_Channel6_IRQn 1 */
@@ -307,6 +307,7 @@ void DMA1_Channel6_IRQHandler(void)
/**
* @brief This function handles DMA1 Channel 7 Interrupt.
*/
+#if 0
void DMA1_Channel7_IRQHandler(void)
{
/* USER CODE BEGIN DMA1_Channel7_IRQn 0 */
@@ -317,7 +318,7 @@ void DMA1_Channel7_IRQHandler(void)
/* USER CODE END DMA1_Channel7_IRQn 1 */
}
-
+#endif
/**
* @brief This function handles EXTI Lines [9:5] Interrupt.
*/
diff --git a/Core/Src/usart.c b/Core/Src/usart.c
index 465f83d..532821a 100644
--- a/Core/Src/usart.c
+++ b/Core/Src/usart.c
@@ -110,7 +110,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
/* USART2 DMA Init */
/* USART2_TX Init */
- hdma_usart2_tx.Instance = DMA1_Channel6;
+ hdma_usart2_tx.Instance = DMA1_Channel5;
hdma_usart2_tx.Init.Request = DMA_REQUEST_USART2_TX;
hdma_usart2_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
hdma_usart2_tx.Init.PeriphInc = DMA_PINC_DISABLE;
@@ -131,6 +131,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
#endif
__HAL_LINKDMA(uartHandle,hdmatx,hdma_usart2_tx);
+#if 0
/* USART2_RX Init */
hdma_usart2_rx.Instance = DMA1_Channel7;
hdma_usart2_rx.Init.Request = DMA_REQUEST_USART2_RX;
@@ -152,7 +153,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
}
#endif
__HAL_LINKDMA(uartHandle,hdmarx,hdma_usart2_rx);
-
+#endif
/* USART2 interrupt Init */
HAL_NVIC_SetPriority(USART2_IRQn, 2, 0);
HAL_NVIC_EnableIRQ(USART2_IRQn);
diff --git a/Core/Src/usart_if.c b/Core/Src/usart_if.c
index 9f0331e..8ac0e4a 100644
--- a/Core/Src/usart_if.c
+++ b/Core/Src/usart_if.c
@@ -127,7 +127,7 @@ UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
/* ##-3- Disable the NVIC for DMA ########################################### */
/* USER CODE BEGIN 1 */
- HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
+ HAL_NVIC_DisableIRQ(DMA1_Channel6_IRQn);
return UTIL_ADV_TRACE_OK;
/* USER CODE END 1 */
diff --git a/STM32CubeIDE/.settings/language.settings.xml b/STM32CubeIDE/.settings/language.settings.xml
index 0ec3934..4b0e6ff 100644
--- a/STM32CubeIDE/.settings/language.settings.xml
+++ b/STM32CubeIDE/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/STM32CubeIDE/Release/WL55JC_AS923.elf b/STM32CubeIDE/Release/WL55JC_AS923.elf
index 7cb23f3..bca3359 100644
Binary files a/STM32CubeIDE/Release/WL55JC_AS923.elf and b/STM32CubeIDE/Release/WL55JC_AS923.elf differ