From fb94d1fed6b33cdf6247ab4297f748d499c2b589 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 21 九月 2022 15:05:09 +0800
Subject: [PATCH] V1.70 修改数据输出方式
---
源码/核心板/Src/application/dw_app.c | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
index 61a2ad7..7858417 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
@@ -1,6 +1,6 @@
#include "dw_app.h"
#include "ADC.h"
-#define TDFILTER
+//#define TDFILTER
enum enumtagstate
{
DISCPOLL,
@@ -319,6 +319,7 @@
u8 exsistbase_list[MAX_NEARBASE_NUM],report_num,get_newbase=0,rec_extratag_battary;
u16 temp_sync_timer1,temp_sync_timer2,rec_extratag_id,success_ancid;
int32_t rec_extratag_dist;
+uint8_t usart_send_array[5][21],usart_array_num;
void NearPoll(void)
{
static u8 mainbase_lost_count=0,flag_finalsend,flag_rxon;
@@ -494,7 +495,8 @@
usart_send[14] = button;
checksum = Checksum_u16(&usart_send[2],17);
memcpy(&usart_send[19],&checksum,2);
- UART_PushFrame(usart_send,21);
+ //UART_PushFrame(usart_send,21);
+ memcpy(&usart_send_array[usart_array_num++],usart_send,21);
usartoutput_count++;
#endif
@@ -511,7 +513,8 @@
usart_send[14] = button;
checksum = Checksum_u16(&usart_send[2],17);
memcpy(&usart_send[19],&checksum,2);
- UART_PushFrame(usart_send,21);
+ memcpy(&usart_send_array[usart_array_num++],usart_send,21);
+ //UART_PushFrame(usart_send,21);
#endif
}
}
@@ -566,7 +569,8 @@
usart_send[14] = button;
checksum = Checksum_u16(&usart_send[2],17);
memcpy(&usart_send[19],&checksum,2);
- UART_PushFrame(usart_send,21);
+ //UART_PushFrame(usart_send,21);
+ memcpy(&usart_send_array[usart_array_num++],usart_send,21);
usartoutput_count++;
#endif
@@ -593,7 +597,8 @@
usart_send[14] = button;
checksum = Checksum_u16(&usart_send[2],17);
memcpy(&usart_send[19],&checksum,2);
- UART_PushFrame(usart_send,21);
+ memcpy(&usart_send_array[usart_array_num++],usart_send,21);
+ //UART_PushFrame(usart_send,21);
#endif
}
}
@@ -969,7 +974,10 @@
if(tagnewdist_list[taglist_pos])
{
tagnewdist_list[taglist_pos] = 0;
- memcpy(&tx_nearresp_msg[DIST_IDX], &tagdist_list[taglist_pos], 4);
+ memcpy(&tx_nearresp_msg[DIST_IDX], &tagdist_list[taglist_pos], 4);
+ }else{
+ int32_t nodistvalue = 0x1ffff;
+ memcpy(&tx_nearresp_msg[DIST_IDX], &nodistvalue, 4);
}
}
tx_nearresp_msg[GROUP_ID_IDX] = group_id;
--
Gitblit v1.9.3