From 75544b683feca0b57fb7d5fa00cbc376dc6e62a5 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期五, 04 七月 2025 18:06:30 +0800
Subject: [PATCH] V1.28 针对东营高精度方案，专网匹配，去掉了4G入网 APN和查询IP的代码。
---
keil/include/main/main.c | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index d2c5f22..730c4a0 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)|28;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
@@ -575,6 +581,11 @@
LOG_INFO(TRACE_MODULE_APP,"设备UWB工作间隔: %x .\r\n",g_com_map[UWBFrequency]);
LOG_INFO(TRACE_MODULE_APP,"设备GPS工作间隔: %x .\r\n",g_com_map[GPSFrequency]);
LOG_INFO(TRACE_MODULE_APP,"当前GPS工作波特率: %d .\r\n",gpsbaudrate1);
+ #ifdef _4G_115200
+ LOG_INFO(TRACE_MODULE_APP,"当前4G波特率: 115200.\r\n");
+ #else
+ LOG_INFO(TRACE_MODULE_APP,"当前4G波特率: 9600.\r\n");
+ #endif
// LOG_INFO(TRACE_MODULE_APP,"充电是否开机标志位: %d .\r\n",g_com_map[URT_BQ]);
if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
{
@@ -917,7 +928,7 @@
IIC2_Init();
Accelerometer_Init();
// delay_ms(100);
- BarInit();
+// BarInit();
// delay_ms(100);
// gaodu=GetPressAndHeight();
PCA9555_init();
@@ -1005,7 +1016,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)
{
--
Gitblit v1.9.3