From f0e236adc153a6d06874704ec6ba39a22af05ff6 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 15 一月 2025 14:54:55 +0800
Subject: [PATCH] 1.25，修改看门狗喂狗时间。加入休眠后加速度计唤醒会直接重启
---
Src/main.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 1d2c7c4..eda5382 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 */
@@ -173,6 +173,7 @@
state5v=1;
UsartInit();
}
+ HAL_IWDG_Refresh(&hiwdg);
if(bat_percent>99)
{
LED_TR_OFF;
@@ -182,6 +183,7 @@
LED_TB_OFF;
}
} else {
+ HAL_IWDG_Refresh(&hiwdg);
if(state5v==1)
{
state5v=0;
@@ -217,9 +219,9 @@
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)|20;
+ g_com_map[VERSION] = (1<<8)|25;
// g_com_map[DEV_ID]=1158;
- g_com_map[GROUP_ID]=0;
+ g_com_map[GROUP_ID]=3;
// g_com_map[COM_INTERVAL] = 1000;
if(g_com_map[COM_INTERVAL]<1000)
{
@@ -362,6 +364,8 @@
if(GPIO_Pin == GPIO_PIN_0)//加速度
{
SystemClock_Config();
+ if(sleep_flag)
+ {HAL_NVIC_SystemReset();}
stationary_flag =0;
stationary_num=0;
}
@@ -463,6 +467,8 @@
BeepTask();
}
}
+uint8_t uwb_kaiguanrx_falg;
+extern uint8_t uwbrxflag;
/* USER CODE END 0 */
/**
@@ -507,7 +513,7 @@
LIS3DH_Data_Init();
Dw1000_Init();
Delay_Ms(10);
-// dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
+ dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
// dwt_entersleep();
if(HAL_UART_Receive_DMA(&huart1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE))
{
@@ -548,6 +554,16 @@
// uwb_work_flag=0;
// MbxTagUwbRec();
// }
+ if(uwb_kaiguanrx_falg==1)
+ {
+ uwb_kaiguanrx_falg=0;
+ UWB_RXON();
+ }
+ if(uwb_kaiguanrx_falg==2)
+ {
+ uwb_kaiguanrx_falg=0;
+ UWB_RXOFF();
+ }
OneSecondTask();
IdleTask();
// if(g_com_map[LORA_SEND_INDEX])
@@ -556,7 +572,7 @@
// }
LoraUp_Poll();
#ifndef DEBUG_MODE
- if(beep_flag==0)
+ if(beep_flag==0&&uwbrxflag!=1)
{
if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin)&&motor_keeptime==0)
HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
@@ -1070,11 +1086,13 @@
uint8_t no_yingdatime,tflag1,tflag2;
extern uint16_t tagdist_list[ANC_MAX_NUM];
extern uint8_t Lora_send_flag;
+uint8_t Lora_send_time;
+extern u8 lora_jianting_flag;
void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
{
// uint8_t pinlv;
SystemClock_Config();
- HAL_IWDG_Refresh(&hiwdg);
+// HAL_IWDG_Refresh(&hiwdg);
anjian_num=0;
if(active_flag==0) //未激活状态
{
@@ -1114,8 +1132,31 @@
} else {
if(!sleep_flag)
{
+ Lora_send_time++;
flag_onesecond = 1;
+ if(lora_jianting_flag)
+ {
+ if(Lora_send_time%3==1)
+ {
+// UWB_RXON();
+ uwb_kaiguanrx_falg=1;
+ }
+ if(Lora_send_time%3==2)
+ {
+// UWB_RXOFF();
+ uwb_kaiguanrx_falg=2;
+ }
+ }
+ else
+ {
+ uwb_kaiguanrx_falg=0;
+ UWB_RXOFF();
+ }
+ if(Lora_send_time%3==0)
+ {
Lora_send_flag=1;
+ }
+
#ifndef DEBUG_MODE
if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&imu_enable&&motor_keeptime==0)
{
@@ -1125,6 +1166,9 @@
Radio.Sleep();
sleep_flag = 1;
LedOff_task();
+ UWB_RXOFF();
+ uwb_kaiguanrx_falg=0;
+ uwbrxflag=0;
}
}
#endif
--
Gitblit v1.9.3