From 2e895d0a7b81c6216457ddd23690c1249ceb993d Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 24 七月 2020 10:09:38 +0800
Subject: [PATCH] V1.22 去掉标签串口输出
---
源码/核心板/Src/main.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
index 794be8a..d352e7b 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
@@ -67,7 +67,7 @@
save_com_map_to_flash();
#endif
OUT485_ENABLE;
- g_com_map[VERSION] = 0x0113;
+ g_com_map[VERSION] = 0x0116;
dev_id = g_com_map[DEV_ID];
slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*0.4)+3;
max_slotpos=g_com_map[COM_INTERVAL]/slottime;
@@ -148,7 +148,7 @@
}
if(target_time>1000)
{target_time-=1000;}
-
+ #ifdef USART_INTEGRATE_OUTPUT
if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
{u16 checksum;
usart_send_flag=0;
@@ -159,6 +159,7 @@
UART_PushFrame(usart_send_anc,6+anc_report_num*6);
anc_report_num=0;
}
+ #endif
if(g_com_map[CNT_UPDATE]==1)
{
uint32_t result = 0;
@@ -191,6 +192,10 @@
delay_ms(100);
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
+ if(g_com_map[MAP_SIGN_INDEX]!=0x55AA)
+ {
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ }
}
int main(void)
--
Gitblit v1.9.3