From 2fe944b7b3cb50c59cc48f079d4b0f90237681b3 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期二, 22 十月 2024 15:15:02 +0800
Subject: [PATCH] 修改了ADC休眠后不采集bug
---
keil/include/main/main.c | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 01cee33..b8edffb 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -107,7 +107,7 @@
Commend_SendDate send_struct;
-static struct ADC_CFG_T usr_adc_cfg = {
+struct ADC_CFG_T usr_adc_cfg = {
.mode = ADC_MODE_CONTINUE, /* Selected single conversion mode */
.clk_sel = ADC_CLK_HIGH, /* Selected 62.4M high speed clock */
.vref_sel = ADC_SEL_VREF_INT, /* Using internal reference voltage (1.2V)*/
@@ -297,7 +297,7 @@
}
uint8_t tt=1;
uint8_t flag_sleeptimer,flag_secondtask,secondtask_count,log_4g_enable_flag;
-
+uint8_t uwb_enable_flag=0;
static void sleep_timer_callback(void *dev, uint32_t time)
{
// IO_control_init();
@@ -322,10 +322,10 @@
{
if(motor_open_air_flag||moter_open_uwb_flag)
{
- if (motor_count++%2==0)
+ if (motor_count++%3!=0)
{
motor_power_state = 1;
- }else{
+ }else {//修改
motor_power_state = 0;
}
} else {
@@ -334,6 +334,7 @@
}else{
motor_power_state=1;
}
+
if(delaysleep_count>0)
delaysleep_count--;
//GPS工作逻辑
@@ -350,7 +351,7 @@
uint8_t flag_4G_recdata;
void _4gUsart_handler(enum IO_PIN_T pin)
{
- LOG_INFO(TRACE_MODULE_APP, "4G RX 唤醒\r\n");
+ //LOG_INFO(TRACE_MODULE_APP, "4G RX 唤醒\r\n");
flag_4G_recdata = 1;
delaysleep_count = 3;
}
@@ -551,7 +552,7 @@
{
flag_4G_recdata = 2;
- LOG_INFO(TRACE_MODULE_APP, "运行Socket_RecvAll tt2 %d\r\n",tt2);
+ //LOG_INFO(TRACE_MODULE_APP, "运行Socket_RecvAll tt2 %d\r\n",tt2);
Socket_RecvAll();
}
air780_led_on();
@@ -594,9 +595,9 @@
index2=AIR780E_IsIPIdle();
index3=Socket_IsSendQueueEmpty(0);
if(delaysleep_count==0)
- if(!gps_power_state&&(IfTCPConnected()&&AIR780E_IsIPIdle()&&Socket_IsSendQueueEmpty(0)))
+ if(!gps_power_state&&!gpio_pin_get_val(INPUT_5V_Pin)&&(IfTCPConnected()&&AIR780E_IsIPIdle()&&Socket_IsSendQueueEmpty(0)))
{
- test1=gpio_pin_get_val(_4G_USART_RX_Pin);
+// test1=gpio_pin_get_val(_4G_USART_RX_Pin);
uint32_t lock;
//flag_4guart_needinit = 1;
Internet_Poll();
@@ -610,8 +611,8 @@
lock = int_lock();
power_enter_power_down_mode(0);
uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
- test3=gpio_pin_get_val(_4G_USART_RX_Pin);
- LOG_INFO(TRACE_MODULE_APP, "进入休眠\r\n");
+// test3=gpio_pin_get_val(_4G_USART_RX_Pin);
+ //LOG_INFO(TRACE_MODULE_APP, "进入休眠\r\n");
int_unlock(lock);
}
--
Gitblit v1.9.3