From 42f0a59b2439560afcdf17a155d9249ccc4aa30d Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 19 四月 2024 17:22:38 +0800
Subject: [PATCH] V2.6
---
APL/App.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/APL/App.c b/APL/App.c
index 777ee59..e9b3a2b 100644
--- a/APL/App.c
+++ b/APL/App.c
@@ -121,7 +121,7 @@
#define YUNDONG_UWB_TIME 1
#define YUNDONG_GPS4G_TIME 100
extern UART_HandleTypeDef huart2;
-uint8_t GPS_data[100];
+uint8_t GPS_data[200];
uint8_t GPS_successful_flag;
uint8_t fangchai_flag;
uint8_t fangchai_state;
@@ -139,6 +139,7 @@
extern uint8_t air780_state;
extern uint16_t sleep_time;
uint8_t zuihoufasong_falg;
+uint8_t UDPClient_UploadGPS_flag;
void PowerLedTask(void)
{
static u8 powerled_state=0;
@@ -181,6 +182,7 @@
chongdian_yundong_time=0;
Uwb_Zubao_Poll();
UDPClient_UploadGPS((char*)GPS_data);
+// UDPClient_UploadGPS_flag=1;
HexToAsciiSendUDP(uwb_send,19+5*taglist_num);
taglist_num=0;
}
@@ -193,6 +195,7 @@
if(GPS_successful_flag)
{
UDPClient_UploadGPS((char*)GPS_data);
+// UDPClient_UploadGPS_flag=1;
}
else
{
@@ -231,7 +234,7 @@
//deca_sleep(1000);
g_com_map[GROUP_ID]=3;
- g_com_map[VERSION] = (2<<8)|5;
+ g_com_map[VERSION] = (2<<8)|6;
if (g_com_map[COM_INTERVAL] <50)
{
@@ -375,7 +378,7 @@
uint16_t state_flag;
u16 uwbchecksum;
state_flag=fangchai_flag<<4;
- if(taglist_num>8)
+ if(taglist_num>8)
{taglist_num=8;}
uwb_send[2] = 0x12;//正常模式
uwb_send[3] = 15+5*(taglist_num);//数据段长度
@@ -391,8 +394,7 @@
uwb_send[14] = 0;
uwb_send[15] = 0;
uwb_send[16] = taglist_num;
- if(taglist_num>7)
- {taglist_num=7;}
+
memcpy(&uwb_send[17],&tagid_list,2*taglist_num);
memcpy(&uwb_send[17+taglist_num*2],&tagdist_list,2*taglist_num);
memcpy(&uwb_send[17+taglist_num*4],&tagbat_list,taglist_num);
@@ -440,6 +442,7 @@
if(GPS_successful_flag)
{
UDPClient_UploadGPS((char*)GPS_data);
+// UDPClient_UploadGPS_flag=1;
}
else
{
@@ -507,6 +510,7 @@
yundong_time=0;
Uwb_Zubao_Poll();
UDPClient_UploadGPS((char*)GPS_data);
+// UDPClient_UploadGPS_flag=1;
HexToAsciiSendUDP(uwb_send,19+5*taglist_num);
taglist_num=0;
}
@@ -521,6 +525,7 @@
if(GPS_successful_flag)
{
UDPClient_UploadGPS((char*)GPS_data);
+// UDPClient_UploadGPS_flag=1;
}
else
{
--
Gitblit v1.9.3