Commit 896a06f4 authored by 时昊's avatar 时昊

feat:修改串口发送蓝牙电话号,空闲状态下,电话号清0

parent 12e76fcb
...@@ -272,7 +272,7 @@ static void Protocol_UartHandle(const Protocol_Data_t *pData)//esp接收底板 ...@@ -272,7 +272,7 @@ static void Protocol_UartHandle(const Protocol_Data_t *pData)//esp接收底板
if(Wifi_OTA_Request == 0) if(Wifi_OTA_Request == 0)
{ {
Wifi_OTA_Request = 1; Wifi_OTA_Request = 1;
printf("收到进入OTA指令 \r\n"); //printf("收到进入OTA指令 \r\n");
SwitchMode=0x5AA57AA7; SwitchMode=0x5AA57AA7;
wifiServiceStart(); wifiServiceStart();
} }
...@@ -327,8 +327,6 @@ void Uart_Send_Id12_Pro(void )//收到底板回复的0x20后,发送蓝牙类型 ...@@ -327,8 +327,6 @@ void Uart_Send_Id12_Pro(void )//收到底板回复的0x20后,发送蓝牙类型
uint8_t ID12[3] = {0}; uint8_t ID12[3] = {0};
ID12[0] |= (uint8_t)(BT_User.BT_Sts << 4);//经典 ID12[0] |= (uint8_t)(BT_User.BT_Sts << 4);//经典
ID12[0] |= Ble_User.Ble_Sts;//ble ID12[0] |= Ble_User.Ble_Sts;//ble
ID12[1] = 22; //小时
ID12[2] = 22; //分钟
Protocol_Send(0x12, ID12, 3); Protocol_Send(0x12, ID12, 3);
} }
...@@ -403,26 +401,36 @@ void Uart_Send_Id02_Pro(void) ...@@ -403,26 +401,36 @@ void Uart_Send_Id02_Pro(void)
{ {
uint8_t ID02[22] = {0x00}; uint8_t ID02[22] = {0x00};
uint8_t i = 0; uint8_t i = 0;
ID02[0] = BT_User.Call_Sts;
if(BT_User.Call_Sts == Call_Idle)
if(Iphone_Num[0] < 0x30)
{ {
ID02[1] = number_length - 1; number_length = 0;
for ( i = 0; i < number_length -1; i++) memset(Iphone_Num, 0, 20);
{ Protocol_Send(0x02, ID02, 22);
ID02[i+2] = Iphone_Num[i+1] - 0x30;
}
} }
else else
{ {
ID02[1] = number_length; ID02[0] = BT_User.Call_Sts;
for ( i = 0; i < number_length; i++)
if((Iphone_Num[0] == 0x2B)&&(Iphone_Num[1] == 0x38)&&(Iphone_Num[2] == 0x36))
{
ID02[1] = number_length - 3;
for ( i = 0; i < number_length - 3; i++)
{
ID02[i+2] = Iphone_Num[i+3] - 0x30;
}
}
else
{ {
ID02[i+2] = Iphone_Num[i] - 0x30; ID02[1] = number_length;
for ( i = 0; i < number_length; i++)
{
ID02[i+2] = Iphone_Num[i] - 0x30;
}
} }
Protocol_Send(0x02, ID02, number_length+2);//给底板发送电话状态,用这个标志位显示电话号
} }
Protocol_Send(0x02, ID02, number_length+2);//给底板发送电话状态,用这个标志位显示电话号
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment