From d3a77da7be3808ce65448dbfa9d43d13ba9e0ecd Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 17 八月 2021 14:58:21 +0800
Subject: [PATCH] 增加基站状态输出，增加map表对比
---
源码/核心板/Src/main.c | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 0074482..6de1a95 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"
@@ -94,7 +94,7 @@
#endif
OUT485_ENABLE;
ComMapCheck();
- g_com_map[VERSION] = 0x0217;
+ g_com_map[VERSION] = 0x0218;
dev_id = g_com_map[DEV_ID];
slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
max_slotpos=g_com_map[COM_INTERVAL]/slottime;
@@ -125,6 +125,7 @@
{
g_Tagdist[i]=0x1ffff;
}
+ memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
}
/*! ------------------------------------------------------------------------------------------------------------------
@@ -171,6 +172,14 @@
UART_CheckSend();
UART2_CheckReceive();
+ if( memcmp(g_com_map2,g_com_map,COM_MAP_SIZE)!=0)
+ {
+ SendAnchorState(SM_MAPERROR);
+ delay_ms(100);
+ // STMFLASH_Write_NoCheck(0x8004A38,0xAAAA);
+ // Delay_ms(100);
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ }
if(heartbeat_timer>1000)
{
heartbeat_timer=0;
@@ -208,6 +217,7 @@
{
uint32_t result = 0;
u16 tmp = 0xAAAA;
+ SendAnchorState(SM_UPDATE);
__disable_irq();
result = FLASH_Prepare(0x8004A38, 2);
if(result)
@@ -221,14 +231,14 @@
// Delay_ms(100);
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
- if(g_com_map[CNT_REBOOT]==1)
- {
- g_com_map[CNT_REBOOT]=0;
- g_com_map[MAP_SIGN_INDEX]=0;
- save_com_map_to_flash();
- delay_ms(100);
- SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
- }
+// if(g_com_map[CNT_REBOOT]==1)
+// {
+// g_com_map[CNT_REBOOT]=0;
+// g_com_map[MAP_SIGN_INDEX]=0;
+// save_com_map_to_flash();
+// delay_ms(100);
+// SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+// }
if(g_com_map[CNT_RESTART]==1)
{
g_com_map[CNT_RESTART]=0;
--
Gitblit v1.9.3