From 3bf01e59933f0fc7d6eabb107789be1ba51a2e2a Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 05 七月 2024 15:44:28 +0800
Subject: [PATCH] 1.16，双击关闭lora发送
---
Src/main.c | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index fc4d032..59e5b74 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)|16;
// 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)//加速度
{
@@ -519,7 +532,10 @@
// HAL_IWDG_Refresh(&hiwdg);
OneSecondTask();
IdleTask();
+ if(g_com_map[LORA_SEND_INDEX])
+ {
Lora_Send_Poll();
+ }
LoraUp_Poll();
#ifndef DEBUG_MODE
if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin)&&motor_keeptime==0)
@@ -1035,6 +1051,7 @@
// uint8_t pinlv;
SystemClock_Config();
HAL_IWDG_Refresh(&hiwdg);
+ anjian_num=0;
if(active_flag==0) //未激活状态
{
if(!GET_USERKEY)
--
Gitblit v1.9.3