A27R版本修改
This commit is contained in:
@ -44,7 +44,7 @@ unsigned char uart_time_request[13] = {0};
|
||||
static uint8_t uart_tx_flag = 0;
|
||||
static uint32_t send_idletick = 0;//发送时间检测
|
||||
extern uint8_t flash_flag;//检测是否收到device信息
|
||||
uint8_t uart_state = 0;//串口状态
|
||||
|
||||
uint8_t uart_state_flag = 0;//串口当前状态标识
|
||||
uint8_t bt_communication_heartbeat = 10;//时间检测
|
||||
uint8_t uart_flag =0;//串口变化标志
|
||||
@ -107,7 +107,7 @@ static void protocol_uart_tx_thread(void *param)
|
||||
if((!flash_flag) && (!data_error_flag)){
|
||||
|
||||
//确认蓝牙不处于升级 + 确认630不处于升级 + 确认串口收到通讯信息
|
||||
if(Get_sys_bt_upgrade() == 0 && Get_sys_upgrade_Flag() == 0 && uart_state){//蓝牙升级 不发送数据 630升级 不发送数据
|
||||
if(Get_sys_bt_upgrade() == 0 && Get_sys_upgrade_Flag() == 0){//蓝牙升级 不发送数据 630升级 不发送数据
|
||||
#ifndef DATA_CAN
|
||||
SendDataToBT(heartbeat_data);
|
||||
// printf("tx>");
|
||||
@ -321,7 +321,6 @@ static void protocol_uart_rx_thread(void *param)
|
||||
printf("\n");
|
||||
}
|
||||
}else{
|
||||
uart_state = 3;
|
||||
bt_communication_heartbeat = 3;
|
||||
if(equipment_data){
|
||||
device_data_analysis(tlv_data_value);
|
||||
@ -413,7 +412,7 @@ static void protocol_uart_rx_thread(void *param)
|
||||
#if 1
|
||||
}else{//升级逻辑
|
||||
timeout ++;
|
||||
uart_state = 3;
|
||||
|
||||
for (i = 0; i < len; i++) {
|
||||
switch (uup_rx_state) {
|
||||
case 0:
|
||||
|
Reference in New Issue
Block a user