From 2eeb6bd4fbcb8fc684f022f411b49bffb45671f1 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 22 十月 2021 18:19:00 +0800
Subject: [PATCH] 测试完成
---
Src/main.c | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 9041d80..ad15dbb 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -321,13 +321,14 @@
g_com_map[COM_INTERVAL]=100;
// g_com_map[MAX_REPORT_ANC_NUM]=1;
// g_com_map[NOMOVESLEEP_TIME]=10;
-// g_com_map[IMU_ENABLE]=0;
+ g_com_map[IMU_ENABLE]=0;
// g_com_map[COM_INTERVAL]=50;
#endif
-//g_com_map[NOMOVESLEEP_TIME]=10;
-// g_com_map[IMU_ENABLE]=0;
-// g_com_map[COM_INTERVAL]=1000;
+g_com_map[NOMOVESLEEP_TIME]=1000;
+ g_com_map[IMU_ENABLE]=0;
+ g_com_map[COM_INTERVAL]=1000;
active_flag = g_com_map[ACTIVE_INDEX];
+ active_flag = 1;
if(active_flag==0)
{
g_com_map[COM_INTERVAL]=1000;
@@ -478,10 +479,21 @@
// {
// MODBUS_Poll();
// }
+ if(waitusart_timer>0)
+ {
+ waitusart_timer--;
+ }
+ if(m_bEUARTTxEn==0&&waitusart_timer==0&&(motor_state==0||motor_state==3))
+ {
+ HAL_GPIO_WritePin(LED1_G_GPIO_Port, LED1_G_Pin, GPIO_PIN_RESET);
+#ifndef DEBUG_MODE
+ if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
+ HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
+#endif
+ }
active_flag = 1;
if(g_start_send_flag&&active_flag)
{ static uint16_t blink_count=0;
- SystemClock_Config();
g_start_send_flag = 0;
// GetPressAndTemp();
// if(current_count>slot_startcount&¤t_count<slot_startcount+interval_count)
@@ -491,6 +503,7 @@
// HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_RESET);
// }
// LED_TR_BLINK;
+
if(bat_percent>15)
{ LED_TB_ON;
Tag_App();
@@ -502,17 +515,6 @@
}
//LED0_BLINK;
IdleTask();
- if(waitusart_timer>0)
- {
- waitusart_timer--;
- }
- if(m_bEUARTTxEn==0&&waitusart_timer==0&&(motor_state==0||motor_state==3))
- {
-#ifndef DEBUG_MODE
- if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
- HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
-#endif
- }
}else{
@@ -960,6 +962,8 @@
{
static uint8_t i=0;
i++;
+ HAL_GPIO_WritePin(LED1_G_GPIO_Port, LED1_G_Pin, GPIO_PIN_SET);
+ SystemClock_Config();
g_start_send_flag=1;
current_slotnum++;
--
Gitblit v1.9.3