From 5102fff8a13c0319d8125a51d3d2354e7aacdcea Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期四, 31 七月 2025 16:40:06 +0800
Subject: [PATCH] 修改为2HZ发poll包，修改second task从原来2s一次为1s一次
---
keil/include/main/main.c | 60 ++++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 6214b7a..f7e8f7c 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -136,7 +136,7 @@
.flow = UART_FLOW_CONTROL_NONE,
.rx_level = UART_RXFIFO_CHAR_1,
.tx_level = UART_TXFIFO_EMPTY,
- .baud = BAUD_9600,
+ .baud = BAUD_115200,
#if (TEST_UART_MODE == TEST_UART_POLL_MODE)
.dma_en = false,
.int_rx = false,
@@ -302,6 +302,7 @@
uint8_t bind_flag;
int8_t bind_count=BIND_COUNT_NUM;
extern uint8_t find_flag;
+uint8_t poll_count,poll_flag;
void SecondTask(void)
{static uint8_t second_count;
if(second_count++>60)
@@ -309,16 +310,17 @@
second_count = 0;
MinuteTask();
}
- if(bind_flag)
- {
- if(bind_count--<=0)
- {
- bind_count=BIND_COUNT_NUM;
- copy_taglist_to_flash();
- sys_reset(0);
- bind_flag=0;
- }
- }
+
+// if(bind_flag)
+// {
+// if(bind_count--<=0)
+// {
+// bind_count=BIND_COUNT_NUM;
+// copy_taglist_to_flash();
+// sys_reset(0);
+// bind_flag=0;
+// }
+// }
// //UWB状态检测
//if(!power_low_flag)//低供电下不需要检测重连
// {
@@ -340,7 +342,7 @@
}
// }
- HIDO_TimerTick();
+ HIDO_TimerTick();
if(nomove_count<=g_com_map[NOMOVESLEEP_TIME])//防止溢出
nomove_count++;
else{
@@ -369,6 +371,7 @@
static void sleep_timer_callback(void *dev, uint32_t time)
{
+ poll_flag=1;
if(secondtask_count++%2==0)
{
@@ -435,9 +438,13 @@
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)|0;
+ gpio_pin_set(CHANGE_UART_PIN);//；拉高打印输出
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
LOG_INFO(TRACE_MODULE_APP,"固件版本:MK_无感闸机 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);
+ while(uart_tx_in_progress(UART_ID0));
+ gpio_pin_clr(CHANGE_UART_PIN);//；拉低输入
+
}
@@ -509,7 +516,8 @@
int tt2;
int test1,test3;
uint32_t test4;
-#define SLEEP_TIMER_NUM 1000
+//uint16_t count_tag;
+#define SLEEP_TIMER_NUM 500
int main(void)
{
board_clock_run();
@@ -546,29 +554,37 @@
// open system timer
//sys_timer_open();
gpio_open();
- LED_output_init();//配置彩色灯引脚
+ LED_output_init();//配置串口控制脚
adc_open(&usr_adc_cfg);
+
Program_Init();
- //uart_open(UART_ID1, &test_uart_cfg);
- // uart1_change_from_gps_to_debug();
- //Uart1GpsRecDebugSend();
- uart_receive(UART_ID0,m_EUART0_DMA_RXBuf,EUART0_RX_BUF_SIZE,uart0_receive_callback);
+
+ uart_open(UART_ID1, &test_uart_cfg);
uart_receive(UART_ID1,m_EUART1_DMA_RXBuf,EUART1_RX_BUF_SIZE,uart1_receive_callback);
+ uart_receive(UART_ID0,m_EUART0_DMA_RXBuf,EUART0_RX_BUF_SIZE,uart0_receive_callback);
// Initialize low power mode
power_init();
sleep_timer_open(true, SLEEP_TIMER_MODE_RELOAD, sleep_timer_callback);
sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
- //board_acceleration_detection_init(move_handler);
-// pca_input_detection_init(pca_handler);//pca检测输入
- //board_4GUsart_detection_init(_4gUsart_handler);
- //Uwb_init();
+ uwb_open();
Anchor_uwb_aoa_square_init();
+
OpenUWB();
while (1)
{
uwb_app_poll();
+ if(poll_flag)
+ {
+ // count_tag++;
+ CloseUWB();//关闭接收
+ Tag_uwb_aoa_square_init();
+ TagRange(); //做标签
+ Anchor_uwb_aoa_square_init();
+ poll_flag=0;
+ OpenUWB();
+ }
if(flag_secondtask)
{
flag_secondtask = 0;
--
Gitblit v1.9.3