Skip to content

Commit 2656816

Browse files
authored
Update my_uart.cc
1 parent d5a4349 commit 2656816

File tree

1 file changed

+20
-16
lines changed
  • arc_design_contest/2021/HUST_SmartMeter/src

1 file changed

+20
-16
lines changed

arc_design_contest/2021/HUST_SmartMeter/src/my_uart.cc

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ uint16_t UART_RX_STA=0;
99
DEV_UART *uart_obj;
1010

1111

12-
static void uart_rx_callback(void *ptr){
13-
12+
static void uart_rx_callback(void *ptr)
13+
{
1414
DEV_UART *obj;
1515

1616
if (ptr == NULL) return;
@@ -26,7 +26,8 @@ static void uart_rx_callback(void *ptr){
2626
}
2727

2828

29-
void UART_Init(uint8_t uart_id,uint32_t baudrate){
29+
void UART_Init(uint8_t uart_id,uint32_t baudrate)
30+
{
3031
uart_obj = uart_get_dev(uart_id);
3132
int32_t ercd = uart_obj->uart_open(baudrate);
3233
if ((ercd != E_OK) && (ercd != E_OPNED)) return ;
@@ -38,37 +39,40 @@ void UART_Init(uint8_t uart_id,uint32_t baudrate){
3839
uart_obj->uart_control(UART_CMD_SET_RXINT, (void *)(DEV_DISABLED));
3940
uart_obj->uart_control(UART_CMD_SET_RXCB, (void *)uart_rx_callback);
4041
uart_obj->uart_control(UART_CMD_SET_RXINT, (void *)(DEV_ENABLED));
41-
4242
}
4343

4444

45-
void u1_printf(char* fmt,...){
45+
void u1_printf(char* fmt,...)
46+
{
4647
uint8_t i;
4748
va_list ap;
4849
va_start(ap,fmt);
4950
vsprintf((char*)UART_TX_BUF,fmt,ap);
5051
va_end(ap);
5152
i=strlen((const char*)UART_TX_BUF);
52-
uart_obj->uart_write(UART_TX_BUF,i);
53+
uart_obj->uart_write(UART_TX_BUF,i);
5354
}
5455

55-
void Uart_SendString(char* buf){
56+
void Uart_SendString(char* buf)
57+
{
5658
u1_printf("%s",buf);
5759
}
58-
void Uart_SendBuf(char* buf,uint32_t size){
60+
61+
void Uart_SendBuf(char* buf,uint32_t size)
62+
{
5963
uart_obj->uart_write(buf,size);
6064
}
6165

6266

63-
uint8_t FindStr(char* dest,char* src,uint16_t retry_nms){
64-
retry_nms/=10; //超时时间
67+
uint8_t FindStr(char* dest,char* src,uint16_t retry_nms)
68+
{
69+
retry_nms/=10; //超时时间
6570

66-
while(strstr(dest,src)==0 && retry_nms--)//等待串口接收完毕或超时退出
67-
{
71+
while(strstr(dest,src)==0 && retry_nms--){ //等待串口接收完毕或超时退出
6872
board_delay_ms(20,1);
69-
}
73+
}
7074

71-
if(retry_nms) return 1;
72-
73-
return 0;
75+
if(retry_nms)
76+
return 1;
77+
return 0;
7478
}

0 commit comments

Comments
 (0)