diff --git a/f1/usart/include/usart1.h b/f1/usart/include/usart1.h
index 7909f03cefbaf6b33197646a474a4b0843d647a5..2219fcb743cdfaa0041ed0f24313e52ea6c21d81 100644
--- a/f1/usart/include/usart1.h
+++ b/f1/usart/include/usart1.h
@@ -1,5 +1,5 @@
-#ifndef USART3_F1_H
-#define USART3_F1_H
+#ifndef USART1_F1_H
+#define USART1_F1_H
#include "stm32f1xx_hal.h"
#include "usart_common.h"
diff --git a/f1/usart/include/usart2.h b/f1/usart/include/usart2.h
index 21891f0f7f9d9f6fc388ad877d6dd588e2aed613..259d248175c379593fbf485a7efcbc1281cad025 100644
--- a/f1/usart/include/usart2.h
+++ b/f1/usart/include/usart2.h
@@ -6,9 +6,9 @@
#include "comm.h"
/* public functions */
-void usart2_init(TComm *comm_dev,UART_InitTypeDef *conf,TUSART_IRQ_Priorities *priorities);
+void usart2_init(TComm *comm_dev,UART_InitTypeDef *conf,TUART_IRQ_Priorities *priorities);
void usart2_config(TComm *comm_dev,UART_InitTypeDef *conf);
-void usart2_set_priorities(TComm *comm_dev,TUSART_IRQ_Priorities *priorities);
+void usart2_set_priorities(TComm *comm_dev,TUART_IRQ_Priorities *priorities);
void usart2_set_baudrate(TComm *comm_dev,unsigned int baudrate);
/* IRQ functions */
unsigned char usart2_send_irq(unsigned char first_byte);
diff --git a/f1/usart/src/usart1_remap.c b/f1/usart/src/usart1_remap.c
index 5c5427c1687f71d9767471219143a15dfd84d1b6..51152f3a1a575e9e9242249970f7710cea73a837 100644
--- a/f1/usart/src/usart1_remap.c
+++ b/f1/usart/src/usart1_remap.c
@@ -26,7 +26,7 @@
#define USART_DMA_RX_IRQHandler DMA1_Channel5_IRQHandler
// private variables
-UART_HandleTypeDef Uart1Handle;
+USART_HandleTypeDef Uart1Handle;
DMA_HandleTypeDef usart1_hdma_tx;
DMA_HandleTypeDef usart1_hdma_rx;
TComm *usart1_comm_dev;
@@ -37,56 +37,56 @@ void USART_IRQHandler(void)
unsigned char data,ret;
uint32_t source;
- if(__HAL_UART_GET_FLAG(&Uart1Handle, UART_FLAG_RXNE) != RESET)
+ if(__HAL_USART_GET_FLAG(&Uart1Handle, USART_FLAG_RXNE) != RESET)
{
- if(__HAL_UART_GET_IT_SOURCE(&Uart1Handle, UART_IT_RXNE) !=RESET)
+ if(__HAL_USART_GET_IT_SOURCE(&Uart1Handle, USART_IT_RXNE) !=RESET)
{
- __HAL_UART_CLEAR_FLAG(&Uart1Handle,UART_FLAG_RXNE);
+ __HAL_USART_CLEAR_FLAG(&Uart1Handle,USART_FLAG_RXNE);
data=(uint8_t)(Uart1Handle.Instance->DR & (uint8_t)0x00FF);
// call the reception function
if(!comm_do_irq_receive(usart1_comm_dev,data))
- __HAL_UART_DISABLE_IT(&Uart1Handle, UART_IT_RXNE);
+ __HAL_USART_DISABLE_IT(&Uart1Handle, USART_IT_RXNE);
}
}
- if(__HAL_UART_GET_FLAG(&Uart1Handle, UART_FLAG_TC) != RESET)
+ if(__HAL_USART_GET_FLAG(&Uart1Handle, USART_FLAG_TC) != RESET)
{
- if(__HAL_UART_GET_IT_SOURCE(&Uart1Handle, UART_IT_TC) !=RESET)
+ if(__HAL_USART_GET_IT_SOURCE(&Uart1Handle, USART_IT_TC) !=RESET)
{
- __HAL_UART_CLEAR_FLAG(&Uart1Handle,UART_FLAG_TC);
+ __HAL_USART_CLEAR_FLAG(&Uart1Handle,USART_FLAG_TC);
ret=comm_do_irq_send(usart1_comm_dev,&data);
if(ret==0x01)
Uart1Handle.Instance->DR=data;
else if(ret==0x00)
- __HAL_UART_DISABLE_IT(&Uart1Handle, UART_IT_TC);
+ __HAL_USART_DISABLE_IT(&Uart1Handle, USART_IT_TC);
}
}
- if(__HAL_UART_GET_FLAG(&Uart1Handle, UART_FLAG_PE) != RESET)// parity error
+ if(__HAL_USART_GET_FLAG(&Uart1Handle, USART_FLAG_PE) != RESET)// parity error
{
- if(__HAL_UART_GET_IT_SOURCE(&Uart1Handle, UART_IT_PE) !=RESET)
+ if(__HAL_USART_GET_IT_SOURCE(&Uart1Handle, USART_IT_PE) !=RESET)
{
- __HAL_UART_CLEAR_PEFLAG(&Uart1Handle);
+ __HAL_USART_CLEAR_PEFLAG(&Uart1Handle);
}
}
- source=__HAL_UART_GET_IT_SOURCE(&Uart1Handle, UART_IT_ERR);
- if(__HAL_UART_GET_FLAG(&Uart1Handle, UART_FLAG_FE) != RESET)// frame error
+ source=__HAL_USART_GET_IT_SOURCE(&Uart1Handle, USART_IT_ERR);
+ if(__HAL_USART_GET_FLAG(&Uart1Handle, USART_FLAG_FE) != RESET)// frame error
{
if(source !=RESET)
{
- __HAL_UART_CLEAR_FEFLAG(&Uart1Handle);
+ __HAL_USART_CLEAR_FEFLAG(&Uart1Handle);
}
}
- if(__HAL_UART_GET_FLAG(&Uart1Handle, UART_FLAG_NE) != RESET)// noise error
+ if(__HAL_USART_GET_FLAG(&Uart1Handle, USART_FLAG_NE) != RESET)// noise error
{
if(source !=RESET)
{
- __HAL_UART_CLEAR_NEFLAG(&Uart1Handle);
+ __HAL_USART_CLEAR_NEFLAG(&Uart1Handle);
}
}
- if(__HAL_UART_GET_FLAG(&Uart1Handle, UART_FLAG_ORE) != RESET)// overrun error
+ if(__HAL_USART_GET_FLAG(&Uart1Handle, USART_FLAG_ORE) != RESET)// overrun error
{
if(source !=RESET)
{
- __HAL_UART_CLEAR_OREFLAG(&Uart1Handle);
+ __HAL_USART_CLEAR_OREFLAG(&Uart1Handle);
}
}
}
@@ -168,7 +168,7 @@ void USART_DMA_RX_IRQHandler(void)
}
/* public functions*/
-void usart1_init(TComm *comm_dev,UART_InitTypeDef *conf,TUSART_IRQ_Priorities *priorities)
+void usart1_init(TComm *comm_dev,USART_InitTypeDef *conf,TUSART_IRQ_Priorities *priorities)
{
GPIO_InitTypeDef GPIO_InitStructure;
@@ -210,7 +210,7 @@ void usart1_init(TComm *comm_dev,UART_InitTypeDef *conf,TUSART_IRQ_Priorities *p
HAL_DMA_Init(&usart1_hdma_tx);
- /* Associate the initialized DMA handle to the UART handle */
+ /* Associate the initialized DMA handle to the USART handle */
__HAL_LINKDMA(&Uart1Handle, hdmatx, usart1_hdma_tx);
/* Configure the DMA handler for reception process */
@@ -225,7 +225,7 @@ void usart1_init(TComm *comm_dev,UART_InitTypeDef *conf,TUSART_IRQ_Priorities *p
HAL_DMA_Init(&usart1_hdma_rx);
- /* Associate the initialized DMA handle to the the UART handle */
+ /* Associate the initialized DMA handle to the the USART handle */
__HAL_LINKDMA(&Uart1Handle, hdmarx, usart1_hdma_rx);
}
usart1_set_priorities(comm_dev,priorities);
@@ -250,16 +250,17 @@ void usart1_init(TComm *comm_dev,UART_InitTypeDef *conf,TUSART_IRQ_Priorities *p
usart1_comm_dev=comm_dev;
}
-void usart1_config(TComm *comm_dev,UART_InitTypeDef *conf)
+void usart1_config(TComm *comm_dev,USART_InitTypeDef *conf)
{
Uart1Handle.Init.BaudRate = conf->BaudRate;
Uart1Handle.Init.WordLength = conf->WordLength;
Uart1Handle.Init.StopBits = conf->StopBits;
Uart1Handle.Init.Parity = conf->Parity;
Uart1Handle.Init.Mode = conf->Mode;
- Uart1Handle.Init.HwFlowCtl = conf->HwFlowCtl;
- Uart1Handle.Init.OverSampling = conf->OverSampling;
- HAL_UART_Init(&Uart1Handle);
+ Uart1Handle.Init.CLKPolarity = conf->CLKPolarity;
+ Uart1Handle.Init.CLKPhase = conf->CLKPhase;
+ Uart1Handle.Init.CLKLastBit = conf->CLKLastBit;
+ HAL_USART_Init(&Uart1Handle);
}
void usart1_set_priorities(TComm *comm_dev,TUSART_IRQ_Priorities *priorities)
@@ -278,14 +279,14 @@ void usart1_set_priorities(TComm *comm_dev,TUSART_IRQ_Priorities *priorities)
void usart1_set_baudrate(TComm *comm_dev,unsigned int baudrate)
{
Uart1Handle.Init.BaudRate = baudrate;
- HAL_UART_Init(&Uart1Handle);
+ HAL_USART_Init(&Uart1Handle);
}
/* IRQ functions */
unsigned char usart1_send_irq(unsigned char first_byte)
{
- __HAL_UART_CLEAR_FLAG(&Uart1Handle,UART_FLAG_TC);
- __HAL_UART_ENABLE_IT(&Uart1Handle, UART_IT_TC);
+ __HAL_USART_CLEAR_FLAG(&Uart1Handle,USART_FLAG_TC);
+ __HAL_USART_ENABLE_IT(&Uart1Handle, USART_IT_TC);
Uart1Handle.Instance->DR=first_byte;
return 0x00;
@@ -293,8 +294,8 @@ unsigned char usart1_send_irq(unsigned char first_byte)
unsigned char usart1_enable_tx_irq(void)
{
- __HAL_UART_CLEAR_FLAG(&Uart1Handle,UART_FLAG_TC);
- __HAL_UART_ENABLE_IT(&Uart1Handle, UART_IT_TC);
+ __HAL_USART_CLEAR_FLAG(&Uart1Handle,USART_FLAG_TC);
+ __HAL_USART_ENABLE_IT(&Uart1Handle, USART_IT_TC);
return 0x00;
}
@@ -302,7 +303,7 @@ unsigned char usart1_enable_tx_irq(void)
unsigned char usart1_receive_irq(void)
{
/* enable the rx interrupt */
- __HAL_UART_ENABLE_IT(&Uart1Handle, UART_IT_RXNE);
+ __HAL_USART_ENABLE_IT(&Uart1Handle, USART_IT_RXNE);
return 0x00;
}
@@ -310,7 +311,7 @@ unsigned char usart1_receive_irq(void)
unsigned char usart1_cancel_receive_irq(void)
{
/* disable the rx interrupt */
- __HAL_UART_DISABLE_IT(&Uart1Handle, UART_IT_RXNE);
+ __HAL_USART_DISABLE_IT(&Uart1Handle, USART_IT_RXNE);
return 0x00;
}
@@ -320,9 +321,9 @@ unsigned char usart1_send_dma(unsigned char *data,unsigned short int length)
{
HAL_DMA_Start_IT(Uart1Handle.hdmatx,(uint32_t)data,(uint32_t)&Uart1Handle.Instance->DR,length);
/* Clear the TC flag in the SR register by writing 0 to it */
- __HAL_UART_CLEAR_FLAG(&Uart1Handle,UART_FLAG_TC);
+ __HAL_USART_CLEAR_FLAG(&Uart1Handle,USART_FLAG_TC);
/* Enable the DMA transfer for transmit request by setting the DMAT bit
- in the UART CR3 register */
+ in the USART CR3 register */
SET_BIT(Uart1Handle.Instance->CR3, USART_CR3_DMAT);
return 0x00;
diff --git a/f1/usart/src/usart2.c b/f1/usart/src/usart2.c
index 48066858e1c57ff47d055d899fc629d8c4569042..ac8b5325f626c6bd3c1de45e3ee0770cf4bc0a58 100644
--- a/f1/usart/src/usart2.c
+++ b/f1/usart/src/usart2.c
@@ -1,29 +1,29 @@
#include "usart2.h"
-#define USART USART2
-#define USART_ENABLE_CLK __HAL_RCC_USART2_CLK_ENABLE()
-#define USART_IRQn USART2_IRQn
-#define USART_IRQHandler USART2_IRQHandler
+#define UART UART2
+#define UART_ENABLE_CLK __HAL_RCC_UART2_CLK_ENABLE()
+#define UART_IRQn UART2_IRQn
+#define UART_IRQHandler UART2_IRQHandler
-#define USART_TX_PIN GPIO_PIN_2
-#define USART_TX_GPIO_PORT GPIOA
-#define USART_ENABLE_TX_GPIO_CLK __HAL_RCC_GPIOA_CLK_ENABLE()
+#define UART_TX_PIN GPIO_PIN_2
+#define UART_TX_GPIO_PORT GPIOA
+#define UART_ENABLE_TX_GPIO_CLK __HAL_RCC_GPIOA_CLK_ENABLE()
-#define USART_RX_PIN GPIO_PIN_3
-#define USART_RX_GPIO_PORT GPIOA
-#define USART_ENABLE_RX_GPIO_CLK __HAL_RCC_GPIOA_CLK_ENABLE()
+#define UART_RX_PIN GPIO_PIN_3
+#define UART_RX_GPIO_PORT GPIOA
+#define UART_ENABLE_RX_GPIO_CLK __HAL_RCC_GPIOA_CLK_ENABLE()
/* DMA configuration */
-#define USART_DMA DMA1
-#define USART_ENABLE_DMA_CLK __HAL_RCC_DMA1_CLK_ENABLE()
+#define UART_DMA DMA1
+#define UART_ENABLE_DMA_CLK __HAL_RCC_DMA1_CLK_ENABLE()
-#define USART_TX_DMA_CHANNEL DMA1_Channel7
-#define USART_RX_DMA_CHANNEL DMA1_Channel6
+#define UART_TX_DMA_CHANNEL DMA1_Channel7
+#define UART_RX_DMA_CHANNEL DMA1_Channel6
-#define USART_DMA_TX_IRQn DMA1_Channel7_IRQn
-#define USART_DMA_RX_IRQn DMA1_Channel6_IRQn
-#define USART_DMA_TX_IRQHandler DMA1_Channel7_IRQHandler
-#define USART_DMA_RX_IRQHandler DMA1_Channel6_IRQHandler
+#define UART_DMA_TX_IRQn DMA1_Channel7_IRQn
+#define UART_DMA_RX_IRQn DMA1_Channel6_IRQn
+#define UART_DMA_TX_IRQHandler DMA1_Channel7_IRQHandler
+#define UART_DMA_RX_IRQHandler DMA1_Channel6_IRQHandler
// private variables
UART_HandleTypeDef Uart2Handle;
@@ -32,7 +32,7 @@ DMA_HandleTypeDef usart2_hdma_rx;
TComm *usart2_comm_dev;
// interrupt handlers
-void USART_IRQHandler(void)
+void UART_IRQHandler(void)
{
unsigned char data,ret;
uint32_t source;
@@ -91,7 +91,7 @@ void USART_IRQHandler(void)
}
}
-void USART_DMA_TX_IRQHandler(void)
+void UART_DMA_TX_IRQHandler(void)
{
if(__HAL_DMA_GET_FLAG(Uart2Handle.hdmatx,__HAL_DMA_GET_TE_FLAG_INDEX(Uart2Handle.hdmatx)) != RESET)
{
@@ -111,7 +111,7 @@ void USART_DMA_TX_IRQHandler(void)
__HAL_DMA_DISABLE_IT(Uart2Handle.hdmatx, DMA_IT_TC);
/* Clear the transfer complete flag */
__HAL_DMA_CLEAR_FLAG(Uart2Handle.hdmatx, __HAL_DMA_GET_TC_FLAG_INDEX(Uart2Handle.hdmatx));
- CLEAR_BIT(Uart2Handle.Instance->CR3, (USART_CR3_DMAT | USART_CR3_DMAR));
+ CLEAR_BIT(Uart2Handle.Instance->CR3, (UART_CR3_DMAT | UART_CR3_DMAR));
HAL_DMA_Abort(Uart2Handle.hdmatx);
// call the user function
comm_do_dma_send(usart2_comm_dev);
@@ -129,7 +129,7 @@ void USART_DMA_TX_IRQHandler(void)
}
}
-void USART_DMA_RX_IRQHandler(void)
+void UART_DMA_RX_IRQHandler(void)
{
if(__HAL_DMA_GET_FLAG(Uart2Handle.hdmarx,__HAL_DMA_GET_TE_FLAG_INDEX(Uart2Handle.hdmarx)) != RESET)
{
@@ -149,7 +149,7 @@ void USART_DMA_RX_IRQHandler(void)
__HAL_DMA_DISABLE_IT(Uart2Handle.hdmarx, DMA_IT_TC);
/* Clear the transfer complete flag */
__HAL_DMA_CLEAR_FLAG(Uart2Handle.hdmarx, __HAL_DMA_GET_TC_FLAG_INDEX(Uart2Handle.hdmarx));
- CLEAR_BIT(Uart2Handle.Instance->CR3, (USART_CR3_DMAT | USART_CR3_DMAR));
+ CLEAR_BIT(Uart2Handle.Instance->CR3, (UART_CR3_DMAT | UART_CR3_DMAR));
HAL_DMA_Abort(Uart2Handle.hdmarx);
// call the user function
comm_do_dma_receive(usart2_comm_dev);
@@ -168,36 +168,36 @@ void USART_DMA_RX_IRQHandler(void)
}
/* public functions*/
-void usart2_init(TComm *comm_dev,UART_InitTypeDef *conf,TUSART_IRQ_Priorities *priorities)
+void usart2_init(TComm *comm_dev,UART_InitTypeDef *conf,TUART_IRQ_Priorities *priorities)
{
GPIO_InitTypeDef GPIO_InitStructure;
/* Enable GPIO clock */
- USART_ENABLE_TX_GPIO_CLK;
- USART_ENABLE_RX_GPIO_CLK;
- USART_ENABLE_DMA_CLK;
+ UART_ENABLE_TX_GPIO_CLK;
+ UART_ENABLE_RX_GPIO_CLK;
+ UART_ENABLE_DMA_CLK;
// configure the GPIO pins
- /* Configure USART Tx and Rx as alternate function push-pull */
- GPIO_InitStructure.Pin = USART_TX_PIN;
+ /* Configure UART Tx and Rx as alternate function push-pull */
+ GPIO_InitStructure.Pin = UART_TX_PIN;
GPIO_InitStructure.Mode = GPIO_MODE_AF_PP;
GPIO_InitStructure.Pull = GPIO_PULLUP;
GPIO_InitStructure.Speed = GPIO_SPEED_HIGH;
- HAL_GPIO_Init(USART_TX_GPIO_PORT, &GPIO_InitStructure);
+ HAL_GPIO_Init(UART_TX_GPIO_PORT, &GPIO_InitStructure);
- GPIO_InitStructure.Pin = USART_RX_PIN;
+ GPIO_InitStructure.Pin = UART_RX_PIN;
GPIO_InitStructure.Mode = GPIO_MODE_INPUT;
- HAL_GPIO_Init(USART_RX_GPIO_PORT, &GPIO_InitStructure);
+ HAL_GPIO_Init(UART_RX_GPIO_PORT, &GPIO_InitStructure);
- USART_ENABLE_CLK;
+ UART_ENABLE_CLK;
- Uart2Handle.Instance = USART;
+ Uart2Handle.Instance = UART;
usart2_config(comm_dev,conf);
if(comm_dev->use_dma)
{
// configure the DMA channels
- usart2_hdma_tx.Instance = USART_TX_DMA_CHANNEL;
+ usart2_hdma_tx.Instance = UART_TX_DMA_CHANNEL;
usart2_hdma_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
usart2_hdma_tx.Init.PeriphInc = DMA_PINC_DISABLE;
usart2_hdma_tx.Init.MemInc = DMA_MINC_ENABLE;
@@ -212,7 +212,7 @@ void usart2_init(TComm *comm_dev,UART_InitTypeDef *conf,TUSART_IRQ_Priorities *p
__HAL_LINKDMA(&Uart2Handle, hdmatx, usart2_hdma_tx);
/* Configure the DMA handler for reception process */
- usart2_hdma_rx.Instance = USART_RX_DMA_CHANNEL;
+ usart2_hdma_rx.Instance = UART_RX_DMA_CHANNEL;
usart2_hdma_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
usart2_hdma_rx.Init.PeriphInc = DMA_PINC_DISABLE;
usart2_hdma_rx.Init.MemInc = DMA_MINC_ENABLE;
@@ -260,16 +260,16 @@ void usart2_config(TComm *comm_dev,UART_InitTypeDef *conf)
HAL_UART_Init(&Uart2Handle);
}
-void usart2_set_priorities(TComm *comm_dev,TUSART_IRQ_Priorities *priorities)
+void usart2_set_priorities(TComm *comm_dev,TUART_IRQ_Priorities *priorities)
{
- HAL_NVIC_SetPriority(USART_IRQn, priorities->irq_priority,priorities->irq_subpriority);
- HAL_NVIC_EnableIRQ(USART_IRQn);
+ HAL_NVIC_SetPriority(UART_IRQn, priorities->irq_priority,priorities->irq_subpriority);
+ HAL_NVIC_EnableIRQ(UART_IRQn);
if(comm_dev->use_dma)
{
- HAL_NVIC_SetPriority(USART_DMA_TX_IRQn, priorities->dma_tx_priority,priorities->dma_tx_subpriority);
- HAL_NVIC_EnableIRQ(USART_DMA_TX_IRQn);
- HAL_NVIC_SetPriority(USART_DMA_RX_IRQn, priorities->dma_rx_priority,priorities->dma_rx_subpriority);
- HAL_NVIC_EnableIRQ(USART_DMA_RX_IRQn);
+ HAL_NVIC_SetPriority(UART_DMA_TX_IRQn, priorities->dma_tx_priority,priorities->dma_tx_subpriority);
+ HAL_NVIC_EnableIRQ(UART_DMA_TX_IRQn);
+ HAL_NVIC_SetPriority(UART_DMA_RX_IRQn, priorities->dma_rx_priority,priorities->dma_rx_subpriority);
+ HAL_NVIC_EnableIRQ(UART_DMA_RX_IRQn);
}
}
@@ -321,7 +321,7 @@ unsigned char usart2_send_dma(unsigned char *data,unsigned short int length)
__HAL_UART_CLEAR_FLAG(&Uart2Handle,UART_FLAG_TC);
/* Enable the DMA transfer for transmit request by setting the DMAT bit
in the UART CR3 register */
- SET_BIT(Uart2Handle.Instance->CR3, USART_CR3_DMAT);
+ SET_BIT(Uart2Handle.Instance->CR3, UART_CR3_DMAT);
return 0x00;
}
@@ -329,14 +329,14 @@ unsigned char usart2_send_dma(unsigned char *data,unsigned short int length)
unsigned char usart2_receive_dma(unsigned char *data,unsigned short int length)
{
HAL_DMA_Start_IT(Uart2Handle.hdmarx,(uint32_t)&Uart2Handle.Instance->DR,(uint32_t)data,length);
- SET_BIT(Uart2Handle.Instance->CR3, USART_CR3_DMAR);
+ SET_BIT(Uart2Handle.Instance->CR3, UART_CR3_DMAR);
return 0x00;
}
unsigned char usart2_cancel_receive_dma(void)
{
- CLEAR_BIT(Uart2Handle.Instance->CR3, (USART_CR3_DMAT | USART_CR3_DMAR));
+ CLEAR_BIT(Uart2Handle.Instance->CR3, (UART_CR3_DMAT | UART_CR3_DMAR));
HAL_DMA_Abort(Uart2Handle.hdmarx);
return 0x00;