From 0401ba0353be795d83dad129a942d892c7f13eb5 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期六, 23 三月 2024 19:51:13 +0800
Subject: [PATCH] 修改同步时间，lora发送长度也会影响同步延迟的参数。 2.增加回复基站随机5个抢占位。
---
Src/main.c | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 8241e21..98f70aa 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -43,7 +43,7 @@
#define NSH1 0x0001
#define GP 0x0002
#define FLASH_HARDWARE_VERSION_MAP (uint32_t)0x08004F00 //硬件版本号和批次信息位置
-//#define DEBUG_MODE
+#define DEBUG_MODE
UART_WakeUpTypeDef Selection;
/* USER CODE END Includes */
@@ -195,6 +195,10 @@
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
+ if(memcmp(g_com_map2,g_com_map,200)!=0)
+ {
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
+ }
}
@@ -213,7 +217,7 @@
hardware_pici = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+2);
hardware_type = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4);
//deca_sleep(1000);
- g_com_map[VERSION] = (1<<8)|9;
+ g_com_map[VERSION] = (1<<8)|11;
// g_com_map[DEV_ID]=1158;
g_com_map[GROUP_ID]=0;
// g_com_map[COM_INTERVAL] = 1000;
@@ -258,7 +262,7 @@
module_power=0;
}
-
+ g_com_map[MAP_SIGN_INDEX] =0x55AA;
memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
}
@@ -1077,12 +1081,7 @@
Radio.Sleep();
sleep_flag = 1;
}
- } else {
- if(sleep_flag)
- {
- SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
- }
- }
+ }
#endif
if(nomove_count++>g_com_map[STATIONARY_TIME])
{
@@ -1096,6 +1095,11 @@
} else {
gotosleep_flag=0;
}
+ }else{
+ if(nomove_count<g_com_map[NOMOVESLEEP_TIME])
+ {
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
+ }
}
}
if(!GET_USERKEY) //长按重启逻辑
--
Gitblit v1.9.3