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 | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index b5fe6af..632fe84 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -187,7 +187,7 @@
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;
@@ -311,8 +311,10 @@
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] = 0x021f;
-// 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]=0x4009;
@@ -327,6 +329,7 @@
// 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;
@@ -384,17 +387,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();
@@ -437,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();
@@ -1009,7 +1012,7 @@
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;
--
Gitblit v1.9.3