From 9bd738443a77409f46f3447d46b3fa5f91b31309 Mon Sep 17 00:00:00 2001 From: chen <15335560115@163.com> Date: 星期一, 21 七月 2025 16:10:17 +0800 Subject: [PATCH] 增加读取时串口0回包引脚控制逻辑 --- keil/include/main/main.c | 528 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 261 insertions(+), 267 deletions(-) diff --git a/keil/include/main/main.c b/keil/include/main/main.c index 8184386..c687682 100644 --- a/keil/include/main/main.c +++ b/keil/include/main/main.c @@ -61,10 +61,13 @@ #include "HIDO_ATLite.h" #include "HIDO_Timer.h" #include "TCPClient.h" +#include "PCA9555.h" +#include "WS2812.h" -//#define DEBUG_MODE +#define DEBUG_MODE extern int simple_main(void); extern int temp_main(void); +void uart_change_check(uint16_t gpio_state); #define TEST_UART_POLL_MODE 0 #define TEST_UART_INTERUPT_MODE 1 #define TEST_UART_DMA_MODE 2 @@ -90,14 +93,19 @@ int16_t fVoltage_mv,first_search_flag; uint8_t bat_percent,g_start_send_flag=1; uint8_t link_success_flag,motor_count; -uint16_t gps_wait_count; +uint16_t gps_wait_count,gps_wait_count2; uint8_t state5v = 1; uint8_t motor_power_state=1,uwb_state,air780_power_state,gps_success_state,red_charge_state,green_charge_state,air780_success_state,first_motor_in_flag; float nomove_count=0; static uint32_t sample[NUM_SAMPLES] = {0}; -uint8_t recev_error_num,send_messgae_count,send_flag,control_state; +uint8_t recev_error_num,send_messgae_count,send_flag,control_state,power_low_flag; uint8_t flag_4g_usart_rx_state = 1; //4G 串口RX当前是 RX状态,不是GPIO状态 int input_5v_flag,air780e_flag1,air780e_flag2,air780e_flag3,air780e_flag4; +extern uint8_t pca9555writedata_config[10];//暂存寄存器所有配置的数组 +extern uint8_t pca9555writedata_output[10];//暂存输出高低电平配置的数组 +extern uint8_t pca9555writedata_input[10];//暂存输入寄存器所有配置的数组 +extern uint8_t pca9555writedata_polarity[10];//暂存输入极性反转寄存器所有配置的数组 +uint8_t temp_pca9555writedata_input[10];//暂存上一次输入寄存器所有配置的数组 typedef enum { UN_BIND=0, LINK_SUCCESS, @@ -143,9 +151,27 @@ .int_tx = false, #endif }; -void uart_receive_callback(void *dev, uint32_t err_code) +void uart0_receive_callback(void *dev, uint32_t err_code) { - uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback); + uart_receive(UART_ID0,m_EUART0_DMA_RXBuf,EUART0_RX_BUF_SIZE,uart0_receive_callback); +} +void uart1_receive_callback(void *dev, uint32_t err_code) +{ + uart_receive(UART_ID1,m_EUART1_DMA_RXBuf,EUART1_RX_BUF_SIZE,uart1_receive_callback); +} +void mcu_deep_sleep(void) +{ + uint32_t lock; + trace_flush(); + lock = int_lock(); + LOG_INFO(TRACE_MODULE_APP, "进入深度休眠\r\n"); + gps_air780_power_change(0,0);//关闭gps,4G + sleep_timer_stop(); + //adc_close(); + power_enter_power_down_mode(1); + //LOG_INFO(TRACE_MODULE_APP, "进入深度休眠\r\n"); + sys_reset(0); + int_unlock(lock); } static void adc_callback(void *data, uint32_t number) { @@ -169,129 +195,114 @@ bat_percent = ((fVoltage_mv - 3300) /8); } } - gpio_pin_set(ADC_GND_ENABLE);//在拉高 + if(fVoltage_mv<3300) + { + //power_low_flag=1; + //gps_air780_power_change(gps_power_state,0);//gps原样,关闭4G + LOG_INFO(TRACE_MODULE_APP, "电池电压低于3.3V,4G,GPS停止工作\r\n"); + }else{ + //power_low_flag=0; + //gps_air780_power_change(gps_power_state,1);//gps原样,开启4G + LOG_INFO(TRACE_MODULE_APP, "电池电压正常,4G,GPS,正常工作\r\n"); + } + PCA9555_Set_One_Value_Output(ADC_MINIUS,1);//拉高 // LOG_INFO(TRACE_MODULE_APP, "The voltage is %%%d \r\n",bat_percent); } -//void UartInit(void) -//{ -//board_pins_config(); -//uart_open(UART_ID1, &test_uart_cfg); -//board_debug_console_open(TRACE_PORT_UART0); -//uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback); -//} -extern uint8_t gps_uwb_flag; -uint8_t TCP_reconnect_timer,flag_TCP_reconnectting = 1,flag_alam_state = 0,userkey_state,deep_sleep_flag; +extern uint8_t gps_uwb_flag,gps_need_data_flag; +uint8_t TCP_reconnect_timer,flag_TCP_reconnectting = 1,flag_alam_state = 0,userkey_state; uint8_t gps_enable_flag,motor_open_air_flag,moter_open_uwb_flag,flag_fenli_alarm = 0,fenli_alarm_count,delaysleep_count,enbale_blink_flag; int need_open_gps_count; -uint32_t keystarttime,keystarttime2; -void MotorPoll(void) -{ - if(UWB_work_state==UN_BIND) { - gps_uwb_flag=0;//关闭GPS - moter_open_uwb_flag=0;//关闭震动 - need_open_gps_count=0;//清0计数gps - } else { //绑定状态下 - if(anchordata_num==1) { - if(distance<g_com_map[ALARM_DISTANCE1]) { //小于预警距离 - fenli_alarm_count = 0; - if(flag_fenli_alarm) - { - flag_fenli_alarm = 0; - fenli_alarm_count = 0; - _4GAlarmUpload(2); - } - } - } - if(distance>g_com_map[ALARM_DISTANCE1]||anchordata_num==0) - { - if(fenli_alarm_count++>20) - { - if(!flag_fenli_alarm) - { - flag_fenli_alarm = 1; - _4GAlarmUpload(1); - } - } - } - if(distance<g_com_map[ALARM_DISTANCE1]) { //小于预警距离 - if(flag_alam_state) - { - flag_alam_state = 0; +uint32_t keystarttime,keystarttime2,keystarttime3; +extern uint32_t get_in_num,get_out_num; +uint8_t flag_4G_recdata; - } - - need_open_gps_count=0; - moter_open_uwb_flag=0;//关闭震动 - gps_uwb_flag=0;//关闭GPS - } else if(g_com_map[ALARM_DISTANCE1]<=distance&&distance<=g_com_map[ALARM_DISTANCE2]) { //大于预警距离小于报警距离 - need_open_gps_count++; - moter_open_uwb_flag=1;//开启震动 - if(need_open_gps_count>=20) { - if(!flag_alam_state) - { - flag_alam_state = 1; - } - gps_uwb_flag=1;//开启gps测距流程 - need_open_gps_count=0; - } - } else if(distance>=g_com_map[ALARM_DISTANCE2]) { //大于报警距离 - need_open_gps_count++; - moter_open_uwb_flag=1;//开启震动 - if(need_open_gps_count>=20) { - if(!flag_alam_state) - { - flag_alam_state = 1; - } - gps_uwb_flag=1;//开启gps测距流程 - need_open_gps_count=0; - } - - } - if(anchordata_num==0) { - if(!flag_alam_state) - { - flag_alam_state = 1; - } - distance = 0x1ffff; - gps_uwb_flag=1;//开启gps测距流程 - moter_open_uwb_flag=1;//开启震动 - need_open_gps_count=0; - } - } - } void IMUTask(void) { -if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&g_com_map[IMU_ENABLE]==1) - { - deep_sleep_flag=1; - }else{ - deep_sleep_flag=0; - } + if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&g_com_map[IMU_ENABLE]==1) + {//power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)ACCLERATE_DETECT_Pin, POWER_WAKEUP_LEVEL_HIGH); + mcu_deep_sleep(); + } } void UserKeyTask(void) - { - if(!GET_USERKEY) +{ +if(!read_userkey_input_pca()) { - if(HIDO_TimerGetTick() - keystarttime>3) + if(HIDO_TimerGetTick() - keystarttime3>2) { userkey_state = 1; - keystarttime = HIDO_TimerGetTick(); - UDPClient_UploadGPS(); + keystarttime3 = HIDO_TimerGetTick(); + //UDPClient_UploadGPS(); } - if(HIDO_TimerGetTick() - keystarttime2>10) +// if(HIDO_TimerGetTick() - keystarttime2>10) +// { +// +// g_com_map[CNT_RESTART] = 1; +// } + }else + { + keystarttime3 = HIDO_TimerGetTick(); + } +} +void PowerTask(void) +{ + if(read_powerkey_input_pca()) + { + if(HIDO_TimerGetTick() - keystarttime>2) { - g_com_map[CNT_RESTART] = 1; + keystarttime = HIDO_TimerGetTick(); + PCA9555_Set_One_Value_Output(PWR_ENABLE,0);//低电平关闭 + PCA9555_Set_One_Value_Output(GPS_LED,0);//输出低电平关闭LED } +// if(HIDO_TimerGetTick() - keystarttime2>10) +// { +// +// g_com_map[CNT_RESTART] = 1; +// } }else { keystarttime = HIDO_TimerGetTick(); keystarttime2 = HIDO_TimerGetTick(); } - } +} void MinuteTask(void) -{ gpio_pin_clr(ADC_GND_ENABLE);//拉低 +{ + PCA9555_Set_One_Value_Output(ADC_MINIUS,0);//拉低 adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样 } +void Air780eTask(void) +{ +// if(!power_low_flag)//确认是否休眠下才开启功能 +// { + if(flag_TCP_reconnectting||IfTCPConnected()) + { +// // LOG_INFO(TRACE_MODULE_APP, "处理4G任务\r\n"); +// +//// if(flag_4guart_needinit) +//// { +//// flag_4guart_needinit = 0; +//// AIR780EUartInit(); +//// }//yuan + if(flag_4G_recdata==1) + { + flag_4G_recdata = 2; + + //LOG_INFO(TRACE_MODULE_APP, "运行Socket_RecvAll tt2 %d\r\n",tt2); + Socket_RecvAll(); + } + Internet_Poll(); + HIDO_ATLitePoll(); + HIDO_TimerPoll(); + TCPClient_Poll(); + + } +// } + +} +#define BIND_COUNT_NUM 50 +uint8_t bind_flag; +int8_t bind_count=BIND_COUNT_NUM; +extern uint8_t find_flag; +uint8_t poll_count,poll_flag; void SecondTask(void) {static uint8_t second_count; if(second_count++>60) @@ -299,12 +310,20 @@ second_count = 0; MinuteTask(); } - //UWB更新列表 - TagListUpdate(); - Gps_change(); - //GPS_Poll(); - //UWB状态检测 - + poll_flag=1; +// if(bind_flag) +// { +// if(bind_count--<=0) +// { +// bind_count=BIND_COUNT_NUM; +// copy_taglist_to_flash(); +// sys_reset(0); +// bind_flag=0; +// } +// } +// //UWB状态检测 +//if(!power_low_flag)//低供电下不需要检测重连 +// { if(IfTCPConnected()) { TCP_reconnect_timer =0; @@ -322,46 +341,58 @@ } } +// } HIDO_TimerTick(); + if(nomove_count<=g_com_map[NOMOVESLEEP_TIME])//防止溢出 nomove_count++; + else{ + nomove_count=g_com_map[NOMOVESLEEP_TIME]+1; + } } uint8_t tt=1; uint8_t flag_sleeptimer,flag_secondtask,secondtask_count,log_4g_enable_flag; uint8_t uwb_enable_flag=0; + +void check_input_change(void) +{ + uint16_t gpio_state; + gpio_state=(uint16_t)pca9555writedata_input[0]<<8|pca9555writedata_input[1]; + if(WAKE_UP_POSITION&gpio_state) + { + nomove_count=0; + } + if(!(MAIN_RI_POSITION&gpio_state)) + { + flag_4G_recdata = 1; + delaysleep_count = 3; + } + //uart_change_check(gpio_state); +} + static void sleep_timer_callback(void *dev, uint32_t time) { - // IO_control_init(); - if(enbale_blink_flag) - { - green_charge_state=0; - charge_red_on(); - } - charge_state_change();//充电状态判断 + if(secondtask_count++%2==0) { flag_secondtask = 1; }else{ flag_secondtask = 0; } - if(enbale_blink_flag) - { - green_charge_state=0; - charge_red_off(); - } if(delaysleep_count>0) delaysleep_count--; //GPS工作逻辑 } -static void voltage_input_handler(enum IO_PIN_T pin) +//static void move_handler(enum IO_PIN_T pin) +//{ +// nomove_count=0; +//} +static void pca_handler(enum IO_PIN_T pin) { + PCA9555_readdata(PCA9555_DEVICE_ADDR,pca9555writedata_input);//读输入寄存器的值 + check_input_change(); +} -} -static void move_handler(enum IO_PIN_T pin) -{ - nomove_count=0; -} -uint8_t flag_4G_recdata; void _4gUsart_handler(enum IO_PIN_T pin) { //LOG_INFO(TRACE_MODULE_APP, "4G RX 唤醒\r\n"); @@ -371,29 +402,27 @@ extern uint16_t ip0,ip1,ip2,ip3,port; extern uint8_t gps_4g_flag; extern uint8_t gps_need_data_flag,gps_open_flag; +extern uint16_t bind_distance,button_determinate_distance,change_by_frequency_distance; +extern uint8_t tag_near_frequency; void Program_Init(void) { - Usart1ParseDataCallback = UsartParseDataHandler;//需改为默认为gps处理,UsartParseDataHandler为升级处理当调试时候改为 + Usart1ParseDataCallback = Usart1ParseDataHandler;//需改为默认为gps处理,Usart1ParseDataHandler为升级处理当调试时候改为 + Usart0ParseDataCallback=Usart0ParseDataHandler; parameter_init_anchor();//g_com_map表初始化角色默认为基站 dev_id=g_com_map[DEV_ID];//这里不太对 group_id=g_com_map[GROUP_ID];//组ID -// tag_frequency = 1000/g_com_map[COM_INTERVAL];//测距频率这个存的是测距时间 memcpy(&disoffset,&g_com_map[DIST_OFFSET],2); -// g_com_map[ALARM_DISTANCE1] = 40; -// g_com_map[ALARM_DISTANCE2] = 40; - warning_distance=g_com_map[ALARM_DISTANCE1]; - prewarning_distance=g_com_map[ALARM_DISTANCE2]; - send_struct.warnDistence=warning_distance; - send_struct.alarmDistence=prewarning_distance;//更新报警距离 - memcpy(&send_struct.gunLableId,&g_com_map[BIND_DEV_ID],2);//更新绑定ID - send_struct.tagId=dev_id;//更新设备ID - + memcpy(&bind_distance,&g_com_map[BIND_DISTANCE],2); + memcpy(&button_determinate_distance,&g_com_map[DETERMINATION_DISTANCE],2);//设定开关判断距离 + memcpy(&tag_near_frequency,&g_com_map[NERA_FREQUENCY],1);//设定附近HZ数 + memcpy(&change_by_frequency_distance,&g_com_map[FREQUENCY_DISTANCE],2);//设定修改HZ生效默认范围 if(g_com_map[BIND_DEV_ID]==0) { UWB_work_state = UN_BIND; }else{ UWB_work_state = SEARCH_DEV; } + //g_com_map[SEND_4G_SECOND] if(g_com_map[SEND_4G_SECOND]<30) { gps_open_flag=0; @@ -407,31 +436,30 @@ ip2 = (g_com_map[TCP_IP_2]>>12&0xf)*1000+(g_com_map[TCP_IP_2]>>8&0xf)*100+(g_com_map[TCP_IP_2]>>4&0xf)*10+(g_com_map[TCP_IP_2]&0xf); ip3 = (g_com_map[TCP_IP_3]>>12&0xf)*1000+(g_com_map[TCP_IP_3]>>8&0xf)*100+(g_com_map[TCP_IP_3]>>4&0xf)*10+(g_com_map[TCP_IP_3]&0xf); port = g_com_map[TCP_PORT]; - g_com_map[VERSION] = (1<<8)|10; + g_com_map[VERSION] = (1<<8)|0; + gpio_pin_set(CHANGE_UART_PIN);//;拉高打印输出 LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id); - LOG_INFO(TRACE_MODULE_APP,"固件版本:UWB-4G车载手环 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff); + LOG_INFO(TRACE_MODULE_APP,"固件版本:MK_无感闸机 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff); LOG_INFO(TRACE_MODULE_APP,"服务器地址: %d.%d.%d.%d:%d.\r\n",ip0,ip1,ip2,ip3,port); + while(uart_tx_in_progress(UART_ID0)); + gpio_pin_clr(CHANGE_UART_PIN);//;拉低输入 + } - -void IdleTask(void) +void uart_change_check(uint16_t gpio_state) { - if(gpio_pin_get_val(INPUT_5V_Pin)) - { - - if(state5v==0) + if(INPUT_5V_POSITION&gpio_state) + { + if(state5v==0) { state5v=1; state5V_prase_flag=state5v; gps_prase_flag=0;//解除gps解析 uart1_change_from_gps_to_debug();//测试 - // uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma - //UartInit(); - } - - //UART_CheckSend(); - } else { + PCA9555_Set_One_Value_Output(MCU_A,1);//输出高电平切换为5V输入 + } + }else { if(state5v==1) { g_com_map[MODBUS_MODE] = 0; @@ -439,32 +467,35 @@ state5V_prase_flag=state5v; gps_prase_flag=1;//恢复gps解析 uart1_change_from_debug_to_gps();//测试 - // uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma - //UartDeinit(); + PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS } - } + } +} +void IdleTask(void) +{ +//if(read_5v_input_pca()) +// { +// if(state5v==0) +// { +// state5v=1; +// state5V_prase_flag=state5v; +// gps_prase_flag=0;//解除gps解析 +// uart1_change_from_gps_to_debug();//测试 +// PCA9555_Set_One_Value_Output(MCU_A,1);//输出高电平切换为5V输入 +// } +// }else { +// if(state5v==1) +// { +// g_com_map[MODBUS_MODE] = 0; +// state5v=0; +// state5V_prase_flag=state5v; +// gps_prase_flag=1;//恢复gps解析 +// uart1_change_from_debug_to_gps();//测试 +// PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS +// } +// } + UART0_CheckReceive(); UART_CheckReceive(); -} -int bind_check(void) -{ - if(g_com_map[BIND_DEV_ID]!=0x00) - { - return 1; -//绑定信息为1说明设备已经被下发绑定 - } else { - return 0; -//绑定信息为0说明设备未被绑定 - } -} -void check_if_in_search(void) -{ - if(link_success_flag==1) { //如果第一次测距收包成功那么则进入连接测距模式 - UWB_work_state=LINK_SUCCESS; - } else { //否则进入搜索模式 - UWB_work_state=SEARCH_DEV; - if(first_search_flag==0) - first_search_flag=1; - } } void boot_deinit(void) { @@ -480,35 +511,37 @@ } uint8_t flag_4guart_needinit=0; uint8_t index1,index2,index3; - +int16_t Voltage_input; int tt2; int test1,test3; uint32_t test4; - +#define SLEEP_TIMER_NUM 1000 int main(void) { board_clock_run(); boot_deinit(); board_pins_config(); - board_debug_console_open(TRACE_PORT_UART1); + board_debug_console_open_baud(TRACE_PORT_UART0,BAUD_115200); // Reset reason reset_cause_get(); reset_cause_clear(); +//注意串口一波特率改为9600了为了能和GPS通信上 +// // Load calibration parameters from NVM +// uint32_t internal_flash = (REG_READ(0x40000018) >> 17) & 0x1; +// uint32_t external_flash = (REG_READ(0x40010030) >> 28) & 0x3; +// if (internal_flash || external_flash == 1) +// { +// WsfNvmInit(); +// board_calibration_params_load(); +// flash_close(FLASH_ID0); +// } +// else +// { +// board_calibration_params_default(); +// } - // Load calibration parameters from NVM - uint32_t internal_flash = (REG_READ(0x40000018) >> 17) & 0x1; - uint32_t external_flash = (REG_READ(0x40010030) >> 28) & 0x3; - if (internal_flash || external_flash == 1) - { - WsfNvmInit(); - board_calibration_params_load(); - flash_close(FLASH_ID0); - } - else - { - board_calibration_params_default(); - } - + // Load calibration parameters + board_calibration_params_load(); // Chip calibration calib_chip(); @@ -518,80 +551,42 @@ // open system timer //sys_timer_open(); - - // TODO 4G - Uart_Register(UART_ID_4G, UART_ID0); - Internet_Init(); - TCPClient_Init(); - gpio_open(); - board_output_init();//配置adcGND引脚 + LED_output_init();//配置串口控制脚 + adc_open(&usr_adc_cfg); - - IIC2_Init(); - Accelerometer_Init(); - IO_control_init(); - io_pin_mux_set(SCL_PIN, IO_FUNC0);//测试测距波形 - gpio_pin_set_dir(SCL_PIN , GPIO_DIR_IN, 0); - io_pull_set(SCL_PIN , IO_PULL_UP, IO_PULL_UP_LEVEL4); - gps_air780_power_change(0,1);//开启gps,4G -//加速度计初始化必须在IO_control_init之前因为复用SDA引脚 - gpio_pin_clr(ADC_GND_ENABLE); - adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样 + Program_Init(); - //uart_open(UART_ID1, &test_uart_cfg); - - // uart1_change_from_gps_to_debug(); - //Uart1GpsRecDebugSend(); - uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback); - -// Initialize low power mode - power_init(); - AIR780E_Reset(); //4G模块重启,耗时1.5秒,这个是无法同步的关键 - sleep_timer_open(true, SLEEP_TIMER_MODE_RELOAD, sleep_timer_callback); - //sleep_timer_start(__MS_TO_32K_CNT(g_com_map[COM_INTERVAL]));//测试 - sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试 - // board_5V_input_init(voltage_input_handler); - board_acceleration_detection_init(move_handler); -// LOG_INFO(TRACE_MODULE_APP, "测试进入app"); - board_4GUsart_detection_init(_4gUsart_handler); + uart_open(UART_ID1, &test_uart_cfg); + uart_receive(UART_ID1,m_EUART1_DMA_RXBuf,EUART1_RX_BUF_SIZE,uart1_receive_callback); + uart_receive(UART_ID0,m_EUART0_DMA_RXBuf,EUART0_RX_BUF_SIZE,uart0_receive_callback); + // Initialize low power mode + power_init(); + sleep_timer_open(true, SLEEP_TIMER_MODE_RELOAD, sleep_timer_callback); + sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试 + adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样 + uwb_open(); + Anchor_uwb_aoa_square_init(); + + OpenUWB(); while (1) - { test4=gpio_pin_get_val(SCL_PIN); -// if(!deep_sleep_flag)//确认是否休眠下才开启功能 -// { - if(flag_TCP_reconnectting||IfTCPConnected()) - { - // LOG_INFO(TRACE_MODULE_APP, "处理4G任务\r\n"); - -// if(flag_4guart_needinit) -// { -// flag_4guart_needinit = 0; -// AIR780EUartInit(); -// }//yuan - if(flag_4G_recdata==1) - { - flag_4G_recdata = 2; - - //LOG_INFO(TRACE_MODULE_APP, "运行Socket_RecvAll tt2 %d\r\n",tt2); - Socket_RecvAll(); - } -// air780_led_on(); - Internet_Poll(); - HIDO_ATLitePoll(); - HIDO_TimerPoll(); - TCPClient_Poll(); -// air780_led_off(); - } -// } + { + uwb_app_poll(); + if(poll_flag) + { + CloseUWB();//关闭接收 + Tag_uwb_aoa_square_init(); + TagRange(); //做标签 + Anchor_uwb_aoa_square_init(); + poll_flag=0; + OpenUWB(); + } if(flag_secondtask) { flag_secondtask = 0; SecondTask(); - } - UserKeyTask(); - IMUTask(); IdleTask(); #ifndef DEBUG_MODE //if(flag_sleeptimer) @@ -615,22 +610,21 @@ // }//yuan if(delaysleep_count==0) - if(!gps_power_state&&!gpio_pin_get_val(INPUT_5V_Pin)&&((IfTCPConnected()&&AIR780E_IsIPIdle()&&Socket_IsSendQueueEmpty(0))||((!flag_TCP_reconnectting)&&!IfTCPConnected()))) + if(!gps_power_state&&!gpio_pin_get_val(INPUT_5V_Pin)&&((IfTCPConnected()&&AIR780E_IsIPIdle()&&Socket_IsSendQueueEmpty(0))||((!flag_TCP_reconnectting)&&!IfTCPConnected())||power_low_flag)) { // test1=gpio_pin_get_val(_4G_USART_RX_Pin); uint32_t lock; //flag_4guart_needinit = 1; - Internet_Poll(); - HIDO_ATLitePoll(); - HIDO_TimerPoll(); - TCPClient_Poll(); - // power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)_4G_USART_RX_Pin, POWER_WAKEUP_LEVEL_LOW); +// Internet_Poll(); +// HIDO_ATLitePoll(); +// HIDO_TimerPoll(); +// TCPClient_Poll(); // delay_us(300000); trace_flush(); lock = int_lock(); power_enter_power_down_mode(0); - uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback); + uart_receive(UART_ID1,m_EUART1_DMA_RXBuf,EUART1_RX_BUF_SIZE,uart1_receive_callback); // test3=gpio_pin_get_val(_4G_USART_RX_Pin); //LOG_INFO(TRACE_MODULE_APP, "进入休眠\r\n"); int_unlock(lock); -- Gitblit v1.9.3