From 858c42df60ffeb07dc5916e2cec1f0b98b1b4e39 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期五, 12 五月 2023 12:04:39 +0800
Subject: [PATCH] V2.4 1.修改震动逻辑，先短振3下，5秒后再振3下，每5分钟循环一次，如果短按按键，2小时内不再震动。 2.SOS改成长按3秒按键触发。
---
Src/main.c | 217 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 138 insertions(+), 79 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index ffcf005..3ef08be 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -109,9 +109,34 @@
Error_Handler();
}
}
+void LP_delayms(u16 time)
+{
+ u16 startcount = HAL_LPTIM_ReadCounter(&hlptim1);
+ u16 endcount = startcount+time*33;
+ if(endcount>LPTIMER_1S_COUNT)
+ endcount-=LPTIMER_1S_COUNT;
+ while(HAL_LPTIM_ReadCounter(&hlptim1)<endcount ||HAL_LPTIM_ReadCounter(&hlptim1)>endcount+LPTIMER_1S_COUNT/2);
+
+}
+void JianXieMotorProcess(void)
+{
+ MOTOR_ON;
+ LP_delayms(120);
+ MOTOR_OFF;
+ LP_delayms(110);
+ MOTOR_ON;
+ LP_delayms(120);
+ MOTOR_OFF;
+ LP_delayms(110);
+ MOTOR_ON;
+ LP_delayms(120);
+ MOTOR_OFF;
+ LP_delayms(110);
+}
uint16_t hardware_version,hardware_pici,hardware_type;
u16 current_time;
-uint8_t state5v;
+float motor5s_timer=1000;
+uint8_t state5v,motorskip_flag;
void IdleTask(void)
{
@@ -130,60 +155,88 @@
// LED_TR_OFF;
current_time=GetLPTime();
//motor_state=2;
+ //motor_state = 1;
if(g_com_map[MOTOR_ENABLE])
{
-
-// if(motor_keeptime>0)
-// {
-// motor_state = 2;
-// }else{
-// motor_state = 0;
-// }
- //motor_state=2;
- switch(motor_state)
- {case 0:
- if(hardware_type==NSH1)
- {MOTOR_OFF;
- }else if(hardware_type==GP)
- {
- HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
- }
- break;
- case 1:
- if(current_time<MOTOR_ONTIME)
- {
- if(hardware_type==NSH1)
- {MOTOR_ON;
- }else if(hardware_type==GP)
- {
- HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
- }
- }else{
- if(hardware_type==NSH1)
- {MOTOR_OFF;
- }else if(hardware_type==GP)
- {
- HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
- }
- }
- break;
- case 2:
- if(hardware_type==NSH1)
- {MOTOR_ON;
- }else if(hardware_type==GP)
- {
- HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
- }
- break;
- case 3:
- if(hardware_type==NSH1)
- {MOTOR_OFF;
- }else if(hardware_type==GP)
- {
- HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
- }
- break;
- }
+ static u8 motor5s_state = 0;
+ if(motorskip_flag==0)
+ {
+ if(motor_state==1)
+ {
+ if(motor5s_state)
+ {
+ if(motor5s_timer>4)
+ {
+ motor5s_timer = 0;
+ motor5s_state = 0;
+ JianXieMotorProcess();
+ }
+ }else{
+ if(motor5s_timer>300)
+ {
+ motor5s_timer = 0;
+ motor5s_state = 1;
+ JianXieMotorProcess();
+ }
+ }
+ }else{
+ motor5s_state = 1;
+ motor5s_timer = 0;
+ }
+ }else{
+ if(motor5s_timer>7200) //2个小时 7200
+ {
+ motorskip_flag = 0;
+ motor5s_timer = 1000;
+ motor5s_state = 0;
+ JianXieMotorProcess();
+ }
+ }
+// switch(motor_state)
+// {case 0:
+// if(hardware_type==NSH1)
+// {MOTOR_OFF;
+// }else if(hardware_type==GP)
+// {
+// HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
+// }
+// break;
+// case 1:
+// if(current_time<MOTOR_ONTIME)
+// {
+// if(hardware_type==NSH1)
+// {
+// MOTOR_ON;
+// }else if(hardware_type==GP)
+// {
+// HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
+// }
+// }else{
+// if(hardware_type==NSH1)
+// {MOTOR_OFF;
+// }else if(hardware_type==GP)
+// {
+// HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
+// }
+// }
+// break;
+// case 2:
+// if(hardware_type==NSH1)
+// {MOTOR_ON;
+// }else if(hardware_type==GP)
+// {
+// HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
+// }
+// break;
+// case 3:
+// if(hardware_type==NSH1)
+// {MOTOR_OFF;
+// }else if(hardware_type==GP)
+// {
+// HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
+// }
+// break;
+// }
}
bat_percent=Get_Battary();
if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
@@ -262,7 +315,7 @@
// g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
- // g_com_map[DEV_ID]=0x4009;
+ g_com_map[DEV_ID]=0x4009;
// g_com_map[ACTIVE_INDEX]=1;
// g_com_map[COM_INTERVAL]=50;
// g_com_map[MAX_REPORT_ANC_NUM]=1;
@@ -421,10 +474,6 @@
/* USER CODE END WHILE */
/* USER CODE BEGIN 3 */
-// while(1)
-// {
-// MODBUS_Poll();
-// }
if(m_bEUARTTxEn==0&&(motor_state==0||motor_state==3))
{
#ifndef DEBUG_MODE
@@ -904,7 +953,7 @@
}
extern u16 tagslotpos,current_slotpos;
-extern uint8_t tx_near_msg[80],stationary_flag,gotosleep_flag,current_sync_sec,tagpoll_sync_sec,flag_tagnewpos;
+extern uint8_t tx_near_msg[80],stationary_flag,gotosleep_flag,current_sync_sec,tagpoll_sync_sec,flag_tagnewpos,userkey_state;
float key_keeptime;
extern float motor_ontime;
extern uint16_t rec_tagperiod;
@@ -915,32 +964,37 @@
tagslotpos = current_slotpos%200;
flag_tagnewpos = 0;
}
+float lptimedelay=0;
void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
{
static uint8_t i=0;
SystemClock_Config();
-if(tag_frequency>1)
-{
- g_start_send_flag=1;
-}else{
- if(current_slotpos>=max_slotpos)
- {
- GetRandomPos();
- }
- if(current_sync_sec==tagpoll_sync_sec)
- {
+ if(tag_frequency>1)
+ {
g_start_send_flag=1;
+ lptimedelay = 1/(float)tag_frequency;
+ }else{
+ lptimedelay = 1;
+ tag_frequency = 1;
+ if(current_slotpos>=max_slotpos)
+ {
+ GetRandomPos();
+ }
+ if(current_sync_sec==tagpoll_sync_sec)
+ {
+ g_start_send_flag=1;
+ }
+ current_sync_sec++;
+ if(current_sync_sec>=(rec_tagperiod)/10||current_sync_sec>10)
+ {
+ current_sync_sec=0;
+ }
}
- current_sync_sec++;
- if(current_sync_sec>=(rec_tagperiod)/10||current_sync_sec>10)
- {
- current_sync_sec=0;
- }
-}
- nomove_count+=1/(float)tag_frequency;
+ motor5s_timer+=lptimedelay;
+ nomove_count+=lptimedelay;
if(motor_keeptime>0)
{
- motor_keeptime-=1/(float)tag_frequency;
+ motor_keeptime-=lptimedelay;
}
if(motor_keeptime<0)
{motor_keeptime = 0;}
@@ -949,7 +1003,7 @@
if(!GET_USERKEY)
{
LED_LG_ON;
- key_keeptime+=1/(float)tag_frequency;
+ key_keeptime+=lptimedelay;
if(key_keeptime>3)
{
u8 i=250,keystate=1;
@@ -981,11 +1035,16 @@
if(!GET_USERKEY)
{
- key_keeptime+=1/(float)tag_frequency;
+ key_keeptime+=lptimedelay;
+ if(key_keeptime>=3)
+ {
+ userkey_state = 1;
+ }
if(key_keeptime>=KEY_KEEPRESET_TIME)
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
}
+
}else{
key_keeptime=0;
}
--
Gitblit v1.9.3