From 57a4e0aab7db7c8420cf425c89acb500add05196 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 17 五月 2021 14:11:24 +0800
Subject: [PATCH] 增加气压校准 PRFPRF模式
---
Src/main.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 3b67a45..9785627 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -31,7 +31,7 @@
#define NSH1 0x0001
#define GP 0x0002
-#define DEBUG_MODE
+//#define DEBUG_MODE
/* USER CODE END Includes */
/* Private typedef -----------------------------------------------------------*/
@@ -310,13 +310,13 @@
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] = 0x0219;
+ g_com_map[VERSION] = 0x021b;
// g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
- g_com_map[DEV_ID]=0x4009;
- g_com_map[ACTIVE_INDEX]=1;
- g_com_map[COM_INTERVAL]=50;
+// g_com_map[DEV_ID]=0x4009;
+// g_com_map[ACTIVE_INDEX]=1;
+ g_com_map[COM_INTERVAL]=100;
// g_com_map[MAX_REPORT_ANC_NUM]=1;
// g_com_map[NOMOVESLEEP_TIME]=10;
// g_com_map[IMU_ENABLE]=0;
@@ -332,7 +332,7 @@
g_com_map[NOMOVESLEEP_TIME]=10;
g_com_map[MOTOR_ENABLE]=0;
}
-
+g_com_map[HEIGHTOFFEST_INDEX]=g_com_map[MAX_REPORT_ANC_NUM];
module_power = g_com_map[POWER];
imu_enable=g_com_map[IMU_ENABLE];
motor_enable=g_com_map[MOTOR_ENABLE];
@@ -962,10 +962,10 @@
g_start_send_flag=1;
current_slotnum++;
SetNextPollTime(tagslotpos);
- nomove_count+=(float)g_com_map[COM_INTERVAL]/1000;
+ nomove_count+=1/(float)tag_frequency;
if(motor_keeptime>0)
{
- motor_keeptime-=(float)g_com_map[COM_INTERVAL]/1000;
+ motor_keeptime-=1/(float)tag_frequency;
}
if(motor_keeptime<0)
{motor_keeptime = 0;}
@@ -974,7 +974,7 @@
if(!GET_USERKEY)
{
LED_LG_ON;
- key_keeptime+=(float)g_com_map[COM_INTERVAL]/1000;
+ key_keeptime+=1/(float)tag_frequency;
if(key_keeptime>3)
{
u8 i=250,keystate=1;
@@ -1006,7 +1006,7 @@
if(!GET_USERKEY)
{
- key_keeptime+=(float)g_com_map[COM_INTERVAL]/1000;
+ key_keeptime+=1/(float)tag_frequency;
if(key_keeptime>=KEY_KEEPRESET_TIME)
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
--
Gitblit v1.9.3