From 59d2aebded1f4ddb04596d4d821c7fce00ed8962 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 19 十一月 2024 20:41:41 +0800
Subject: [PATCH] 初步调通，但是发现好像是基站的问题，基站初次启动，40秒不测距。去解决基站问题
---
Src/main.c | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index b985873..7143522 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 */
@@ -103,7 +103,7 @@
void LedTask(void);
uint32_t dev_id;
uint16_t heartbeat_timer,poll_timer,sync_timer;
-uint8_t aRxBuffer[1],group_id;
+uint8_t aRxBuffer[1],group_id = 1;
uint8_t bat_percent=0,g_start_send_flag;
uint16_t tyncpoll_time,lpsettime;
uint16_t slottime,max_slotpos;
@@ -217,9 +217,10 @@
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)|17;
+ g_com_map[VERSION] = (2<<8)|8;
+// g_com_map[VERSION] = (3<<8)|2;
// g_com_map[DEV_ID]=1158;
- g_com_map[GROUP_ID]=0;
+ g_com_map[GROUP_ID]=1;
// g_com_map[COM_INTERVAL] = 1000;
if(g_com_map[COM_INTERVAL]<1000)
{
@@ -429,6 +430,7 @@
}
uint8_t usart5_state,flag_onesecond;
+uint8_t beep_flag;
void BeepTask(void)
{
if(1)//g_com_map[MOTOR_ENABLE])
@@ -437,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;
}
}
}
@@ -450,6 +454,7 @@
BeepTask();
}
}
+
/* USER CODE END 0 */
/**
@@ -534,12 +539,17 @@
IdleTask();
// if(g_com_map[LORA_SEND_INDEX])
// {
+
Lora_Send_Poll();
+
// }
LoraUp_Poll();
#ifndef DEBUG_MODE
+ 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
}
@@ -1052,6 +1062,8 @@
SystemClock_Config();
HAL_IWDG_Refresh(&hiwdg);
anjian_num=0;
+// if(++g_com_map[GROUP_ID]>2)
+// g_com_map[GROUP_ID] = 0;
if(active_flag==0) //未激活状态
{
if(!GET_USERKEY)
--
Gitblit v1.9.3