From ad4d22e710310abba8856b3297982082dd5184ea Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期二, 03 九月 2024 15:53:20 +0800
Subject: [PATCH] 安邦手环gps固件升级初版，gps串口变为高阻态
---
keil/include/main/main.c | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index ec79747..69906b6 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
@@ -97,6 +97,7 @@
static uint32_t sample[NUM_SAMPLES] = {0};
uint8_t recev_error_num,send_messgae_count,send_flag,control_state;
uint8_t flag_4g_usart_rx_state = 1; //4G 串口RX当前是 RX状态，不是GPIO状态
+int input_5v_flag,air780e_flag1,air780e_flag2,air780e_flag3,air780e_flag4;
typedef enum
{ UN_BIND=0,
LINK_SUCCESS,
@@ -250,6 +251,7 @@
//UWB更新列表
TagListUpdate();
GPS_Poll();
+ //gps_power_state=1;//测试
//UWB状态检测
if(IfTCPConnected())
@@ -275,7 +277,7 @@
uint8_t flag_sleeptimer,flag_secondtask,secondtask_count;
static void sleep_timer_callback(void *dev, uint32_t time)
{
- IO_control_init();
+// IO_control_init();
UWBPoll();
@@ -377,7 +379,7 @@
state5v=1;
state5V_prase_flag=state5v;
gps_prase_flag=0;//解除gps解析
- uart1_change_from_gps_to_debug();
+ //uart1_change_from_gps_to_debug();//测试
// uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
//UartInit();
}
@@ -390,7 +392,7 @@
state5v=0;
state5V_prase_flag=state5v;
gps_prase_flag=1;//恢复gps解析
- uart1_change_from_debug_to_gps();
+ //uart1_change_from_debug_to_gps();//测试
// uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
//UartDeinit();
}
@@ -531,25 +533,29 @@
//blink_led(&air780_success_state);//成功测距闪烁4G状态灯
//air780_success_state=0;
//}
+ input_5v_flag=!gpio_pin_get_val(INPUT_5V_Pin);
+ air780e_flag2,air780e_flag3,air780e_flag4;
+ air780e_flag1=((IfTCPConnected()&&Socket_IsSendQueueEmpty(0))||!flag_TCP_reconnectting&&!IfTCPConnected());
+
#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)&&((IfTCPConnected()&&Socket_IsSendQueueEmpty(0))||!flag_TCP_reconnectting&&!IfTCPConnected())) //进入休眠条件（与关系，全满足才进）：1.没有5V输入 2 TCP已连接时发送队列为空||TCP无连接时不在重连状态。
{
- // if(!flag_4guart_needinit)
+ if(!flag_4guart_needinit)
{
- // LOG_INFO(TRACE_MODULE_APP, "4G RX 中断打开\r\n");
- // board_4GUsart_detection_init(_4gUsart_handler);
-//
+ 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);
+ 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);
}
#endif
}
--
Gitblit v1.9.3