From a63fdf9c1e856eb403b7caaba0dbf309f0c68537 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 29 十一月 2023 16:29:12 +0800
Subject: [PATCH] V2.74
---
Src/main.c | 111 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 85 insertions(+), 26 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index f81503d..f26018d 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -99,6 +99,7 @@
u16 count=HAL_LPTIM_ReadCounter(&hlptim1);
return count*LPTIMER_LSB/1000;
}
+extern volatile int32_t m_EUART_DMA_RXPtr;
void UsartInit(void)
{
// waitusart_timer = tag_frequency*USART_KEEPWAKE_TIME;
@@ -108,16 +109,41 @@
{
Error_Handler();
}
+ m_EUART_DMA_RXPtr = 0;
+}
+static void MX_DMA_DeInit(void)
+{
+
+ /* DMA controller clock enable */
+ __HAL_RCC_DMA1_CLK_DISABLE();
+
+ /* DMA interrupt init */
+ /* DMA1_Channel2_3_IRQn interrupt configuration */
+ // HAL_NVIC_SetPriority(DMA1_Channel2_3_IRQn, 1, 0);
+ HAL_NVIC_DisableIRQ(DMA1_Channel2_3_IRQn);
+
+}
+void UsartDeInit(void)
+{
+ GPIO_InitTypeDef GPIO_InitStruct = {0};
+ waitusart_timer = 0;
+ MX_DMA_DeInit();
+ HAL_UART_DeInit(&huart1);
+ GPIO_InitStruct.Pin = GPIO_PIN_9|GPIO_PIN_10;
+ GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
}
uint16_t hardware_version,hardware_pici,hardware_type;
u16 current_time;
-uint8_t state5v;
+uint8_t state5v = 1;
void IdleTask(void)
{
-
- UART_CheckReceive();
+ if(state5v)
+ {
+ UART_CheckReceive();
UART_CheckSend();
-
+ }
if(huart1.Instance->ISR&USART_ISR_FE)
{
// SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
@@ -136,8 +162,6 @@
if(motor_keeptime>0)
{
motor_state = 2;
- }else{
- motor_state = 0;
}
//motor_state=2;
switch(motor_state)
@@ -203,7 +227,11 @@
LED_LG_OFF;
}
}else{
- state5v=0;
+ if(state5v==1)
+ {
+ state5v=0;
+ UsartDeInit();
+ }
LED_LR_OFF;
LED_LG_OFF;
// }
@@ -257,19 +285,25 @@
-void ErrorConfig_Handler(void)
+void CheckComMap(void)
{
- if(g_com_map[COM_INTERVAL]==0||g_com_map[COM_INTERVAL]>1000)
+ if(g_com_map[COM_INTERVAL]==0||g_com_map[COM_INTERVAL]>1000)
{
g_com_map[COM_INTERVAL]=100;
}
if(g_com_map[IMU_THRES]>10)
{g_com_map[IMU_THRES]=2;}
- if(g_com_map[POWER]>MAX_RFPOWER)
- {g_com_map[POWER]=MAX_RFPOWER;}
- if(g_com_map[POWER]<0)
- {g_com_map[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;}
+ if(g_com_map[STATIONARY_TIME]==0)
+ {
+ g_com_map[STATIONARY_TIME]=10;
+ }
+
}
+uint8_t uwb_active_flag = 0;
u8 active_flag=0;
void Program_Init(void)
{ float temp;
@@ -281,14 +315,14 @@
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] = 0x022c;
+ g_com_map[VERSION] = (2<<8)|74;
// 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[COM_INTERVAL]=50;
// g_com_map[MAX_REPORT_ANC_NUM]=1;
// g_com_map[NOMOVESLEEP_TIME]=10;
// g_com_map[IMU_ENABLE]=0;
@@ -297,6 +331,7 @@
//g_com_map[NOMOVESLEEP_TIME]=10;
// g_com_map[IMU_ENABLE]=0;
// g_com_map[COM_INTERVAL]=50;
+CheckComMap();
active_flag = g_com_map[ACTIVE_INDEX];
if(active_flag==0)
{
@@ -309,7 +344,7 @@
module_power = g_com_map[POWER];
imu_enable=g_com_map[IMU_ENABLE];
motor_enable=g_com_map[MOTOR_ENABLE];
-
+ uwb_active_flag = g_com_map[UWB_ACTIVE_FLAG_IDX];
group_id=g_com_map[GROUP_ID];
dev_id = g_com_map[DEV_ID];
//slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
@@ -353,9 +388,9 @@
void HardWareTypeDiffConfig(void)
{
GPIO_InitTypeDef GPIO_InitStruct = {0};
- //if(g_com_map[MOTORBEEPER_INDEX]!=1&&g_com_map[MOTORBEEPER_INDEX]!=2)
+ if(g_com_map[MOTORBEEPER_INDEX]!=1&&g_com_map[MOTORBEEPER_INDEX]!=2)
{
- g_com_map[MOTORBEEPER_INDEX] = 1;
+ g_com_map[MOTORBEEPER_INDEX] = 2;
}
hardware_type = g_com_map[MOTORBEEPER_INDEX];
switch(hardware_type)
@@ -372,6 +407,25 @@
MX_TIM2_Init();
break;
}
+}
+
+void DoubleClickProcess(void)
+{ char temp[50];
+ uint8_t len;
+if(uwb_active_flag)
+{
+ uwb_active_flag = 0;
+ HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
+ HAL_Delay(3000);
+ HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
+}else{
+ uwb_active_flag = 1;
+ HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
+ HAL_Delay(1000);
+ HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
+}
+ g_com_map[UWB_ACTIVE_FLAG_IDX]= uwb_active_flag;
+save_com_map_to_flash();
}
void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart)
{
@@ -416,8 +470,8 @@
/* USER CODE BEGIN 2 */
LED_LG_ON;
Program_Init();
- LIS3DH_Data_Init();
- BarInit();
+ Accelerometer_Init();
+ // BarInit();
Dw1000_Init();
Dw1000_App_Init();
HardWareTypeDiffConfig();
@@ -429,7 +483,8 @@
{
Error_Handler();
}
-
+
+
// HAL_Delay(2000);
// mcu_sleep();
//LED0_BLINK;
@@ -455,7 +510,7 @@
HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
#endif
}
- if(g_start_send_flag&&active_flag)
+ if(g_start_send_flag&&active_flag)
{ static uint16_t blink_count=0;
g_start_send_flag = 0;
// GetPressAndTemp();
@@ -512,7 +567,7 @@
/** Configure LSE Drive Capability
*/
HAL_PWR_EnableBkUpAccess();
- __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
+ __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_HIGH);
/** Initializes the RCC Oscillators according to the specified parameters
* in the RCC_OscInitTypeDef structure.
*/
@@ -912,6 +967,8 @@
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+
HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
HAL_PWR_DisableWakeUpPin(PWR_WAKEUP_PIN1);
/*Clear all related wakeup flags*/
@@ -924,7 +981,7 @@
extern u16 tagslotpos;
extern uint8_t tx_near_msg[80],stationary_flag,gotosleep_flag;
float key_keeptime;
-extern float motor_ontime;
+extern float motor_ontime,button_delay;
void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
{
static uint8_t i=0;
@@ -932,10 +989,12 @@
g_start_send_flag=1;
// current_slotnum++;
// SetNextPollTime(tagslotpos);
+ if(button_delay<1)
+ button_delay+=1/(float)tag_frequency;
nomove_count+=1/(float)tag_frequency;
if(motor_keeptime>0)
{
- motor_keeptime-=1/(float)tag_frequency;
+ motor_keeptime-=1/(float)tag_frequency;
}
if(motor_keeptime<0)
{motor_keeptime = 0;}
--
Gitblit v1.9.3