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 | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 42ab498..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 */
@@ -195,7 +195,7 @@
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
- if(memcmp(g_com_map2,g_com_map,200)!=0)
+ if(memcmp(g_com_map2,g_com_map,100)!=0)
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
}
@@ -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)|11;
+ 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;
@@ -226,6 +227,8 @@
g_com_map[COM_INTERVAL] = 1000;
}
g_com_map[STATIONARY_TIME] = 10;
+ g_com_map[LORA_POWER] = 22;
+ g_com_map[POWER] = 67;
active_flag = g_com_map[ACTIVE_INDEX];
module_power = g_com_map[POWER];
// g_com_map[IMU_ENABLE] = 0;
@@ -262,7 +265,7 @@
module_power=0;
}
-
+ g_com_map[MAP_SIGN_INDEX] =0x55AA;
memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
}
@@ -320,6 +323,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)
{
@@ -333,6 +337,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)//加速度
{
@@ -414,6 +430,7 @@
}
uint8_t usart5_state,flag_onesecond;
+uint8_t beep_flag;
void BeepTask(void)
{
if(1)//g_com_map[MOTOR_ENABLE])
@@ -422,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;
}
}
}
@@ -517,10 +536,17 @@
// 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))
+ 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
}
@@ -1032,6 +1058,7 @@
// uint8_t pinlv;
SystemClock_Config();
HAL_IWDG_Refresh(&hiwdg);
+ anjian_num=0;
if(active_flag==0) //未激活状态
{
if(!GET_USERKEY)
@@ -1073,13 +1100,14 @@
flag_onesecond = 1;
Lora_send_flag=1;
#ifndef DEBUG_MODE
- if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&imu_enable)
+ if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&imu_enable&&motor_keeptime==0)
{
if(sleep_flag==0)
{
Radio.Standby();
Radio.Sleep();
sleep_flag = 1;
+ LedOff_task();
}
}
#endif
--
Gitblit v1.9.3