From 2c4086173a8915035aee593d16b3ea7edc6f5c15 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期二, 10 九月 2024 18:14:35 +0800
Subject: [PATCH] 初版仅gps1h上报加4G休眠，去掉uwb振动等
---
keil/include/main/main.c | 114 +++++++++++++++++++++++++-------------------------------
1 files changed, 51 insertions(+), 63 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index ec79747..008a3d0 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -249,7 +249,8 @@
}
//UWB更新列表
TagListUpdate();
- GPS_Poll();
+ //GPS_Poll();
+ GPS_Poll_1h();
//UWB状态检测
if(IfTCPConnected())
@@ -272,14 +273,14 @@
HIDO_TimerTick();
nomove_count++;
}
-uint8_t flag_sleeptimer,flag_secondtask,secondtask_count;
+uint8_t flag_sleeptimer,flag_secondtask,secondtask_count,delaysleep_count;
static void sleep_timer_callback(void *dev, uint32_t time)
{
IO_control_init();
- UWBPoll();
+ // UWBPoll();
- MotorPoll();
+ //MotorPoll();
if(secondtask_count++%2==0)
{
@@ -290,24 +291,8 @@
flag_sleeptimer = 1;
- //马达震动逻辑
- if(g_com_map[MOTOR_ENABLE])
- {
- if(motor_open_air_flag||moter_open_uwb_flag)
- {
- if (motor_count++%2==0)
- {
- motor_power_state = 1;
- }else{
- motor_power_state = 0;
- }
- } else {
- motor_power_state=1;
- }
- }else{
- motor_power_state=1;
- }
-
+ if(delaysleep_count>0)
+ delaysleep_count--;
//GPS工作逻辑
}
@@ -319,12 +304,17 @@
{
nomove_count=0;
}
-uint8_t flag_4G_recdata;
-static void _4gUsart_handler(enum IO_PIN_T pin)
+uint8_t flag_4G_recdata,flag_entersleep;
+void _4gUsart_handler(enum IO_PIN_T pin)
{
- LOG_INFO(TRACE_MODULE_APP, "4G RX 唤醒\r\n");
- // flag_4G_recdata = 1;
- // AIR780EUartInit();
+ // if(!gpio_pin_get_val(_4G_USART_RX_Pin))
+ {
+ LOG_INFO(TRACE_MODULE_APP, "4G RX 唤醒\r\n");
+ flag_4G_recdata = 1;
+ delaysleep_count = 3;
+ }
+
+
}
extern uint16_t ip0,ip1,ip2,ip3,port;
extern uint8_t gps_4g_flag;
@@ -359,10 +349,10 @@
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)|4;
- LOG_INFO("设备ID: %x .\r\n",dev_id);
- LOG_INFO("固件版本:UWB-4G手环 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
- LOG_INFO("服务器地址: %d.%d.%d.%d:%d.\r\n",ip0,ip1,ip2,ip3,port);
+ g_com_map[VERSION] = (1<<8)|6;
+ 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,"服务器地址: %d.%d.%d.%d:%d.\r\n",ip0,ip1,ip2,ip3,port);
}
@@ -430,7 +420,7 @@
uart_close(UART_ID1);//解绑原来串口1
uart_close(UART_ID0);//解绑原来串口0
}
-uint8_t flag_4guart_needinit=0;
+uint8_t flag_4guart_needinit=0,tt2;
int main(void)
{
board_clock_run();
@@ -498,19 +488,21 @@
// 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);
+ tt2 = gpio_pin_get_val(_4G_USART_RX_Pin);
while (1)
{
if(flag_TCP_reconnectting||IfTCPConnected())
{
-
- // LOG_INFO(TRACE_MODULE_APP, "处理4G任务\r\n");
- air780_led_on();
- if(flag_4guart_needinit)
+ if(flag_4G_recdata==1)
{
- flag_4guart_needinit = 0;
- AIR780EUartInit();
+ flag_4G_recdata = 2;
+
+ LOG_INFO(TRACE_MODULE_APP, "运行Socket_RecvAll\r\n");
+ Socket_RecvAll();
}
+ air780_led_on();
+//LOG_INFO(TRACE_MODULE_APP, "处理4G\r\n");
Internet_Poll();
HIDO_ATLitePoll();
HIDO_TimerPoll();
@@ -523,33 +515,29 @@
SecondTask();
}
IdleTask();
- //3种情况后都要发包和休眠
- //if(send_flag){
- //message_construct();
- //send_udp;
- //air780_success_state=0;//关闭4G成功发送灯
- //blink_led(&air780_success_state);//成功测距闪烁4G状态灯
- //air780_success_state=0;
- //}
+
#ifndef DEBUG_MODE
//if(flag_sleeptimer)
- // if(!gpio_pin_get_val(INPUT_5V_Pin)&&((IfTCPConnected()&&Socket_IsSendQueueEmpty(0))||!flag_TCP_reconnectting&&!IfTCPConnected())&&!flag_4G_recdata) //进入休眠条件（与关系，全满足才进）：1.没有5V输入 2 TCP已连接时发送队列为空||TCP无连接时不在重连状态。
+ // if(!gpio_pin_get_val(INPUT_5V_Pin))//AIR780E_IsIPIdle() Socket_IsSendQueueEmpty(0)
+ // if(flag_4G_recdata!=2)
+ //if(((IfTCPConnected()&&AIR780E_IsIPIdle()&&Socket_IsSendQueueEmpty(0))||((!flag_TCP_reconnectting)&&!IfTCPConnected()))) //进入休眠条件（与关系，全满足才进）：1.没有5V输入 2 TCP已连接时发送队列为空||TCP无连接时不在重连状态。
+ if(delaysleep_count==0)
+ if((IfTCPConnected()&&AIR780E_IsIPIdle()&&Socket_IsSendQueueEmpty(0)))
{
- // if(!flag_4guart_needinit)
- {
- // LOG_INFO(TRACE_MODULE_APP, "4G RX 中断打开\r\n");
- // board_4GUsart_detection_init(_4gUsart_handler);
-//
- }
-// flag_sleeptimer =0;
-// LOG_INFO(TRACE_MODULE_APP, "进入休眠\r\n");
- // flag_4guart_needinit = 1;
-//
-// trace_flush();
-// uint32_t lock = int_lock();
-// //LOG_INFO(TRACE_MODULE_APP, "进入低功耗");
-// power_enter_power_down_mode(0);
-// int_unlock(lock);
+ 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);
+ LOG_INFO(TRACE_MODULE_APP, "进入休眠\r\n");
+ // delay_us(300000);
+ trace_flush();
+ lock = int_lock();
+ power_enter_power_down_mode(0);
+ int_unlock(lock);
}
#endif
}
--
Gitblit v1.9.3