From 9200a6930db4a33793929113daacc7da1e26e95d Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 22 十二月 2021 20:33:17 +0800
Subject: [PATCH] 1
---
Src/main.c | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index b41edc2..a1582b0 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -101,7 +101,7 @@
}
void UsartInit(void)
{
- waitusart_timer = tag_frequency*USART_KEEPWAKE_TIME;
+// waitusart_timer = tag_frequency*USART_KEEPWAKE_TIME;
MX_DMA_Init();
MX_USART1_UART_Init();
if(HAL_UART_Receive_DMA(&huart1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE))
@@ -139,6 +139,7 @@
}else{
motor_state = 0;
}
+ //motor_state=2;
switch(motor_state)
{case 0:
if(hardware_type==NSH1)
@@ -183,6 +184,8 @@
}
break;
}
+}else{
+ MOTOR_OFF;
}
bat_percent=Get_Battary();
if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
@@ -280,7 +283,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] = 0x0225;
+ g_com_map[VERSION] = 0x002c;
// g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
@@ -295,7 +298,7 @@
#endif
//g_com_map[NOMOVESLEEP_TIME]=10;
// g_com_map[IMU_ENABLE]=0;
- g_com_map[COM_INTERVAL]=50;
+// g_com_map[COM_INTERVAL]=50;
active_flag = g_com_map[ACTIVE_INDEX];
if(active_flag==0)
{
@@ -312,7 +315,7 @@
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;
- slottime = 5;
+ slottime = 5;
max_slotpos=g_com_map[COM_INTERVAL]/slottime;
tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;
slot_startcount=tyncpoll_time*1000/LPTIMER_LSB;
@@ -351,14 +354,15 @@
void HardWareTypeDiffConfig(void)
{
-GPIO_InitTypeDef GPIO_InitStruct = {0};
-//hardware_type=2;
-if(hardware_type == 0)
- hardware_type = 1;
+ GPIO_InitTypeDef GPIO_InitStruct = {0};
+ //if(g_com_map[MOTORBEEPER_INDEX]!=1&&g_com_map[MOTORBEEPER_INDEX]!=2)
+ {
+ g_com_map[MOTORBEEPER_INDEX] = 1;
+ }
+ hardware_type = g_com_map[MOTORBEEPER_INDEX];
switch(hardware_type)
{
- case 1:
-
+ case 1:
HAL_GPIO_WritePin(GPIOB, MOTOR_Pin, GPIO_PIN_SET);
GPIO_InitStruct.Pin = MOTOR_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
@@ -412,16 +416,17 @@
MX_ADC_Init();
//MX_TIM2_Init();
/* USER CODE BEGIN 2 */
+ MOTOR_OFF;
LED_LG_ON;
Program_Init();
LIS3DH_Data_Init();
- BarInit();
+ BarInit();
Dw1000_Init();
Dw1000_App_Init();
HardWareTypeDiffConfig();
dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
dwt_entersleep();
- waitusart_timer=tag_frequency*USART_KEEPWAKE_TIME;;
+// waitusart_timer=tag_frequency*USART_KEEPWAKE_TIME;;
DW_DISABLE;
if(HAL_UART_Receive_DMA(&huart1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE))
{
@@ -446,7 +451,7 @@
// {
// MODBUS_Poll();
// }
-if(m_bEUARTTxEn==0&&waitusart_timer==0&&(motor_state==0||motor_state==3))
+if(m_bEUARTTxEn==0&&(motor_state==0||motor_state==3))
{
#ifndef DEBUG_MODE
if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
@@ -464,6 +469,7 @@
// HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_RESET);
// }
// LED_TR_BLINK;
+ __disable_irq();
if(bat_percent>15)
{ LED_TB_ON;
Tag_App();
@@ -473,6 +479,7 @@
Tag_App();
LED_TR_OFF;
}
+ __enable_irq();
//LED0_BLINK;
IdleTask();
if(waitusart_timer>0)
@@ -873,6 +880,11 @@
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+ GPIO_InitStruct.Pin = GPIO_PIN_5;
+ GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+ GPIO_InitStruct.Pull = GPIO_PULLUP;
+ HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+
/*Configure GPIO pins : DW_WKUP_Pin DW_CTRL_Pin LED2_G_Pin */
GPIO_InitStruct.Pin = DW_WKUP_Pin|DW_CTRL_Pin|LED2_G_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
--
Gitblit v1.9.3