From 99cdcc0b1000fab7d279fbea8a731e1fa22ec4ac Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 26 九月 2024 17:47:57 +0800
Subject: [PATCH] 尝试解决误报
---
keil/include/main/main.c | 116 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 66 insertions(+), 50 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 7f2d853..54ebd6b 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -169,7 +169,7 @@
bat_percent = ((fVoltage_mv - 3300) /8);
}
}
- // LOG_INFO(TRACE_MODULE_APP, "The voltage is %%%d \r\n",bat_percent);
+ // LOG_INFO(TRACE_MODULE_APP, "The voltage is %%%d \r\n",bat_percent);
}
//void UartInit(void)
//{
@@ -180,21 +180,37 @@
//}
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;
+uint8_t gps_enable_flag,motor_open_air_flag,moter_open_uwb_flag,flag_fenli_alarm = 0,fenli_alarm_count;
int need_open_gps_count;
void MotorPoll(void)
{
- if(UWB_work_state==UN_BIND) {
+ if(UWB_work_state==UN_BIND)
+ {
gps_uwb_flag=0;//关闭GPS
moter_open_uwb_flag=0;//关闭震动
need_open_gps_count=0;//清0计数gps
} else { //绑定状态下
if(anchordata_num==1) {
+ if(distance<g_com_map[ALARM_DISTANCE1])
+ {
+ fenli_alarm_count = 0;
+ if(flag_fenli_alarm)
+ {
+ fenli_alarm_count = 0;
+ _4GAlarmUpload(2);
+ }
+ } else {
+ if(fenli_alarm_count++>20)
+ {
+ flag_fenli_alarm = 1;
+ _4GAlarmUpload(1);
+ }
+ }
if(distance<g_com_map[ALARM_DISTANCE1]) { //小于预警距离
if(flag_alam_state)
{
flag_alam_state = 0;
- _4GAlarmUpload(2);
+
}
need_open_gps_count=0;
moter_open_uwb_flag=0;//关闭震动
@@ -206,7 +222,7 @@
if(!flag_alam_state)
{
flag_alam_state = 1;
- _4GAlarmUpload(1);
+
}
gps_uwb_flag=1;//开启gps测距流程
need_open_gps_count=0;
@@ -218,7 +234,7 @@
if(!flag_alam_state)
{
flag_alam_state = 1;
- _4GAlarmUpload(1);
+
}
gps_uwb_flag=1;//开启gps测距流程
need_open_gps_count=0;
@@ -228,9 +244,9 @@
if(!flag_alam_state)
{
flag_alam_state = 1;
- _4GAlarmUpload(1);
+
}
- distance = -1;
+ distance = 0x1ffff;
gps_uwb_flag=1;//开启gps测距流程
moter_open_uwb_flag=1;//开启震动
need_open_gps_count=0;
@@ -242,7 +258,7 @@
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
}
void SecondTask(void)
-{static uint8_t second_count;
+{ static uint8_t second_count;
if(second_count++>60)
{
second_count = 0;
@@ -251,7 +267,7 @@
//UWB更新列表
TagListUpdate();
//GPS_Poll();
- gps_power_state=1;//测试gps长开
+ gps_power_state=1;//测试gps长开
//UWB状态检测
if(IfTCPConnected())
@@ -279,14 +295,14 @@
{
IO_control_init();
UWBPoll();
-
-
+
+
MotorPoll();
if(secondtask_count++%2==0)
{
flag_secondtask = 1;
- }else{
+ } else {
flag_secondtask = 0;
}
@@ -297,19 +313,19 @@
{
if(motor_open_air_flag||moter_open_uwb_flag)
{
- if (motor_count++%2==0)
- {
- motor_power_state = 1;
- }else{
- motor_power_state = 0;
- }
+ if (motor_count++%2==0)
+ {
+ motor_power_state = 1;
+ } else {
+ motor_power_state = 0;
+ }
} else {
motor_power_state=1;
}
- }else{
+ } else {
motor_power_state=1;
}
-
+
//GPS工作逻辑
}
@@ -350,7 +366,7 @@
if(g_com_map[BIND_DEV_ID]==0)
{
UWB_work_state = UN_BIND;
- }else{
+ } else {
UWB_work_state = SEARCH_DEV;
}
if(g_com_map[SEND_4G_SECOND]<60)
@@ -361,7 +377,7 @@
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)|12;
+ g_com_map[VERSION] = (1<<8)|13;
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);
@@ -380,7 +396,7 @@
state5V_prase_flag=state5v;
gps_prase_flag=0;//解除gps解析
uart1_change_from_gps_to_debug();//测试
- // uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
+ // uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
//UartInit();
}
@@ -393,11 +409,11 @@
state5V_prase_flag=state5v;
gps_prase_flag=1;//恢复gps解析
uart1_change_from_debug_to_gps();//测试
- // uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
+ // uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
//UartDeinit();
}
}
- UART_CheckReceive();
+ UART_CheckReceive();
}
int bind_check(void)
{
@@ -422,15 +438,15 @@
}
void boot_deinit(void)
{
- //将boot中串口返回普通gpio
+ //将boot中串口返回普通gpio
// UART0 TX/RX
io_pin_mux_set(IO_PIN_5, IO_FUNC0);
io_pin_mux_set(IO_PIN_6, IO_FUNC0);
// UART1 RX/TX
io_pin_mux_set(IO_PIN_10, IO_FUNC0);
io_pin_mux_set(IO_PIN_9, IO_FUNC0);
- uart_close(UART_ID1);//解绑原来串口1
- uart_close(UART_ID0);//解绑原来串口0
+ uart_close(UART_ID1);//解绑原来串口1
+ uart_close(UART_ID0);//解绑原来串口0
}
uint8_t flag_4guart_needinit=0;
int main(void)
@@ -482,32 +498,32 @@
io_pin_mux_set(SCL_PIN, IO_FUNC0);//测试测距波形
gpio_pin_set_dir(SCL_PIN , GPIO_DIR_OUT, 0);
io_pull_set(SCL_PIN , IO_PULL_DOWN, IO_PULL_UP_LEVEL4);
- gps_air780_power_change(0,1);//开启gps，4G
+ gps_air780_power_change(0,1);//开启gps，4G
//加速度计初始化必须在IO_control_init之前因为复用SDA引脚
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
- Program_Init();
+ Program_Init();
//uart_open(UART_ID1, &test_uart_cfg);
-
- // uart1_change_from_gps_to_debug();
- //Uart1GpsRecDebugSend();
+
+ // 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秒,这个是无法同步的关键
+ 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_5V_input_init(voltage_input_handler);
board_acceleration_detection_init(move_handler);
// LOG_INFO(TRACE_MODULE_APP, "测试进入app");
-
+
while (1)
{
if(flag_TCP_reconnectting||IfTCPConnected())
{
-
- // LOG_INFO(TRACE_MODULE_APP, "处理4G任务\r\n");
+
+ // LOG_INFO(TRACE_MODULE_APP, "处理4G任务\r\n");
air780_led_on();
if(flag_4guart_needinit)
{
@@ -538,21 +554,21 @@
//if(flag_sleeptimer)
if(!gpio_pin_get_val(INPUT_5V_Pin)&&((IfTCPConnected()&&Socket_IsSendQueueEmpty(0))||!flag_TCP_reconnectting&&!IfTCPConnected())) //进入休眠条件（与关系，全满足才进）：1.没有5V输入 2 TCP已连接时发送队列为空||TCP无连接时不在重连状态。
{
- if(!flag_4guart_needinit)
+ if(!flag_4guart_needinit)
{
- LOG_INFO(TRACE_MODULE_APP, "4G RX 中断打开\r\n");
- board_4GUsart_detection_init(_4gUsart_handler);
+ LOG_INFO(TRACE_MODULE_APP, "4G RX 中断打开\r\n");
+ board_4GUsart_detection_init(_4gUsart_handler);
}
- flag_sleeptimer =0;
+ 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);
+ trace_flush();
+ uint32_t lock = int_lock();
+ //LOG_INFO(TRACE_MODULE_APP, "进入低功耗");
+ power_enter_power_down_mode(0);
+ int_unlock(lock);
}
#endif
}
--
Gitblit v1.9.3