From 9115414a73e9c9e47a6659be95c6f9f0304757f8 Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期二, 19 十一月 2024 11:18:39 +0800 Subject: [PATCH] V2.6 改成SF8,搭配基站1.30 实现3秒定位一次 --- Src/main.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Src/main.c b/Src/main.c index b985873..6a6c078 100644 --- a/Src/main.c +++ b/Src/main.c @@ -43,7 +43,7 @@ #define NSH1 0x0001 #define GP 0x0002 #define FLASH_HARDWARE_VERSION_MAP (uint32_t)0x08004F00 //硬件版本号和批次信息位置 -//#define DEBUG_MODE +#define DEBUG_MODE UART_WakeUpTypeDef Selection; /* USER CODE END Includes */ @@ -217,7 +217,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)|17; + g_com_map[VERSION] = (2<<8)|6; +// g_com_map[VERSION] = (3<<8)|2; // g_com_map[DEV_ID]=1158; g_com_map[GROUP_ID]=0; // g_com_map[COM_INTERVAL] = 1000; @@ -429,6 +430,7 @@ } uint8_t usart5_state,flag_onesecond; +uint8_t beep_flag; void BeepTask(void) { if(1)//g_com_map[MOTOR_ENABLE]) @@ -437,8 +439,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; } } } @@ -538,8 +542,11 @@ // } 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 } -- Gitblit v1.9.3