From cf92a2fedf94d889b1a39e8557221149ea554a3c Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期五, 19 五月 2023 14:30:44 +0800
Subject: [PATCH] v2.8
---
Src/main.c | 239 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 153 insertions(+), 86 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 3eabb11..aaada68 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -31,7 +31,7 @@
#define NSH1 0x0001
#define GP 0x0002
-//#define DEBUG_MODE
+#define DEBUG_MODE
/* USER CODE END Includes */
/* Private typedef -----------------------------------------------------------*/
@@ -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,92 @@
// 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,outside_count=0;
+ if(motorskip_flag==0)
+ {
+ if(motor_state==2)
+ {
+ outside_count =0;
+ 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{
+ if(outside_count++>3)
+ {
+ 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))
@@ -194,7 +251,7 @@
state5v=1;
UsartInit();
}
- if(HAL_GPIO_ReadPin(PWR_ON_GPIO_Port,PWR_ON_Pin))
+ if(bat_percent>90)
{
LED_LR_OFF;
LED_LG_ON;
@@ -257,12 +314,12 @@
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] = (2<<8)|1;
+ g_com_map[VERSION] = (2<<8)|8;
// 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 +478,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
@@ -837,11 +890,11 @@
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(BAT_MEAS_GND_GPIO_Port, &GPIO_InitStruct);
- /*Configure GPIO pin : USER_KEY_Pin */
- GPIO_InitStruct.Pin = USER_KEY_Pin;
+ /*Configure GPIO pins : USER_KEY_Pin PB14 */
+ GPIO_InitStruct.Pin = USER_KEY_Pin|GPIO_PIN_14;
GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
GPIO_InitStruct.Pull = GPIO_PULLUP;
- HAL_GPIO_Init(USER_KEY_GPIO_Port, &GPIO_InitStruct);
+ HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
/*Configure GPIO pin : INPUT_5V_Pin */
GPIO_InitStruct.Pin = INPUT_5V_Pin;
@@ -872,6 +925,9 @@
/* EXTI interrupt init*/
HAL_NVIC_SetPriority(EXTI0_1_IRQn, 1, 0);
HAL_NVIC_EnableIRQ(EXTI0_1_IRQn);
+
+ HAL_NVIC_SetPriority(EXTI4_15_IRQn, 1, 0);
+ HAL_NVIC_EnableIRQ(EXTI4_15_IRQn);
}
@@ -904,7 +960,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 +971,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 +1010,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;
@@ -979,13 +1040,19 @@
}
- if(!GET_USERKEY)
+ if(!GET_USERKEY||!HAL_GPIO_ReadPin(USER_KEY_GPIO_Port,GPIO_PIN_14))
{
- key_keeptime+=1/(float)tag_frequency;
+ key_keeptime+=lptimedelay;
+ if(key_keeptime>=3)
+ {
+ JianXieMotorProcess();
+ userkey_state = 1;
+ }
if(key_keeptime>=KEY_KEEPRESET_TIME)
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
}
+
}else{
key_keeptime=0;
}
--
Gitblit v1.9.3