From d1b1bde250a2b63d86f8f75671c4ff8aefcb2baa Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 25 十月 2024 16:54:48 +0800
Subject: [PATCH] 1.18，解决蜂鸣断断续续的问题
---
Src/main.c | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index fc4d032..9ba9bc0 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -217,7 +217,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)|15;
+ g_com_map[VERSION] = (1<<8)|18;
// g_com_map[DEV_ID]=1158;
g_com_map[GROUP_ID]=0;
// g_com_map[COM_INTERVAL] = 1000;
@@ -322,6 +322,7 @@
HAL_ADC_DeInit(&hadc);
HAL_ADCEx_DisableVREFINT();
}
+uint8_t anjian_num;
uint16_t irq_num;
void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
{
@@ -335,6 +336,18 @@
{
SystemClock_Config();
anjian_flag=1;
+// anjian_num++;
+// if(anjian_num==2)
+// {
+// g_com_map[LORA_SEND_INDEX] = !g_com_map[LORA_SEND_INDEX];
+// save_com_map_to_flash();
+// LED_TB_ON;
+// LED_TR_ON;
+// LED2_TB_ON;
+// LED2_TR_ON;
+// delay_ms(100);
+// SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+// }
}
if(GPIO_Pin == GPIO_PIN_0)//加速度
{
@@ -416,6 +429,7 @@
}
uint8_t usart5_state,flag_onesecond;
+uint8_t beep_flag;
void BeepTask(void)
{
if(1)//g_com_map[MOTOR_ENABLE])
@@ -424,8 +438,10 @@
{
motor_keeptime--;
HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_4);
+ beep_flag=1;
}else{
HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_4);
+ beep_flag=0;
}
}
}
@@ -519,11 +535,17 @@
// HAL_IWDG_Refresh(&hiwdg);
OneSecondTask();
IdleTask();
+// if(g_com_map[LORA_SEND_INDEX])
+// {
Lora_Send_Poll();
+// }
LoraUp_Poll();
#ifndef DEBUG_MODE
+ if(beep_flag==0)
+ {
if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin)&&motor_keeptime==0)
HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
+ }
#endif
}
@@ -1035,6 +1057,7 @@
// uint8_t pinlv;
SystemClock_Config();
HAL_IWDG_Refresh(&hiwdg);
+ anjian_num=0;
if(active_flag==0) //未激活状态
{
if(!GET_USERKEY)
--
Gitblit v1.9.3