From 12c58931b1bf47cbe49dfdd40e3975502a7893c0 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 01 九月 2022 15:18:35 +0800
Subject: [PATCH] v1.35 去掉休眠
---
Src/main.c | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index b937b7c..c704710 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -136,7 +136,7 @@
// g_com_map[MOTOR_ONTIME]--;
// motor_state = 1;
// }
-if(g_com_map[MOTOR_ENABLE])
+if(0)//g_com_map[MOTOR_ENABLE])
{
@@ -188,6 +188,7 @@
if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
{
nomove_count = 0;
+ bat_percent=Get_Battary();
if(state5v==0)
{
state5v=1;
@@ -306,7 +307,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] = 0x011a;
+ g_com_map[VERSION] = (1<<8)|35;
active_flag = g_com_map[ACTIVE_INDEX];
module_power = g_com_map[POWER];
imu_enable=g_com_map[IMU_ENABLE];
@@ -330,9 +331,9 @@
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
// g_com_map[DEV_ID]=1;
- g_com_map[COM_INTERVAL]=100;
+// g_com_map[COM_INTERVAL]=100;
// g_com_map[MAX_REPORT_ANC_NUM]=1;
- g_com_map[NOMOVESLEEP_TIME]=10;
+// g_com_map[NOMOVESLEEP_TIME]=10;
#endif
if(g_com_map[COM_INTERVAL]==0)
{
@@ -478,7 +479,7 @@
{
waitusart_timer--;
}
- if(m_bEUARTTxEn==0&&waitusart_timer==0&&(motor_state==0||motor_state==3))
+ if(m_bEUARTTxEn==0&&waitusart_timer==0)
{
#ifndef DEBUG_MODE
if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
@@ -957,14 +958,14 @@
}else{
stationary_flag = 0;
}
-if(nomove_count>=nomovesleeptime-1&&imu_enable)
- {
- tx_near_msg[TAGSTATE] = tx_near_msg[TAGSTATE]|GOINGSLEEPBIT;
- }
- if(nomove_count>nomovesleeptime&&imu_enable)
- {
- mcu_sleep();
- }
+//if(nomove_count>=nomovesleeptime-1&&imu_enable)
+// {
+// tx_near_msg[TAGSTATE] = tx_near_msg[TAGSTATE]|GOINGSLEEPBIT;
+// }
+// if(nomove_count>nomovesleeptime&&imu_enable)
+// {
+// mcu_sleep();
+// }
}
/* USER CODE END 4 */
--
Gitblit v1.9.3