From d0dda34680bb885a8525cc82bfdeb9008025df80 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期四, 28 十一月 2024 17:32:06 +0800
Subject: [PATCH] 一对多稳定版本不丢包，加了错位时间
---
keil/include/main/main.c | 186 ++++++++++++++++++++++++----------------------
1 files changed, 97 insertions(+), 89 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 4020ef3..34954b7 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -62,7 +62,7 @@
#include "HIDO_Timer.h"
#include "TCPClient.h"
-//#define DEBUG_MODE
+#define DEBUG_MODE
extern int simple_main(void);
extern int temp_main(void);
#define TEST_UART_POLL_MODE 0
@@ -191,6 +191,7 @@
}else{
power_low_flag=0;
gps_air780_power_change(gps_power_state,1);//gps原样,开启4G
+ LOG_INFO(TRACE_MODULE_APP, "电池电压正常,4G，GPS,正常工作\r\n");
}
gpio_pin_set(ADC_GND_ENABLE);//在拉高
// LOG_INFO(TRACE_MODULE_APP, "The voltage is %%%d \r\n",bat_percent);
@@ -207,6 +208,7 @@
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;
+extern uint32_t get_in_num,get_out_num;
void MotorPoll(void)
{
if(UWB_work_state==UN_BIND) {
@@ -320,35 +322,40 @@
second_count = 0;
MinuteTask();
}
- if(!power_low_flag)
- Gps_change();
- else{
- gps_power_state=0;//关闭GPS
- update_led_power_state();
- //初始化GPS计数数据
- gps_need_data_flag=1;
- gps_wait_count2=0;
- gps_wait_count=0;
- }
- //UWB状态检测
+ TagListUpdate_person_num_car();
+ in_table_log();
+
+// if(!power_low_flag)
+// Gps_change();
+// else{
+// gps_power_state=0;//关闭GPS
+// update_led_power_state();
+// //初始化GPS计数数据
+// gps_need_data_flag=1;
+// gps_wait_count2=0;
+// gps_wait_count=0;
+// }
+// //UWB状态检测
+//if(!power_low_flag)//低供电下不需要检测重连
+// {
+// if(IfTCPConnected())
+// {
+// TCP_reconnect_timer =0;
+// flag_TCP_reconnectting = 0;
+// } else {
+// if(TCP_reconnect_timer<30)//如果TCP没有连接，每隔10分钟尝试连接30秒
+// {
+// flag_TCP_reconnectting = 1;
+// } else {
+// flag_TCP_reconnectting = 0;
+// }
+// if(TCP_reconnect_timer++>600)
+// {
+// TCP_reconnect_timer = 0;
+// }
- if(IfTCPConnected())
- {
- TCP_reconnect_timer =0;
- flag_TCP_reconnectting = 0;
- } else {
- if(TCP_reconnect_timer<30)//如果TCP没有连接，每隔10分钟尝试连接30秒
- {
- flag_TCP_reconnectting = 1;
- } else {
- flag_TCP_reconnectting = 0;
- }
- if(TCP_reconnect_timer++>600)
- {
- TCP_reconnect_timer = 0;
- }
-
- }
+// }
+// }
HIDO_TimerTick();
if(nomove_count<=g_com_map[NOMOVESLEEP_TIME])//防止溢出
nomove_count++;
@@ -367,6 +374,7 @@
green_charge_state=0;
charge_red_on();
}
+
charge_state_change();//充电状态判断
if(secondtask_count++%2==0)
{
@@ -376,7 +384,7 @@
}
if(enbale_blink_flag)
{
- delay_us(5000);
+ //delay_us(5000);
green_charge_state=0;
charge_red_off();
}
@@ -440,9 +448,9 @@
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;
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,"固件版本:4G-GPS定位手环 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);
}
@@ -450,32 +458,32 @@
void IdleTask(void)
{
- if(gpio_pin_get_val(INPUT_5V_Pin))
- {
+// if(gpio_pin_get_val(INPUT_5V_Pin))
+// {
- 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();
- }
+// 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 {
- 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();//测试
- // uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
- //UartDeinit();
- }
- }
+// //UART_CheckSend();
+// } 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();//测试
+// // uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
+// //UartDeinit();
+// }
+// }
UART_CheckReceive();
}
int bind_check(void)
@@ -554,8 +562,8 @@
// TODO 4G
Uart_Register(UART_ID_4G, UART_ID0);
- Internet_Init();
- TCPClient_Init();
+// Internet_Init();
+// TCPClient_Init();
gpio_open();
board_output_init();//配置adcGND引脚
@@ -585,8 +593,8 @@
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));//测试
+ 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);
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
board_acceleration_detection_init(move_handler);
@@ -594,41 +602,41 @@
board_4GUsart_detection_init(_4gUsart_handler);
while (1)
{ test4=gpio_pin_get_val(SCL_PIN);
-
- if(!power_low_flag)//确认是否休眠下才开启功能
- {
- if(flag_TCP_reconnectting||IfTCPConnected())
- {
- // LOG_INFO(TRACE_MODULE_APP, "处理4G任务\r\n");
-
-// if(flag_4guart_needinit)
+ UWBPoll();
+// 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_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();
- }
- }
+// 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();
+// }
+// }
if(flag_secondtask)
{
flag_secondtask = 0;
SecondTask();
}
- UserKeyTask();
- IMUTask();
+// UserKeyTask();
+// IMUTask();
IdleTask();
#ifndef DEBUG_MODE
//if(flag_sleeptimer)
@@ -652,7 +660,7 @@
// }//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;
--
Gitblit v1.9.3