From 6e7d484264afa951a0491cb4a868580a2f0b647b Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 25 八月 2021 15:05:24 +0800
Subject: [PATCH] map表检查
---
源码/核心板/Src/main.c | 53 +++++++++++++++--------------------------------------
1 files changed, 15 insertions(+), 38 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 a3e26bd..bf4e8de 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"
@@ -91,7 +91,8 @@
{
module_power=67;
}
- g_com_map[VERSION] = 0x0129;
+ g_com_map[VERSION] = 0x012e;
+ g_com_map[SW_TYPE] = SW_MODBUS;
temp=(float)g_com_map[MAX_REPORT_ANC_NUM]*4/3;
temp2=g_com_map[MAX_REPORT_ANC_NUM]*4/3;
if(temp2<temp)
@@ -117,7 +118,7 @@
// printf("DEVICE PAIRID: %d .\r\n",g_com_map[PAIR_ID]);
// printf("DEVICE ALARM DISTANCE: 1.%d 2.%d 3.%d .\r\n",g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],g_com_map[ALARM_DISTANCE3]);
-
+ memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
for(i=0;i<255;i++)
{
g_Tagdist[i]=0xffff;
@@ -142,8 +143,18 @@
void IdleTask(void)
{
g_start_sync_flag=0;
- UART_CheckReceive();
- UART_CheckSend();
+ UART_CheckReceive();
+ UART_CheckSend();
+ if( memcmp(g_com_map2,g_com_map,COM_MAP_SIZE)!=0)
+ {
+ SendAnchorState(SM_MAPERROR);
+ 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
+ }
if(heartbeat_timer>1000)
{
heartbeat_timer=0;
@@ -151,45 +162,11 @@
HeatBeat();
}
- if(g_com_map[CNT_UPDATE]==1)
- {
- uint32_t result = 0;
- u16 tmp = 0xAAAA;
- __disable_irq();
- result = FLASH_Prepare(0x8004A38, 2);
- if(result)
- result = FLASH_Write(0x8004A38, (const uint8_t*)&tmp, 2);
- __enable_irq();
- printf("进入升级模式\r\n");
- g_com_map[CNT_UPDATE]=0;
- save_com_map_to_flash();
- delay_ms(100);
- // STMFLASH_Write_NoCheck(0x8004A38,0xAAAA);
- // 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;
- save_com_map_to_flash();
- delay_ms(100);
- SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
- }
-
}
uint16_t temp;
float dw_vbat;
int main(void)
{
-
Device_Init();
Program_Init();
Dw1000_Init();
--
Gitblit v1.9.3