From edd3465ff7aefa3b0ac9ef1e977c32fb23945e73 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 25 七月 2022 16:41:26 +0800
Subject: [PATCH] V1.30 加速计灵敏度可配置
---
Src/main.c | 128 ++++++++++++++++++++----------------------
1 files changed, 61 insertions(+), 67 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 8890ac6..196143c 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -59,7 +59,7 @@
SPI_HandleTypeDef hspi1;
-TIM_HandleTypeDef htim2;
+TIM_HandleTypeDef htim21;
UART_HandleTypeDef huart1;
DMA_HandleTypeDef hdma_usart1_rx;
@@ -77,7 +77,7 @@
static void MX_SPI1_Init(void);
static void MX_ADC_Init(void);
static void MX_DMA_Init(void);
-static void MX_TIM2_Init(void);
+static void MX_TIM21_Init(void);
/* USER CODE BEGIN PFP */
/* USER CODE END PFP */
@@ -146,7 +146,7 @@
{MOTOR_OFF;
}else if(hardware_type==GP)
{
- HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
+ HAL_TIM_PWM_Stop(&htim21, TIM_CHANNEL_3);
}
break;
case 1:
@@ -156,14 +156,14 @@
{MOTOR_ON;
}else if(hardware_type==GP)
{
- HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
+ HAL_TIM_PWM_Start(&htim21, TIM_CHANNEL_3);
}
}else{
if(hardware_type==NSH1)
{MOTOR_OFF;
}else if(hardware_type==GP)
{
- HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
+ HAL_TIM_PWM_Stop(&htim21, TIM_CHANNEL_3);
}
}
break;
@@ -172,7 +172,7 @@
{MOTOR_ON;
}else if(hardware_type==GP)
{
- HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
+ HAL_TIM_PWM_Start(&htim21, TIM_CHANNEL_3);
}
break;
case 3:
@@ -180,7 +180,7 @@
{MOTOR_OFF;
}else if(hardware_type==GP)
{
- HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
+ HAL_TIM_PWM_Stop(&htim21, TIM_CHANNEL_3);
}
break;
}
@@ -291,7 +291,7 @@
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
break;
case 2:
- MX_TIM2_Init();
+ MX_TIM21_Init();
//BarInit();
break;
}
@@ -307,7 +307,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] = (1<<8)|28;
+ g_com_map[VERSION] = (1<<8)|30;
active_flag = g_com_map[ACTIVE_INDEX];
module_power = g_com_map[POWER];
imu_enable=g_com_map[IMU_ENABLE];
@@ -351,9 +351,10 @@
Error_Handler();
}
//g_com_map[NOMOVESLEEP_TIME]=5;
- printf("标签ID: %d .\r\n",dev_id);
- printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
- printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
+ printf("物资标签-防撞汇总V%d.%d\r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+// printf("标签ID: %d .\r\n",dev_id);
+// printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
+// printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
// printf("DEVICE PAIRID: %d .\r\n",g_com_map[PAIR_ID]);
@@ -409,25 +410,24 @@
SystemClock_Config();
/* USER CODE BEGIN SysInit */
-
+ MX_DMA_Init();
/* USER CODE END SysInit */
/* Initialize all configured peripherals */
MX_GPIO_Init();
MX_LPTIM1_Init();
- MX_DMA_Init();
MX_USART1_UART_Init();
MX_SPI1_Init();
MX_ADC_Init();
-
-// MX_TIM2_Init();
+ //MX_DMA_Init();
+ MX_TIM21_Init();
/* USER CODE BEGIN 2 */
LED_LG_ON;
Program_Init();
LIS3DH_Data_Init();
Dw1000_Init();
Dw1000_App_Init();
- HardWareTypeDiffConfig();
+ //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;;
@@ -681,65 +681,61 @@
}
/**
- * @brief TIM2 Initialization Function
+ * @brief TIM21 Initialization Function
* @param None
* @retval None
*/
-static void MX_TIM2_Init(void)
+static void MX_TIM21_Init(void)
{
- /* USER CODE BEGIN TIM2_Init 0 */
+ /* USER CODE BEGIN TIM21_Init 0 */
- /* USER CODE END TIM2_Init 0 */
+ /* USER CODE END TIM21_Init 0 */
TIM_ClockConfigTypeDef sClockSourceConfig = {0};
TIM_MasterConfigTypeDef sMasterConfig = {0};
TIM_OC_InitTypeDef sConfigOC = {0};
- /* USER CODE BEGIN TIM2_Init 1 */
+ /* USER CODE BEGIN TIM21_Init 1 */
- /* USER CODE END TIM2_Init 1 */
- htim2.Instance = TIM2;
- htim2.Init.Prescaler = 9;
- htim2.Init.CounterMode = TIM_COUNTERMODE_UP;
- htim2.Init.Period = 1171;
- htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
- htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
- if (HAL_TIM_Base_Init(&htim2) != HAL_OK)
+ /* USER CODE END TIM21_Init 1 */
+ htim21.Instance = TIM21;
+ htim21.Init.Prescaler = 9;
+ htim21.Init.CounterMode = TIM_COUNTERMODE_UP;
+ htim21.Init.Period = 1171;
+ htim21.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
+ htim21.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
+ if (HAL_TIM_Base_Init(&htim21) != HAL_OK)
{
Error_Handler();
}
sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
- if (HAL_TIM_ConfigClockSource(&htim2, &sClockSourceConfig) != HAL_OK)
+ if (HAL_TIM_ConfigClockSource(&htim21, &sClockSourceConfig) != HAL_OK)
{
Error_Handler();
}
- if (HAL_TIM_PWM_Init(&htim2) != HAL_OK)
+ if (HAL_TIM_PWM_Init(&htim21) != HAL_OK)
{
Error_Handler();
}
sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
- if (HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig) != HAL_OK)
+ if (HAL_TIMEx_MasterConfigSynchronization(&htim21, &sMasterConfig) != HAL_OK)
{
Error_Handler();
}
sConfigOC.OCMode = TIM_OCMODE_PWM1;
- sConfigOC.Pulse = 599;
+ sConfigOC.Pulse = 585;
sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
- if (HAL_TIM_PWM_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_3) != HAL_OK)
+ if (HAL_TIM_PWM_ConfigChannel(&htim21, &sConfigOC, TIM_CHANNEL_2) != HAL_OK)
{
Error_Handler();
}
- /* USER CODE BEGIN TIM2_Init 2 */
-//if(HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3) != HAL_OK)
-// {
-// /* Starting Error */
-// Error_Handler();
-// }
- /* USER CODE END TIM2_Init 2 */
- HAL_TIM_MspPostInit(&htim2);
+ /* USER CODE BEGIN TIM21_Init 2 */
+
+ /* USER CODE END TIM21_Init 2 */
+ HAL_TIM_MspPostInit(&htim21);
}
@@ -822,31 +818,22 @@
__HAL_RCC_GPIOB_CLK_ENABLE();
/*Configure GPIO pin Output Level */
- //HAL_GPIO_WritePin(GPIOA, SCL_Pin|SDA_Pin|SPI_CS_Pin, GPIO_PIN_SET);
- HAL_GPIO_WritePin(GPIOA, SPI_CS_Pin, GPIO_PIN_SET);
-
- /*Configure GPIO pin Output Level */
- //HAL_GPIO_WritePin(GPIOB, BAT_MEAS_GND_Pin|PWR_CTL_Pin, GPIO_PIN_SET);
- HAL_GPIO_WritePin(GPIOB, USER_SCL_Pin|USER_SDA_Pin|BAT_MEAS_GND_Pin|PWR_CTL_Pin, GPIO_PIN_SET);
+ HAL_GPIO_WritePin(SPI_CS_GPIO_Port, SPI_CS_Pin, GPIO_PIN_SET);
/*Configure GPIO pin Output Level */
- HAL_GPIO_WritePin(GPIOB, LED1_G_Pin|LED1_R_Pin|LED2_R_Pin, GPIO_PIN_RESET);
+ HAL_GPIO_WritePin(GPIOB, BAT_MEAS_GND_Pin|PWR_CTL_Pin, GPIO_PIN_SET);
/*Configure GPIO pin Output Level */
- HAL_GPIO_WritePin(GPIOA, DW_WKUP_Pin|DW_CTRL_Pin|LED2_G_Pin, GPIO_PIN_RESET);
+ HAL_GPIO_WritePin(GPIOB, SDA_Pin|LED1_G_Pin|LED1_R_Pin|LED2_R_Pin, GPIO_PIN_RESET);
+
+ /*Configure GPIO pin Output Level */
+ HAL_GPIO_WritePin(GPIOA, DW_WKUP_Pin|SCL_Pin|DW_CTRL_Pin|LED2_G_Pin, GPIO_PIN_RESET);
/*Configure GPIO pin : PA0 */
GPIO_InitStruct.Pin = GPIO_PIN_0;
GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING;
GPIO_InitStruct.Pull = GPIO_NOPULL;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
- /*Configure GPIO pins : SCL_Pin SDA_Pin */
- GPIO_InitStruct.Pin = USER_SCL_Pin|USER_SDA_Pin;
- GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
- GPIO_InitStruct.Pull = GPIO_NOPULL;
- GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
- HAL_GPIO_Init(SDA_GPIO_Port, &GPIO_InitStruct); //
/*Configure GPIO pin : SPI_CS_Pin */
GPIO_InitStruct.Pin = SPI_CS_Pin;
@@ -855,24 +842,18 @@
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
HAL_GPIO_Init(SPI_CS_GPIO_Port, &GPIO_InitStruct);
- /*Configure GPIO pin : BAT_MEAS_GND_Pin */
- GPIO_InitStruct.Pin = BAT_MEAS_GND_Pin;
+ /*Configure GPIO pins : BAT_MEAS_GND_Pin SDA_Pin */
+ GPIO_InitStruct.Pin = BAT_MEAS_GND_Pin|SDA_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
- HAL_GPIO_Init(BAT_MEAS_GND_GPIO_Port, &GPIO_InitStruct);
+ HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
/*Configure GPIO pin : USER_KEY_Pin */
GPIO_InitStruct.Pin = USER_KEY_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
GPIO_InitStruct.Pull = GPIO_PULLUP;
HAL_GPIO_Init(USER_KEY_GPIO_Port, &GPIO_InitStruct);
-
- /*Configure GPIO pin : INPUT_5V_Pin */
- GPIO_InitStruct.Pin = INPUT_5V_Pin;
- GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
- GPIO_InitStruct.Pull = GPIO_PULLDOWN;
- HAL_GPIO_Init(INPUT_5V_GPIO_Port, &GPIO_InitStruct);
/*Configure GPIO pins : LED1_G_Pin LED1_R_Pin LED2_R_Pin PWR_CTL_Pin */
GPIO_InitStruct.Pin = LED1_G_Pin|LED1_R_Pin|LED2_R_Pin|PWR_CTL_Pin;
@@ -888,6 +869,19 @@
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+ /*Configure GPIO pin : SCL_Pin */
+ GPIO_InitStruct.Pin = SCL_Pin;
+ GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+ HAL_GPIO_Init(SCL_GPIO_Port, &GPIO_InitStruct);
+
+ /*Configure GPIO pin : INPUT_5V_Pin */
+ GPIO_InitStruct.Pin = INPUT_5V_Pin;
+ GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ HAL_GPIO_Init(INPUT_5V_GPIO_Port, &GPIO_InitStruct);
+
/*Configure GPIO pin : PWR_ON_Pin */
GPIO_InitStruct.Pin = PWR_ON_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
--
Gitblit v1.9.3