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 | 210 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 152 insertions(+), 58 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index b1e45dd..b8edffb 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -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,
@@ -106,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)*/
@@ -177,9 +178,9 @@
//board_debug_console_open(TRACE_PORT_UART0);
//uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
//}
-extern gps_uwb_flag;
-uint8_t TCP_reconnect_timer,flag_TCP_reconnectting = 1;
-uint8_t gps_enable_flag,motor_open_air_flag,moter_open_uwb_flag;
+extern uint8_t gps_uwb_flag;
+uint8_t TCP_reconnect_timer,flag_TCP_reconnectting = 1,flag_alam_state = 0;
+uint8_t gps_enable_flag,motor_open_air_flag,moter_open_uwb_flag,flag_fenli_alarm = 0,fenli_alarm_count,delaysleep_count;
int need_open_gps_count;
void MotorPoll(void)
{
@@ -190,6 +191,33 @@
} else { //绑定状态下
if(anchordata_num==1) {
if(distance<g_com_map[ALARM_DISTANCE1]) { //小于预警距离
+ fenli_alarm_count = 0;
+ if(flag_fenli_alarm)
+ {
+ flag_fenli_alarm = 0;
+ fenli_alarm_count = 0;
+ _4GAlarmUpload(2);
+ }
+ }
+ }
+ if(distance>g_com_map[ALARM_DISTANCE1]||anchordata_num==0)
+ {
+ if(fenli_alarm_count++>20)
+ {
+ if(!flag_fenli_alarm)
+ {
+ flag_fenli_alarm = 1;
+ _4GAlarmUpload(1);
+ }
+ }
+ }
+ if(distance<g_com_map[ALARM_DISTANCE1]) { //小于预警距离
+ if(flag_alam_state)
+ {
+ flag_alam_state = 0;
+
+ }
+
need_open_gps_count=0;
moter_open_uwb_flag=0;//关闭震动
gps_uwb_flag=0;//关闭GPS
@@ -197,6 +225,10 @@
need_open_gps_count++;
moter_open_uwb_flag=1;//开启震动
if(need_open_gps_count>=20) {
+ if(!flag_alam_state)
+ {
+ flag_alam_state = 1;
+ }
gps_uwb_flag=1;//开启gps测距流程
need_open_gps_count=0;
}
@@ -204,18 +236,28 @@
need_open_gps_count++;
moter_open_uwb_flag=1;//开启震动
if(need_open_gps_count>=20) {
+ if(!flag_alam_state)
+ {
+ flag_alam_state = 1;
+ }
gps_uwb_flag=1;//开启gps测距流程
need_open_gps_count=0;
}
+
+ }
+ if(anchordata_num==0) {
+ if(!flag_alam_state)
+ {
+ flag_alam_state = 1;
}
- } else if(anchordata_num==0) {
-
+ distance = 0x1ffff;
gps_uwb_flag=1;//开启gps测距流程
moter_open_uwb_flag=1;//开启震动
need_open_gps_count=0;
}
}
-}
+ }
+
void MinuteTask(void)
{
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
@@ -230,6 +272,7 @@
//UWB更新列表
TagListUpdate();
GPS_Poll();
+ //gps_power_state=1;//测试gps长开
//UWB状态检测
if(IfTCPConnected())
@@ -252,13 +295,19 @@
HIDO_TimerTick();
nomove_count++;
}
-uint8_t flag_sleeptimer,flag_secondtask,secondtask_count;
+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();
+ // IO_control_init();
+ if(tt)
UWBPoll();
- if(g_com_map[MOTOR_ENABLE])
+ //车载poll
+ UWB_Tag_Poll();
+
MotorPoll();
+
if(secondtask_count++%2==0)
{
flag_secondtask = 1;
@@ -269,18 +318,25 @@
flag_sleeptimer = 1;
//马达震动逻辑
- if(motor_open_air_flag||moter_open_uwb_flag)
+ if(g_com_map[MOTOR_ENABLE])
{
- if (motor_count++%2==0)
- {
- motor_power_state = 1;
- }else{
- motor_power_state = 0;
- }
- } else {
+ if(motor_open_air_flag||moter_open_uwb_flag)
+ {
+ if (motor_count++%3!=0)
+ {
+ motor_power_state = 1;
+ }else {//修改
+ motor_power_state = 0;
+ }
+ } else {
+ motor_power_state=1;
+ }
+ }else{
motor_power_state=1;
}
-
+
+ if(delaysleep_count>0)
+ delaysleep_count--;
//GPS工作逻辑
}
@@ -293,20 +349,22 @@
nomove_count=0;
}
uint8_t flag_4G_recdata;
-static void _4gUsart_handler(enum IO_PIN_T pin)
+void _4gUsart_handler(enum IO_PIN_T pin)
{
- LOG_INFO(TRACE_MODULE_APP, "4G RX 唤醒\r\n");
- // flag_4G_recdata = 1;
- // AIR780EUartInit();
+ //LOG_INFO(TRACE_MODULE_APP, "4G RX 唤醒\r\n");
+ flag_4G_recdata = 1;
+ delaysleep_count = 3;
}
extern uint16_t ip0,ip1,ip2,ip3,port;
+extern uint8_t gps_4g_flag;
+extern uint8_t gps_need_data_flag;
void Program_Init(void)
{
Usart1ParseDataCallback = UsartParseDataHandler;//需改为默认为gps处理，UsartParseDataHandler为升级处理当调试时候改为
parameter_init_anchor();//g_com_map表初始化角色默认为基站
dev_id=g_com_map[DEV_ID];//这里不太对
group_id=g_com_map[GROUP_ID];//组ID
- tag_frequency = 1000/g_com_map[COM_INTERVAL];//测距频率这个存的是测距时间
+// tag_frequency = 1000/g_com_map[COM_INTERVAL];//测距频率这个存的是测距时间
memcpy(&disoffset,&g_com_map[DIST_OFFSET],2);
// g_com_map[ALARM_DISTANCE1] = 40;
// g_com_map[ALARM_DISTANCE2] = 40;
@@ -316,7 +374,7 @@
send_struct.alarmDistence=prewarning_distance;//更新报警距离
memcpy(&send_struct.gunLableId,&g_com_map[BIND_DEV_ID],2);//更新绑定ID
send_struct.tagId=dev_id;//更新设备ID
-
+
if(g_com_map[BIND_DEV_ID]==0)
{
UWB_work_state = UN_BIND;
@@ -326,15 +384,16 @@
if(g_com_map[SEND_4G_SECOND]<60)
g_com_map[SEND_4G_SECOND]=60;
g_com_map[MODBUS_MODE] = 0;
+ log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
ip0 = (g_com_map[TCP_IP_0]>>12&0xf)*1000+(g_com_map[TCP_IP_0]>>8&0xf)*100+(g_com_map[TCP_IP_0]>>4&0xf)*10+(g_com_map[TCP_IP_0]&0xf);
ip1 = (g_com_map[TCP_IP_1]>>12&0xf)*1000+(g_com_map[TCP_IP_1]>>8&0xf)*100+(g_com_map[TCP_IP_1]>>4&0xf)*10+(g_com_map[TCP_IP_1]&0xf);
ip2 = (g_com_map[TCP_IP_2]>>12&0xf)*1000+(g_com_map[TCP_IP_2]>>8&0xf)*100+(g_com_map[TCP_IP_2]>>4&0xf)*10+(g_com_map[TCP_IP_2]&0xf);
ip3 = (g_com_map[TCP_IP_3]>>12&0xf)*1000+(g_com_map[TCP_IP_3]>>8&0xf)*100+(g_com_map[TCP_IP_3]>>4&0xf)*10+(g_com_map[TCP_IP_3]&0xf);
port = g_com_map[TCP_PORT];
- g_com_map[VERSION] = (1<<8)|2;
- LOG_INFO("设备ID: %x .\r\n",dev_id);
- LOG_INFO("固件版本:UWB-4G手环 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
- LOG_INFO("服务器地址: %d.%d.%d.%d:%d.\r\n",ip0,ip1,ip2,ip3,port);
+ g_com_map[VERSION] = (1<<8)|10;
+ LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
+ LOG_INFO(TRACE_MODULE_APP,"固件版本:UWB-4G车载手环 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+ LOG_INFO(TRACE_MODULE_APP,"服务器地址: %d.%d.%d.%d:%d.\r\n",ip0,ip1,ip2,ip3,port);
}
@@ -349,7 +408,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();
}
@@ -362,7 +421,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();
}
@@ -403,6 +462,10 @@
uart_close(UART_ID0);//解绑原来串口0
}
uint8_t flag_4guart_needinit=0;
+uint8_t index1,index2,index3;
+int tt2;
+int test1,test3;
+uint32_t test4;
int main(void)
{
board_clock_run();
@@ -446,6 +509,7 @@
//board_led_init();
adc_open(&usr_adc_cfg);
+
IIC2_Init();
Accelerometer_Init();
IO_control_init();
@@ -455,33 +519,43 @@
gps_air780_power_change(0,1);//开启gps，4G
//加速度计初始化必须在IO_control_init之前因为复用SDA引脚
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
- // uart_open(UART_ID1, &test_uart_cfg);
- Program_Init();
+ Program_Init();
+ //uart_open(UART_ID1, &test_uart_cfg);
+
// uart1_change_from_gps_to_debug();
//Uart1GpsRecDebugSend();
uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
// Initialize low power mode
power_init();
+ AIR780E_Reset(); //4G模块重启，耗时1.5秒,这个是无法同步的关键
sleep_timer_open(true, SLEEP_TIMER_MODE_RELOAD, sleep_timer_callback);
//sleep_timer_start(__MS_TO_32K_CNT(g_com_map[COM_INTERVAL]));//测试
sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试
// board_5V_input_init(voltage_input_handler);
board_acceleration_detection_init(move_handler);
// LOG_INFO(TRACE_MODULE_APP, "测试进入app");
- AIR780E_Reset(); //4G模块重启，耗时1.5秒,这个是无法同步的关键
+ board_4GUsart_detection_init(_4gUsart_handler);
while (1)
- {
+ {
+ tt2 = gpio_pin_get_val(_4G_USART_RX_Pin);
if(flag_TCP_reconnectting||IfTCPConnected())
{
-
// LOG_INFO(TRACE_MODULE_APP, "处理4G任务\r\n");
- air780_led_on();
- if(flag_4guart_needinit)
+
+// if(flag_4guart_needinit)
+// {
+// flag_4guart_needinit = 0;
+// AIR780EUartInit();
+// }//yuan
+ if(flag_4G_recdata==1)
{
- flag_4guart_needinit = 0;
- AIR780EUartInit();
+ 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();
@@ -492,36 +566,56 @@
{
flag_secondtask = 0;
SecondTask();
+
}
IdleTask();
- //3种情况后都要发包和休眠
- //if(send_flag){
- //message_construct();
- //send_udp;
- //air780_success_state=0;//关闭4G成功发送灯
- //blink_led(&air780_success_state);//成功测距闪烁4G状态灯
- //air780_success_state=0;
- //}
#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(!flag_4guart_needinit)
- {
- // LOG_INFO(TRACE_MODULE_APP, "4G RX 中断打开\r\n");
- // board_4GUsart_detection_init(_4gUsart_handler);
-//
- }
+// if(!gps_need_data_flag&&!gpio_pin_get_val(INPUT_5V_Pin)&&((IfTCPConnected()&&Socket_IsSendQueueEmpty(0))||!flag_TCP_reconnectting&&!IfTCPConnected())) //进入休眠条件（与关系，全满足才进）：1.没有5V输入 2 TCP已连接时发送队列为空||TCP无连接时不在重连状态。
+// {
+// if(!flag_4guart_needinit)
+// {
+// 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;
-//
+// 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);
+// }//yuan
+
+// if(delaysleep_count==0)
+index1=IfTCPConnected();
+index2=AIR780E_IsIPIdle();
+index3=Socket_IsSendQueueEmpty(0);
+ if(delaysleep_count==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);
+ uint32_t lock;
+ //flag_4guart_needinit = 1;
+ Internet_Poll();
+ HIDO_ATLitePoll();
+ HIDO_TimerPoll();
+ TCPClient_Poll();
+ // power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)_4G_USART_RX_Pin, POWER_WAKEUP_LEVEL_LOW);
+
+ // delay_us(300000);
+ trace_flush();
+ 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");
+ int_unlock(lock);
}
+
#endif
}
}
--
Gitblit v1.9.3