ChinaUWBProject.git

			@@ -374,7 +374,9 @@
			input5v_time=1;
			flag_secondtask = 1;
			if(g_com_map[UWBFrequency]>1)
			{uwb_time_count++;}
			{
			uwb_time_count++;
			}
			// #endif
			uwb_offtime_count++;
			if(uwb_offtime_count>60)
			@@ -580,7 +582,7 @@
			// }
			g_com_map[MODBUS_MODE] = 0;
			log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
			g_com_map[VERSION] = (1<<8)\|30;
			g_com_map[VERSION] = (1<<8)\|33;


			LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
			@@ -689,7 +691,9 @@
			HIDO_ATLitePoll();
			TCPClient_Poll();
			if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
			{TCPClient_Poll_1();}
			{
			TCPClient_Poll_1();
			}
			if(flag_secondtask)
			{
			flag_secondtask = 0;
			@@ -983,10 +987,8 @@
			wdt_close(WDT_ID0);
			Program_Init();
			Uart_Register(UART_ID_4G, UART_ID0);

			Uart_Register(UART_ID_DBG_GPS, UART_ID1);
			DBG_Init();

			SendComMap(0x50,0);
			Internet_Init();
			TCPClient_Init();
			@@ -1009,16 +1011,13 @@
			uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
			power_init();
			Uwb_init();

			if(g_com_map[KEY_POWERON]==1)
			{
			WT588E_PLAY(0); //播报开机语音
			g_com_map[KEY_POWERON]=0;
			save_com_map_to_flash();


			}


			if(g_com_map[UWBFrequency]&&g_com_map[UWBENBLE])
			{
			OpenUWB();
			@@ -1046,10 +1045,10 @@
			PCA9555_Set_One_Value_Output(ADC_MINIUS,0);//拉低
			adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
			pca_input_detection_init(pca_handler);//pca检测输入
			GPS_Init();
			// gaodu=GetPressAndHeight()*100;
			while (1)
			{

			uwb_app_poll();
			Internet_Poll();
			HIDO_TimerPoll();