From 9667a85ddd12abcad4b4b5df85c7f624a66d3c1f Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期五, 04 七月 2025 17:48:04 +0800
Subject: [PATCH] V1.27修改休眠引脚的4G的唤醒脚，修改了静止休眠不进入，添加读取引脚电平逻辑
---
keil/include/main/main.c | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index d2c5f22..0abb809 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -149,12 +149,18 @@
PCA9555_Set_One_Value_Output(GPS_POWER,0);//关闭gps，4G
// PCA9555_Set_One_Value_Output(TTS_ENABLE,0);
+// gpio_pin_get_val(PCA_INPUT_DETECT);
PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭gps，4G
-
- sleep_timer_stop();
+ sleep_timer_stop();
+// delay_ms(200);
+ if(!gpio_pin_get_val(PCA_INPUT_DETECT))
+ {
+ return;
+ }
//adc_close();
power_enter_power_down_mode(1);
+
// LOG_INFO(TRACE_MODULE_APP, "从休眠出来\r\n");
sys_reset(0);
int_unlock(lock);
@@ -338,7 +344,7 @@
HIDO_TimerTick();
// if(nomove_count<=g_com_map[NOMOVESLEEP_TIME])//防止溢出
nomove_count++;
- gaodu=GetPressAndHeight()*100;
+// gaodu=GetPressAndHeight()*100;
// else{
// nomove_count=g_com_map[NOMOVESLEEP_TIME]+1;
// }
@@ -564,7 +570,7 @@
// }
g_com_map[MODBUS_MODE] = 0;
log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
- g_com_map[VERSION] = (1<<8)|25;
+ g_com_map[VERSION] = (1<<8)|27;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
@@ -667,8 +673,8 @@
HIDO_TimerPoll();
HIDO_ATLitePoll();
TCPClient_Poll();
- if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
- {TCPClient_Poll_1();}
+// if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
+// {TCPClient_Poll_1();}
if(flag_secondtask)
{
flag_secondtask = 0;
@@ -917,7 +923,7 @@
IIC2_Init();
Accelerometer_Init();
// delay_ms(100);
- BarInit();
+// BarInit();
// delay_ms(100);
// gaodu=GetPressAndHeight();
PCA9555_init();
@@ -954,10 +960,10 @@
// NTRIPClient_Init();
// NTRIPApp_Init();
// }
- if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
- {
- TCPClient_Init_1();
- }
+// if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
+// {
+// TCPClient_Init_1();
+// }
// HTTPClient_Init();
wdt_open(WDT_ID0,&app_wdt_cfg);//30s检测喂狗
LED_output_init();//配置彩色灯引脚
@@ -1005,7 +1011,7 @@
PCA9555_Set_One_Value_Output(ADC_MINIUS,0);//拉低
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
pca_input_detection_init(pca_handler);//pca检测输入
- gaodu=GetPressAndHeight()*100;
+// gaodu=GetPressAndHeight()*100;
while (1)
{
@@ -1015,10 +1021,10 @@
HIDO_ATLitePoll();
TCPClient_Poll();
wdt_ping(WDT_ID0);//喂狗
- if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
- {
- TCPClient_Poll_1();
- }
+// if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
+// {
+// TCPClient_Poll_1();
+// }
if(flag_secondtask)
{
flag_secondtask = 0;
--
Gitblit v1.9.3