From 1cfdce04c6fc1f67e3b5538b0bc90e0c77a71765 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 10 十一月 2021 10:30:18 +0800
Subject: [PATCH] 未完成
---
源码/核心板/Src/main.c | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 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 770bdd5..d061288 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,11 +72,7 @@
{
g_com_map[COM_INTERVAL]=100;
}
-<<<<<<< HEAD
- g_com_map[VERSION] = 0x012a;
-=======
- g_com_map[VERSION] = 0x0127;
->>>>>>> parent of 47d2701 (V1.41 璐熸暟涓嶈緭鍑� 淇敼鍥炲485鏃犳樉绀築UG)
+ g_com_map[VERSION] = 0x0132;
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;
@@ -160,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);
--
Gitblit v1.9.3