From eed634653ed4e6f6dfcf9b29ec69316e286358ee Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期二, 06 五月 2025 14:06:39 +0800
Subject: [PATCH] 孟权测试版本，GPS波特率115200 uwb5s开一秒
---
keil/include/main/main.c | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 7c564a2..7923559 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -29,6 +29,7 @@
extern int simple_main(void);
extern int temp_main(void);
void boot_deinit(void);
+void upload_apppoll();
#define TEST_UART_POLL_MODE 0
#define TEST_UART_INTERUPT_MODE 1
#define TEST_UART_DMA_MODE 2
@@ -42,7 +43,7 @@
#define UWB_OPEN_COUNT 1
-#define UWB_MEASUREMENT_INTERVAL 3
+#define UWB_MEASUREMENT_INTERVAL 5
#define UWB_MEASUREMENT_INTERVAL_SLEEP 60
extern uint8_t mUsartReceivePack[100];
@@ -316,6 +317,9 @@
{
input5v_time=1;
flag_secondtask = 1;
+ #ifdef UWB_1_5HZ
+ uwb_time_count++;
+ #endif
if(!read_5v_input_pca())
{
if(bat_percent>15)
@@ -336,6 +340,7 @@
Uwb_init();
OpenUWB();
}
+ upload_apppoll();
}else{
flag_secondtask = 0;
}
@@ -604,9 +609,12 @@
}
extern uint32_t uwb_time_count;
+uint8_t GPS_UPLOAD_FLAG=0;
void upload_apppoll()
{
- uint32_t elapsed_time_jibu;
+ uint32_t elapsed_time_jibu;
+#ifdef UWB_1_5HZ
+
switch (current_state)
{
@@ -617,16 +625,18 @@
case UWB_OPEN_COUNT:
CloseUWB();
uwbled = LEDOFF;
+ UWBSendUDPTask();
+ GPS_UPLOAD_FLAG=1;
break;
case UWB_MEASUREMENT_INTERVAL:
OpenUWB();
uwbled = BLUE;
- state_start_time = uwb_time_count;
+ state_start_time = uwb_time_count;
+
break;
}
break;
-
case STATE_SLEEP:
elapsed_time_jibu = uwb_time_count - state_start_time;
switch(elapsed_time_jibu)
@@ -644,7 +654,7 @@
}
break;
}
-
+#endif
}
uint8_t flag_4guart_needinit=0;
@@ -710,7 +720,9 @@
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
pca_input_detection_init(pca_handler);//pca检测输入
Uwb_init();
- OpenUWB();
+ #ifdef UWB_CK
+ OpenUWB();
+ #endif
// DBG_SetMode(DBG_MODE_SHELL);
// Shell_Init();
@@ -731,7 +743,6 @@
while (1)
{
uwb_app_poll();
-// upload_apppoll();
Internet_Poll();
HIDO_TimerPoll();
HIDO_ATLitePoll();
--
Gitblit v1.9.3