From 748e84eba0b5d27b681652df9e23f9d5a28e9b9b Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 04 十一月 2020 18:41:09 +0800
Subject: [PATCH] V2.7 医院发货的下一次版本，增加5v输入不休眠
---
Src/main.c | 58 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 679a53c..1a151a8 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -123,11 +123,8 @@
// LED_TR_OFF;
current_time=GetLPTime();
//motor_state=2;
- if(g_com_map[MOTOR_ONTIME]>0)
- {
- g_com_map[MOTOR_ONTIME]--;
- motor_state = 1;
- }
+if(g_com_map[MOTOR_ENABLE])
+{
switch(motor_state)
{case 0:
MOTOR_OFF;
@@ -148,6 +145,7 @@
MOTOR_OFF;
break;
}
+}
if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
{
nomove_count = 0;
@@ -210,23 +208,27 @@
}
-u16 total_slotnum,current_slotnum;
+u16 current_slotnum;
extern int32_t offsettimeus;
#define FIXSLOT
+#define FIXSLOTPOS 5
+u16 slotpos_intoatl;
uint16_t bigslot_num;
-uint8_t fix_slotpos =8;
+uint8_t fix_slotpos =FIXSLOTPOS;
int32_t lpcount,lptime,target_time;
void SetNextPollTime(u16 slotpos)
{
-u16 slotpos_intoatl;
+
#ifdef FIXSLOT
slotpos = fix_slotpos;
#endif
- if(current_slotnum>=total_slotnum)
- current_slotnum-=total_slotnum;
+ if(current_slotnum>=tag_frequency)
+ current_slotnum-=tag_frequency;
slotpos_intoatl = current_slotnum*bigslot_num+slotpos;
+ if(current_slotnum==19)
+ {slotpos_intoatl = current_slotnum*bigslot_num+slotpos;}
target_time=(slotpos_intoatl*SLOTTIME_MS+100)*100;
//if(target_time<90000)
{
@@ -248,25 +250,26 @@
Usart1ParseDataCallback = UsartParseDataHandler;
parameter_init();
//deca_sleep(1000);
- g_com_map[VERSION] = 0x0204;
+ g_com_map[VERSION] = 0x0207;
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
- g_com_map[DEV_ID]=0x123;
- g_com_map[COM_INTERVAL]=100;
+// g_com_map[DEV_ID]=0x123;
+// 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[COM_INTERVAL]=50;
+ // g_com_map[COM_INTERVAL]=100;
if(g_com_map[COM_INTERVAL]==0)
{
g_com_map[COM_INTERVAL]=100;
}
- if(module_power>MAX_RFPOWER)
- {module_power=MAX_RFPOWER;}
- if(module_power<0)
- {module_power=0;}
+ if(g_com_map[POWER]>MAX_RFPOWER)
+ {g_com_map[POWER]=MAX_RFPOWER;}
+ if(g_com_map[POWER]<0)
+ {g_com_map[POWER]=0;}
module_power = g_com_map[POWER];
imu_enable=g_com_map[IMU_ENABLE];
motor_enable=g_com_map[MOTOR_ENABLE];
@@ -280,8 +283,7 @@
slot_startcount=tyncpoll_time*1000/LPTIMER_LSB;
lastpoll_time=tyncpoll_time;
tag_frequency = 1000/g_com_map[COM_INTERVAL];
- total_slotnum = 1000/g_com_map[COM_INTERVAL];
- bigslot_num = TOTAL_SLOTNUM/tag_frequency;
+ bigslot_num = TOTAL_SLOTNUM/tag_frequency;
current_slotnum=1;
current_time=GetLPTime();
if (HAL_LPTIM_TimeOut_Start_IT(&hlptim1, LPTIMER_1S_COUNT, slot_startcount) != HAL_OK) //system time is 1010ms 1 puls=30.518us
@@ -422,7 +424,8 @@
}
if(m_bEUARTTxEn==0&&waitusart_timer==0)
{
-#ifndef DEBUG_MODE
+#ifndef DEBUG_MODE
+ if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
#endif
}
@@ -809,16 +812,25 @@
/*Enter the Standby mode*/
HAL_PWR_EnterSTANDBYMode();
}
+extern u16 tagslotpos;
extern uint8_t tx_near_msg[80],stationary_flag,gotosleep_flag;
float key_keeptime;
+extern float motor_ontime;
void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
{
static uint8_t i=0;
i++;
g_start_send_flag=1;
current_slotnum++;
- SetNextPollTime(tyncpoll_time);
+ SetNextPollTime(tagslotpos);
nomove_count+=(float)g_com_map[COM_INTERVAL]/1000;
+ if(motor_ontime>0)
+ {
+ motor_ontime-=(float)1/tag_frequency;
+ motor_state = 2;
+ }else{
+ motor_state = 0;
+ }
if(!GET_USERKEY)
{
key_keeptime+=(float)g_com_map[COM_INTERVAL]/1000;
--
Gitblit v1.9.3