From 9daeefcf11512b152329b2bcf5a54de06397f42b Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 05 八月 2022 11:45:37 +0800
Subject: [PATCH] V1.31 增加蜂鸣器逻辑
---
Src/main.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index d4e6303..205dd70 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -146,7 +146,7 @@
{MOTOR_OFF;
}else if(hardware_type==GP)
{
- HAL_TIM_PWM_Stop(&htim21, TIM_CHANNEL_3);
+ HAL_TIM_PWM_Stop(&htim21, TIM_CHANNEL_2);
}
break;
case 1:
@@ -156,14 +156,14 @@
{MOTOR_ON;
}else if(hardware_type==GP)
{
- HAL_TIM_PWM_Start(&htim21, TIM_CHANNEL_3);
+ HAL_TIM_PWM_Start(&htim21, TIM_CHANNEL_2);
}
}else{
if(hardware_type==NSH1)
{MOTOR_OFF;
}else if(hardware_type==GP)
{
- HAL_TIM_PWM_Stop(&htim21, TIM_CHANNEL_3);
+ HAL_TIM_PWM_Stop(&htim21, TIM_CHANNEL_2);
}
}
break;
@@ -172,7 +172,7 @@
{MOTOR_ON;
}else if(hardware_type==GP)
{
- HAL_TIM_PWM_Start(&htim21, TIM_CHANNEL_3);
+ HAL_TIM_PWM_Start(&htim21, TIM_CHANNEL_2);
}
break;
case 3:
@@ -180,7 +180,7 @@
{MOTOR_OFF;
}else if(hardware_type==GP)
{
- HAL_TIM_PWM_Stop(&htim21, TIM_CHANNEL_3);
+ HAL_TIM_PWM_Stop(&htim21, TIM_CHANNEL_2);
}
break;
}
@@ -276,9 +276,9 @@
void HardWareTypeDiffConfig(void)
{
GPIO_InitTypeDef GPIO_InitStruct = {0};
-//hardware_type=2;
-if(hardware_type == 0)
- hardware_type = 1;
+hardware_type=2;
+//if(hardware_type == 0)
+// hardware_type = 1;
switch(hardware_type)
{
case 1:
@@ -307,7 +307,7 @@
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)|29;
+ g_com_map[VERSION] = (1<<8)|31;
active_flag = g_com_map[ACTIVE_INDEX];
module_power = g_com_map[POWER];
imu_enable=g_com_map[IMU_ENABLE];
@@ -427,7 +427,7 @@
LIS3DH_Data_Init();
Dw1000_Init();
Dw1000_App_Init();
- //HardWareTypeDiffConfig();
+ HardWareTypeDiffConfig();
dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
dwt_entersleep();
waitusart_timer=tag_frequency*USART_KEEPWAKE_TIME;;
--
Gitblit v1.9.3