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 | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index fb8e1ab..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)|24;
+ g_com_map[VERSION] = (1<<8)|32;
// g_com_map[DEV_ID]=1158;
// #ifdef DEBUG_MODE
// // g_com_map[GROUP_ID]=21;
@@ -373,7 +373,7 @@
// }
//g_com_map[NOMOVESLEEP_TIME]=5;
printf("固件版本: URT-LORA-GPS版本 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
- memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
+// memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
// printf("DEVICE PAIRID: %d .\r\n",g_com_map[PAIR_ID]);
// printf("DEVICE ALARM DISTANCE: 1.%d 2.%d 3.%d .\r\n",g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],g_com_map[ALARM_DISTANCE3]);
@@ -444,6 +444,8 @@
uint16_t irq_num;
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)
@@ -451,13 +453,31 @@
// SystemClock_Config();
irq_num++;
+
+ if(LoraUp_flag)
+ {
+ RadioIrqProcess();
+ }
+ else
+ {
lora_irq_flag = 1;
- // RadioIrqProcess();
+ }
}
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)//加速度
{
@@ -741,6 +761,7 @@
Error_Handler();
}
HAL_TIM_Base_Start_IT(&htim6);
+ memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
/* USER CODE END 2 */
/* Infinite loop */
@@ -775,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