From e939c01afd679c96ef823e7ae940b9cfd5733e8c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 03 十一月 2021 15:23:44 +0800
Subject: [PATCH] 天津定制
---
Src/main.c | 57 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 5bf4ea3..632fe84 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -184,15 +184,16 @@
break;
}
}
+ bat_percent=Get_Battary();
if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
{
- nomove_count = 0;
+ //nomove_count = 0;
if(state5v==0)
{
state5v=1;
UsartInit();
}
- if(bat_percent>99)
+ if(HAL_GPIO_ReadPin(PWR_ON_GPIO_Port,PWR_ON_Pin))
{
LED_LR_OFF;
LED_LG_ON;
@@ -260,7 +261,7 @@
#ifdef FIXSLOT
fix_slotpos =FIXSLOTPOS;
- //fix_slotpos = g_com_map[ALARM_DISTANCE1];
+ fix_slotpos = g_com_map[ALARM_DISTANCE2];
slotpos = fix_slotpos;
tagslotpos = fix_slotpos;
#endif
@@ -310,13 +311,15 @@
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] = 0x0218;
-// g_com_map[DEV_ID]=0x7;
+ g_com_map[VERSION] = 0x0224;
+
+ g_com_map[DEV_ID]=0x3496;
+ g_com_map[IMU_ENABLE]=0;
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
- g_com_map[DEV_ID]=0x4008;
- g_com_map[ACTIVE_INDEX]=1;
-// g_com_map[COM_INTERVAL]=100;
+// 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;
@@ -326,13 +329,15 @@
// g_com_map[IMU_ENABLE]=0;
// g_com_map[COM_INTERVAL]=1000;
active_flag = g_com_map[ACTIVE_INDEX];
+ active_flag = 1;
if(active_flag==0)
- { g_com_map[COM_INTERVAL]=1000;
+ {
+ g_com_map[COM_INTERVAL]=1000;
g_com_map[IMU_ENABLE]=1;
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];
@@ -387,16 +392,16 @@
{
case 1:
- HAL_GPIO_WritePin(GPIOB, MOTOR_Pin, GPIO_PIN_SET);
- GPIO_InitStruct.Pin = MOTOR_Pin;
- GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
- GPIO_InitStruct.Pull = GPIO_NOPULL;
- GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
- HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+ HAL_GPIO_WritePin(GPIOB, MOTOR_Pin, GPIO_PIN_SET);
+ GPIO_InitStruct.Pin = MOTOR_Pin;
+ GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+ HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
break;
case 2:
MX_TIM2_Init();
- //BarInit();
+ BarInit();
break;
}
}
@@ -435,7 +440,7 @@
/* Initialize all configured peripherals */
MX_GPIO_Init();
MX_LPTIM1_Init();
- MX_DMA_Init();
+ MX_DMA_Init();
MX_USART1_UART_Init();
MX_SPI1_Init();
MX_ADC_Init();
@@ -444,6 +449,7 @@
LED_LG_ON;
Program_Init();
LIS3DH_Data_Init();
+ // BarInit();
Dw1000_Init();
Dw1000_App_Init();
HardWareTypeDiffConfig();
@@ -455,6 +461,7 @@
{
Error_Handler();
}
+
// HAL_Delay(2000);
// mcu_sleep();
//LED0_BLINK;
@@ -485,8 +492,6 @@
// HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_RESET);
// }
// LED_TR_BLINK;
-
- bat_percent=Get_Battary();
if(bat_percent>15)
{ LED_TB_ON;
Tag_App();
@@ -960,10 +965,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;}
@@ -972,7 +977,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;
@@ -1004,10 +1009,10 @@
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;
+ // SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
}
}else{
key_keeptime=0;
@@ -1024,10 +1029,12 @@
}else{
gotosleep_flag=0;
}
+#ifndef DEBUG_MODE
if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&imu_enable)
{
mcu_sleep();
}
+#endif
}
/* USER CODE END 4 */
--
Gitblit v1.9.3