From efab89b019485bb46eb52471ac7a6f99b9888abe Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期五, 27 十月 2023 12:16:20 +0800
Subject: [PATCH] V2.72 解决串口数据溢出，导致临近基站ID变0的问题
---
Src/application/dw_app.c | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/Src/application/dw_app.c b/Src/application/dw_app.c
index d46904a..f0beebe 100644
--- a/Src/application/dw_app.c
+++ b/Src/application/dw_app.c
@@ -223,7 +223,7 @@
}
u16 tag_time_recv[TAG_NUM_IN_SYS];
-u8 usart_send[25];
+u8 usart_send[125];
u8 battary,button;
extern uint8_t g_pairstart;
void tag_sleep_configuraion(void)
@@ -775,32 +775,32 @@
// tyncpoll_time = (tagslotpos--%max_slotpos)*slottime;
}
}
-void SendHuiZongData(void)
-{
- usart_send[2] = 0x0c;//正常模式
- usart_send[3] = 15+8*(nearbase_num+1);//数据段长度
- memcpy(&usart_send[4],&dev_id,2);
- usart_send[6] = frame_seq_nb;
- usart_send[7] = frame_seq_nb>>8;
- usart_send[8] = bat_percent;
- usart_send[9] = tx_near_msg[BUTTON_IDX];
+//void SendHuiZongData(void)
+//{
+// usart_send[2] = 0x0c;//正常模式
+// usart_send[3] = 15+8*(nearbase_num+1);//数据段长度
+// memcpy(&usart_send[4],&dev_id,2);
+// usart_send[6] = frame_seq_nb;
+// usart_send[7] = frame_seq_nb>>8;
+// usart_send[8] = bat_percent;
+// usart_send[9] = tx_near_msg[BUTTON_IDX];
- memcpy(&usart_send[10],&intheight,2);
- usart_send[12] = tag_frequency;
- usart_send[13] = tagslotpos;
- usart_send[14] = 0;
- usart_send[15] = 0;
- usart_send[16] = nearbase_num+1;
- memcpy(&usart_send[17],&mainbase_id,2);
- memcpy(&usart_send[19],&nearbaseid_list,2*nearbase_num);
- memcpy(&usart_send[19+nearbase_num*2],&nearbase_distlist,4*nearbase_num+4);
- memcpy(&usart_send[19+nearbase_num*6+4],&rec_anc_signalpower,2*nearbase_num+2);
+// memcpy(&usart_send[10],&intheight,2);
+// usart_send[12] = tag_frequency;
+// usart_send[13] = tagslotpos;
+// usart_send[14] = 0;
+// usart_send[15] = 0;
+// usart_send[16] = nearbase_num+1;
+// memcpy(&usart_send[17],&mainbase_id,2);
+// memcpy(&usart_send[19],&nearbaseid_list,2*nearbase_num);
+// memcpy(&usart_send[19+nearbase_num*2],&nearbase_distlist,4*nearbase_num+4);
+// memcpy(&usart_send[19+nearbase_num*6+4],&rec_anc_signalpower,2*nearbase_num+2);
- checksum = Checksum_u16(&usart_send[2],23+8*nearbase_num);
- memcpy(&usart_send[25+8*nearbase_num],&checksum,2);
- USART_puts(usart_send,27+8*nearbase_num);
- //HexToAsciiSendUDP(usart_send,27+8*nearbase_num);
-}
+// checksum = Checksum_u16(&usart_send[2],23+8*nearbase_num);
+// memcpy(&usart_send[25+8*nearbase_num],&checksum,2);
+// USART_puts(usart_send,27+8*nearbase_num);
+// //HexToAsciiSendUDP(usart_send,27+8*nearbase_num);
+//}
uint8_t pack_length = 0,pack_index = 0,pack_msgtype = 0;
uint8_t motor_flag;
void NearPoll(void)
--
Gitblit v1.9.3