From eae689d3a23fc860723bb6384c122dae3b48ee64 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 14 十月 2021 16:38:54 +0800
Subject: [PATCH] 天津测试
---
Src/main.c | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 9785627..806fe84 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -184,6 +184,7 @@
break;
}
}
+ bat_percent=Get_Battary();
if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
{
nomove_count = 0;
@@ -192,7 +193,7 @@
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,7 +311,8 @@
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] = 0x021b;
+ g_com_map[VERSION] = 0x0223;
+
// g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
@@ -327,7 +329,8 @@
// g_com_map[COM_INTERVAL]=1000;
active_flag = g_com_map[ACTIVE_INDEX];
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;
@@ -382,17 +385,17 @@
GPIO_InitTypeDef GPIO_InitStruct = {0};
//hardware_type=2;
if(hardware_type == 0)
- hardware_type = 2;
+ hardware_type = 1;
switch(hardware_type)
{
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();
@@ -435,7 +438,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();
@@ -487,8 +490,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();
--
Gitblit v1.9.3