连接服务器

This commit is contained in:
yueming
2021-09-06 00:02:30 +08:00
parent a8bc50f67c
commit d9c4185983
36 changed files with 2748 additions and 4249 deletions

View File

@@ -72,8 +72,8 @@ void TIM3_IRQHandler(void) //TIM3中断服务程序
if(UART3Count == UART3ReadFlag)
{
UART3ReadFlag |= (1 << 15);
UART3Count = 0;
UART3RecTime = 0;
UART3Count = 0;
UART3RecTime = 0;
}
else
{
@@ -101,7 +101,10 @@ void TIM3_IRQHandler(void) //TIM3中断服务程序
DevParam.ServerUpdateTime++;
// 发送时间
if(DevParam.ESP8266SendTime<65000)
DevParam.ESP8266SendTime++;
DevParam.ESP8266SendTime++;
// 发送时间
if(DevParam.MQTTSendTime<65000)
DevParam.MQTTSendTime++;
}
}

View File

@@ -1,24 +1,27 @@
#include "bsp_uart2.h"
// 串口2 PA2 TX PA3 RX
void Dev_UART2SendStr(char* fmt,...){
uint8_t tbuf[200] = {0};
void Dev_UART2SendStr(uint8_t* tbuf, uint16_t tlen, uint8_t tByte){
uint16_t i = 0,j = 0;
va_list ap;
va_start(ap,fmt);
vsprintf((char*)tbuf, fmt, ap);
va_end(ap);
j = strlen((const char*)tbuf);
if(tlen > 0)
j = tlen;
else
j = strlen((const char*)tbuf);
for( i = 0; i < j; i++)
{
if((tByte>0)&&(i==2))
{
while(USART_GetFlagStatus(USART2, USART_FLAG_TC)==RESET){};
USART_SendData(USART2, tByte);
}
while(USART_GetFlagStatus(USART2, USART_FLAG_TC)==RESET){};
USART_SendData(USART2, tbuf[i]);
}
while(USART_GetFlagStatus(USART2, USART_FLAG_TC)==RESET);
}
// 发送数据
void Dev_UART2SendData(uint8_t *ch,uint16_t len){
uint16_t i = 0;
@@ -80,10 +83,10 @@ void USART2_IRQHandler(void)
res = USART_ReceiveData(USART2);
// 是否存在数据没有处理
if( (UART2ReadFlag&0x8000)==0 )
if((UART2ReadFlag&0x8000)==0)
{
UART2ReadBuf[UART2ReadFlag++] = res;
if(UART2ReadFlag>=90)
if(UART2ReadFlag>=480)
{
UART2ReadFlag |= (1 << 15);
}

View File

@@ -12,7 +12,7 @@
#include "basic_data.h"
void Dev_UART2SendStr(char* fmt,...);
void Dev_UART2SendStr(uint8_t* tbuf, uint16_t tlen, uint8_t tByte);
void Dev_UART2SendData(uint8_t *ch, uint16_t len);
void BSP_UART2Init(uint32_t bound);