From c1235bf3f37ec78351203f6d7d8b6bf93e24860d Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期日, 29 六月 2025 17:42:30 +0800
Subject: [PATCH] 初步测试蓝牙协议和修改删除部分逻辑，完成蓝牙协议功能逻辑开发和实测，距离判断开关逻辑需要进一步确认优化，加入改附近频率设定并实测通过
---
keil/include/drivers/global_param.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/keil/include/drivers/global_param.c b/keil/include/drivers/global_param.c
index 153ef6d..5c1c945 100644
--- a/keil/include/drivers/global_param.c
+++ b/keil/include/drivers/global_param.c
@@ -48,8 +48,8 @@
result=flash_open(FLASH_ID0,NULL);
//MK8000没有对应函数
if(!result) {
- flash_erase(FLASH_ID0,FLASH_Authorization_MAP,FLASH_SECTOR_SIZE);
- flash_write_nbytes(FLASH_ID0, FLASH_Authorization_MAP, (const uint8_t*)g_com_map, sizeof(g_com_map));
+ flash_erase(FLASH_ID0,FLASH_IAP_CTRL_MAP,FLASH_SECTOR_SIZE);
+ flash_write_nbytes(FLASH_ID0, FLASH_IAP_CTRL_MAP, (const uint8_t*)g_com_map, sizeof(g_com_map));
}
//flash_close(FLASH_ID0);
__enable_irq();
@@ -67,8 +67,8 @@
result=flash_open(FLASH_ID0,NULL);
//MK8000没有对应函数
if(!result) {
- flash_erase(FLASH_ID0,FLASH_IAP_CTRL_MAP,FLASH_SECTOR_SIZE);
- flash_write_nbytes(FLASH_ID0, FLASH_IAP_CTRL_MAP, (const uint8_t*)tag_id_authorization_list, sizeof(tag_id_authorization_list));
+ flash_erase(FLASH_ID0,FLASH_Authorization_MAP,4*FLASH_SECTOR_SIZE);
+ flash_write_nbytes(FLASH_ID0, FLASH_Authorization_MAP, (const uint8_t*)tag_id_authorization_list, sizeof(tag_id_authorization_list));
//result = FLASH_Write(FLASH_IAP_CTRL_MAP, (const uint8_t*)g_com_map, (COM_MAP_SIZE<<1));
}
//flash_close(FLASH_ID0);
@@ -104,7 +104,7 @@
g_com_map[CNT_REBOOT]=0;
g_com_map[CNT_UPDATE]=0;
g_com_map[MOTOR_ONTIME_INDEX]=10;
- g_com_map[ACTIVE_INDEX]=0;
+ g_com_map[NERA_FREQUENCY]=5;//默认切换到5hz将标签
g_com_map[TCP_IP_0]=0x111;
g_com_map[TCP_IP_0]=0x198;
@@ -124,7 +124,7 @@
uint32_t count = 0;
for (uint32_t i = 0; i < AUTHORIZATION_NUM; i++) {
- if (tag_id_authorization_list[i] != 0) {
+ if (tag_id_authorization_list[i] != 0xffffffff&&tag_id_authorization_list[i] != 0) {
count++;
}
}
@@ -161,7 +161,7 @@
g_com_map[CNT_REBOOT]=0;
g_com_map[CNT_UPDATE]=0;
g_com_map[MODBUS_MODE]=0;
- g_com_map[ACTIVE_INDEX]=0;
+ g_com_map[NERA_FREQUENCY]=5;//默认切换到5hz将标签
g_com_map[TCP_IP_0]=0x111;
g_com_map[TCP_IP_1]=0x198;
--
Gitblit v1.9.3