From 51b6c7e11c8863fe4710305431c5718a9d0d1985 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 15 十一月 2021 20:02:38 +0800
Subject: [PATCH] V1.63
---
源码/核心板/Src/main.c | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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 fbfc77a..407a6aa 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"
@@ -72,7 +72,7 @@
{
g_com_map[COM_INTERVAL]=100;
}
- g_com_map[VERSION] = 0x0129;
+ g_com_map[VERSION] = 0x013F;
g_com_map[SW_TYPE] = SW_FANGZHUANG;
dev_id = g_com_map[DEV_ID];
slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
@@ -156,16 +156,16 @@
}
if(flag_newsecond)
{
- uint32_t temp23;
- temp23 = dwt_read32bitreg(CHAN_CTRL_ID) ;
- if(temp23!=0x4A480022)
- {
- temp23 = dwt_read32bitreg(CHAN_CTRL_ID) ;
- if(temp23!=0x4A480022)
- {
- NVIC_SystemReset();
- }
- }
+// uint32_t temp23;
+// temp23 = dwt_read32bitreg(CHAN_CTRL_ID) ;
+// if(temp23!=0x4A480022)
+// {
+// temp23 = dwt_read32bitreg(CHAN_CTRL_ID) ;
+// if(temp23!=0x4A480022)
+// {
+// NVIC_SystemReset();
+// }
+// }
flag_newsecond=0;
tagpos_binary=0;
memcpy(ancidlist_send,ancidlist_rec,ancidlist_num*2);
@@ -223,12 +223,12 @@
delay_ms(100);
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
- if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0)
+ if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0||g_com_map[COM_INTERVAL]>1000)
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
- }
+ }
int main(void)
{
--
Gitblit v1.9.3