From e0ab7433ec2d2cd78c3faeeddb56024a7d1a2aea Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期二, 24 九月 2024 16:02:27 +0800 Subject: [PATCH] 1.32,加入双击sos关闭lora发送 --- Src/main.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Src/main.c b/Src/main.c index 1021ece..446d698 100644 --- a/Src/main.c +++ b/Src/main.c @@ -316,7 +316,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)|31; + g_com_map[VERSION] = (1<<8)|32; // g_com_map[DEV_ID]=1158; // #ifdef DEBUG_MODE // // g_com_map[GROUP_ID]=21; @@ -445,6 +445,7 @@ u8 lora_irq_flag,lora_working_flag; //u8 uwb_irq_flag; extern uint8_t LoraUp_flag; +uint8_t anjian_num; void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) { if(GPIO_Pin == RADIO_DIO1_Pin) @@ -465,7 +466,18 @@ if(GPIO_Pin == GPIO_PIN_1)//按键 { // SystemClock_Config(); - anjian_flag=1; + 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(); + Set4LEDColor(YELLOW,YELLOW,YELLOW,YELLOW); + delay_ms(100); + Set4LEDColor_Off(); + delay_ms(100); + SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader + } } if(GPIO_Pin == GPIO_PIN_0)//加速度 { @@ -784,7 +796,10 @@ OneSecondTask(); IdleTask(); PowerDownDetect(); - Lora_Send_Poll(); + if(g_com_map[LORA_SEND_INDEX]) + { + Lora_Send_Poll(); + } TTSchaxun_Busy(); LoraUp_Poll(); // #ifndef DEBUG_MODE -- Gitblit v1.9.3