From fa86ebd985aaf06c2257a41f04e131a74a3c79bc Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 10 一月 2025 16:57:07 +0800
Subject: [PATCH] 稳定7个标签上线不掉线版本
---
keil/include/main/main.c | 100 +++++++++++++++++++++++++++-----------------------
1 files changed, 54 insertions(+), 46 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 233a8b8..d19347f 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -295,7 +295,7 @@
void IMUTask(void)
{
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);
+ {//power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)ACCLERATE_DETECT_Pin, POWER_WAKEUP_LEVEL_HIGH);
mcu_deep_sleep();
}
}
@@ -366,23 +366,23 @@
// //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])//防止溢出
@@ -394,7 +394,7 @@
uint8_t tt=1;
uint8_t flag_sleeptimer,flag_secondtask,secondtask_count,log_4g_enable_flag;
uint8_t uwb_enable_flag=0;
-
+uint8_t flag_4G_recdata;
void check_input_change(void)
{
uint16_t gpio_state;
@@ -402,6 +402,11 @@
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);
}
@@ -427,7 +432,7 @@
PCA9555_readdata(PCA9555_DEVICE_ADDR,pca9555writedata_input);//读输入寄存器的值
check_input_change();
}
-uint8_t flag_4G_recdata;
+
void _4gUsart_handler(enum IO_PIN_T pin)
{
//LOG_INFO(TRACE_MODULE_APP, "4G RX 唤醒\r\n");
@@ -603,23 +608,27 @@
// open system timer
//sys_timer_open();
-
- // TODO 4G
+ // TODO 4G
Uart_Register(UART_ID_4G, UART_ID0);
-// Internet_Init();
-// TCPClient_Init();
-
+ Internet_Init();
+ TCPClient_Init();
gpio_open();
LED_output_init();//配置adcGND引脚
+ IIC2_Init();
+ Accelerometer_Init();
+ PCA9555_init();
+
+
+ AIR780E_Reset();
// battery_monitor_open();
// Voltage_input=battery_monitor_get();
// battery_monitor_close();
adc_open(&usr_adc_cfg);
- IIC2_Init();
- Accelerometer_Init();
- PCA9555_init();
+
+
+
if(!read_5v_input_pca())
{
Set4LEDColor(BLUE,GREEN,WHITE,GREEN);
@@ -651,20 +660,20 @@
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
board_acceleration_detection_init(move_handler);
pca_input_detection_init(pca_handler);//pca检测输入
+
+ //board_4GUsart_detection_init(_4gUsart_handler);
Uwb_init();
OpenUWB();
- //board_4GUsart_detection_init(_4gUsart_handler);
+
while (1)
{
uwb_app_poll();
- //test4=gpio_pin_get_val(SCL_PIN);
- //UWBPoll();
// if(!power_low_flag)//确认是否休眠下才开启功能
// {
-// if(flag_TCP_reconnectting||IfTCPConnected())
-// {
+ if(flag_TCP_reconnectting||IfTCPConnected())
+ {
// // LOG_INFO(TRACE_MODULE_APP, "处理4G任务\r\n");
//
//// if(flag_4guart_needinit)
@@ -672,20 +681,19 @@
//// 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();
-// }
+ 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();
+
+ }
// }
if(flag_secondtask)
{
--
Gitblit v1.9.3