From 555a3fbf00af26a682df7dd27f7762a291cd008f Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 17 十一月 2022 11:18:10 +0800
Subject: [PATCH] V1.35
---
Src/main.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 75159d5..002643b 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -185,7 +185,7 @@
break;
}
}
- if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
+ if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin)||HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,GPIO_PIN_6))
{
nomove_count = 0;
bat_percent=Get_Battary();
@@ -308,7 +308,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] = (1<<8)|31;
+ g_com_map[VERSION] = (1<<8)|34;
+ g_com_map[VERSION] = (1<<8)|35;
active_flag = g_com_map[ACTIVE_INDEX];
module_power = g_com_map[POWER];
imu_enable=g_com_map[IMU_ENABLE];
@@ -329,6 +330,8 @@
imu_enable=1;
nomovesleeptime =10;
}
+ g_com_map[IMU_ENABLE] = 0;
+ imu_enable=0;
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
// g_com_map[DEV_ID]=1;
@@ -873,7 +876,7 @@
HAL_GPIO_Init(USER_KEY_GPIO_Port, &GPIO_InitStruct);
/*Configure GPIO pin : INPUT_5V_Pin */
- GPIO_InitStruct.Pin = INPUT_5V_Pin;
+ GPIO_InitStruct.Pin = INPUT_5V_Pin|GPIO_PIN_6;
GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
GPIO_InitStruct.Pull = GPIO_PULLDOWN;
HAL_GPIO_Init(INPUT_5V_GPIO_Port, &GPIO_InitStruct);
--
Gitblit v1.9.3