From 26576b10250e5d38763c5026937c9f38fcf25dd0 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 03 十一月 2021 18:12:36 +0800
Subject: [PATCH] 测试
---
Src/main.c | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index e442ca6..e263881 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 -----------------------------------------------------------*/
@@ -109,9 +109,11 @@
Error_Handler();
}
}
+u8 active_flag=0;
uint16_t hardware_version,hardware_pici,hardware_type;
u16 current_time;
uint8_t state5v;
+u16 beepcount;
void IdleTask(void)
{
@@ -128,7 +130,17 @@
// LED_TB_OFF;
//}else{
// LED_TR_OFF;
- current_time=GetLPTime();
+if(active_flag)
+ {
+ current_time=HAL_LPTIM_ReadCounter(&hlptim1);
+ if(current_time-beepcount>3||beepcount>current_time)
+ {
+ beepcount = current_time;
+ LED_BLINK(GPIOA, GPIO_PIN_11);
+ }
+}
+
+
//motor_state=2;
if(g_com_map[MOTOR_ENABLE])
{
@@ -300,7 +312,7 @@
if(g_com_map[POWER]<0)
{g_com_map[POWER]=0;}
}
-u8 active_flag=0;
+
void Program_Init(void)
{ float temp;
uint16_t temp2;
@@ -311,14 +323,14 @@
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] = 0x0225;
+ g_com_map[VERSION] = 0x0226;
// 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]=100;
+// 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;
@@ -328,11 +340,12 @@
// g_com_map[IMU_ENABLE]=0;
// g_com_map[COM_INTERVAL]=1000;
active_flag = g_com_map[ACTIVE_INDEX];
+ g_com_map[COM_INTERVAL]=50;
if(active_flag==0)
{
g_com_map[COM_INTERVAL]=1000;
g_com_map[IMU_ENABLE]=1;
- g_com_map[NOMOVESLEEP_TIME]=10;
+ g_com_map[NOMOVESLEEP_TIME]=3;
g_com_map[MOTOR_ENABLE]=0;
}
//g_com_map[HEIGHTOFFEST_INDEX]=g_com_map[MAX_REPORT_ANC_NUM];
@@ -383,7 +396,7 @@
void HardWareTypeDiffConfig(void)
{
GPIO_InitTypeDef GPIO_InitStruct = {0};
-//hardware_type=2;
+hardware_type=2;
if(hardware_type == 0)
hardware_type = 1;
switch(hardware_type)
@@ -458,7 +471,7 @@
{
Error_Handler();
}
-
+ LED_BLINK(GPIOA, GPIO_PIN_11);
// HAL_Delay(2000);
// mcu_sleep();
//LED0_BLINK;
@@ -849,10 +862,10 @@
__HAL_RCC_GPIOB_CLK_ENABLE();
/*Configure GPIO pin Output Level */
- HAL_GPIO_WritePin(GPIOA, SCL_Pin|SDA_Pin|SPI_CS_Pin, GPIO_PIN_SET);
+ HAL_GPIO_WritePin(GPIOA, SPI_CS_Pin, GPIO_PIN_SET);
/*Configure GPIO pin Output Level */
- HAL_GPIO_WritePin(GPIOB, BAT_MEAS_GND_Pin|PWR_CTL_Pin, GPIO_PIN_SET);
+ HAL_GPIO_WritePin(GPIOB, SCL_Pin|SDA_Pin|BAT_MEAS_GND_Pin|PWR_CTL_Pin, GPIO_PIN_SET);
/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOB, LED1_G_Pin|LED1_R_Pin|LED2_R_Pin, GPIO_PIN_RESET);
@@ -871,7 +884,7 @@
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
- HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+ HAL_GPIO_Init(SCL_GPIO_Port, &GPIO_InitStruct);
/*Configure GPIO pin : SPI_CS_Pin */
GPIO_InitStruct.Pin = SPI_CS_Pin;
@@ -907,7 +920,7 @@
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
/*Configure GPIO pins : DW_WKUP_Pin DW_CTRL_Pin LED2_G_Pin */
- GPIO_InitStruct.Pin = DW_WKUP_Pin|DW_CTRL_Pin|LED2_G_Pin;
+ GPIO_InitStruct.Pin = DW_WKUP_Pin|DW_CTRL_Pin|LED2_G_Pin|GPIO_PIN_11;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
--
Gitblit v1.9.3