From 732d7c16689595f70092080fa39eb1b39dabcb41 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 19 四月 2021 16:08:24 +0800
Subject: [PATCH] V1.22 增加蜂鸣器功能 重新生成工程文件
---
Src/main.c | 202 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 160 insertions(+), 42 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 4eb8b08..ac12441 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -29,6 +29,10 @@
#include "global_param.h"
#include "TrackingDiff.h"
#include "dw_app.h"
+#include "Flash.h"
+#define NSH1 0x0001
+#define GP 0x0002
+#define FLASH_HARDWARE_VERSION_MAP (uint32_t)0x08004F00 //硬件版本号和批次信息位置
//#define DEBUG_MODE
/* USER CODE END Includes */
@@ -40,8 +44,7 @@
/* Private define ------------------------------------------------------------*/
/* USER CODE BEGIN PD */
//#define DEBUG_MODE
-#define Period (uint32_t) 32768 - 1
-#define Timeout (uint32_t) 32768 - 1//(32768 - 1)
+
/* USER CODE END PD */
/* Private macro -------------------------------------------------------------*/
@@ -55,6 +58,8 @@
LPTIM_HandleTypeDef hlptim1;
SPI_HandleTypeDef hspi1;
+
+TIM_HandleTypeDef htim2;
UART_HandleTypeDef huart1;
DMA_HandleTypeDef hdma_usart1_rx;
@@ -72,6 +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);
/* USER CODE BEGIN PFP */
/* USER CODE END PFP */
@@ -104,7 +110,9 @@
Error_Handler();
}
}
+uint16_t hardware_version,hardware_pici,hardware_type;
uint8_t state5v;
+float motor_keeptime;
void IdleTask(void)
{u16 current_time;
@@ -128,30 +136,54 @@
// g_com_map[MOTOR_ONTIME]--;
// motor_state = 1;
// }
-if(motor_enable)
+if(g_com_map[MOTOR_ENABLE])
{
+
+
switch(motor_state)
{case 0:
- MOTOR_OFF;
+ 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<WARNING_MOTORONTIME)
+ if(current_time<MOTOR_ONTIME)
{
- MOTOR_ON;
+ if(hardware_type==NSH1)
+ {MOTOR_ON;
+ }else if(hardware_type==GP)
+ {
+ HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
+ }
}else{
- MOTOR_OFF;
- }
-
+ if(hardware_type==NSH1)
+ {MOTOR_OFF;
+ }else if(hardware_type==GP)
+ {
+ HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
+ }
+ }
break;
case 2:
- MOTOR_ON;
+ if(hardware_type==NSH1)
+ {MOTOR_ON;
+ }else if(hardware_type==GP)
+ {
+ HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
+ }
break;
case 3:
- MOTOR_OFF;
+ if(hardware_type==NSH1)
+ {MOTOR_OFF;
+ }else if(hardware_type==GP)
+ {
+ HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
+ }
break;
}
-}else{
- MOTOR_OFF;
}
if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
{
@@ -239,14 +271,41 @@
__HAL_LPTIM_COMPARE_SET(&hlptim1, lpcount);
}
}
+
+void HardWareTypeDiffConfig(void)
+{
+GPIO_InitTypeDef GPIO_InitStruct = {0};
+//hardware_type=2;
+if(hardware_type == 0)
+ hardware_type = 1;
+ switch(hardware_type)
+ {
+ case 1:
+
+ HAL_GPIO_WritePin(GPIOB, MOTOR_Pin, GPIO_PIN_SET);
+ GPIO_InitStruct.Pin = MOTOR_Pin;
+ GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+ HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+ break;
+ case 2:
+ MX_TIM2_Init();
+ //BarInit();
+ break;
+ }
+}
void Program_Init(void)
{ float temp;
uint16_t temp2;
uint16_t i;
Usart1ParseDataCallback = UsartParseDataHandler;
parameter_init();
+ hardware_version = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP);
+ 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] = 0x0115;
+ g_com_map[VERSION] = 0x0116;
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
// g_com_map[DEV_ID]=1;
@@ -326,7 +385,6 @@
/* USER CODE BEGIN 1 */
/* USER CODE END 1 */
-
/* MCU Configuration--------------------------------------------------------*/
@@ -347,17 +405,18 @@
/* Initialize all configured peripherals */
MX_GPIO_Init();
MX_LPTIM1_Init();
- MX_DMA_Init();
MX_USART1_UART_Init();
MX_SPI1_Init();
MX_ADC_Init();
+ MX_DMA_Init();
+// MX_TIM2_Init();
/* USER CODE BEGIN 2 */
LED_LG_ON;
Program_Init();
LIS3DH_Data_Init();
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;;
@@ -440,14 +499,14 @@
RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
- /** Configure the main internal regulator output voltage
+ /** Configure the main internal regulator output voltage
*/
__HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
- /** Configure LSE Drive Capability
+ /** Configure LSE Drive Capability
*/
HAL_PWR_EnableBkUpAccess();
__HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
- /** Initializes the CPU, AHB and APB busses clocks
+ /** Initializes the CPU, AHB and APB busses clocks
*/
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_LSE;
RCC_OscInitStruct.LSEState = RCC_LSE_ON;
@@ -461,7 +520,7 @@
{
Error_Handler();
}
- /** Initializes the CPU, AHB and APB busses clocks
+ /** Initializes the CPU, AHB and APB busses clocks
*/
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
|RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
@@ -501,7 +560,7 @@
/* USER CODE BEGIN ADC_Init 1 */
/* USER CODE END ADC_Init 1 */
- /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
+ /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
*/
hadc.Instance = ADC1;
hadc.Init.OversamplingMode = DISABLE;
@@ -524,7 +583,7 @@
{
Error_Handler();
}
- /** Configure for the selected ADC regular channel to be converted.
+ /** Configure for the selected ADC regular channel to be converted.
*/
sConfig.Channel = ADC_CHANNEL_1;
sConfig.Rank = ADC_RANK_CHANNEL_NUMBER;
@@ -612,6 +671,69 @@
}
/**
+ * @brief TIM2 Initialization Function
+ * @param None
+ * @retval None
+ */
+static void MX_TIM2_Init(void)
+{
+
+ /* USER CODE BEGIN TIM2_Init 0 */
+
+ /* USER CODE END TIM2_Init 0 */
+
+ TIM_ClockConfigTypeDef sClockSourceConfig = {0};
+ TIM_MasterConfigTypeDef sMasterConfig = {0};
+ TIM_OC_InitTypeDef sConfigOC = {0};
+
+ /* USER CODE BEGIN TIM2_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)
+ {
+ Error_Handler();
+ }
+ sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
+ if (HAL_TIM_ConfigClockSource(&htim2, &sClockSourceConfig) != HAL_OK)
+ {
+ Error_Handler();
+ }
+ if (HAL_TIM_PWM_Init(&htim2) != HAL_OK)
+ {
+ Error_Handler();
+ }
+ sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
+ sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
+ if (HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig) != HAL_OK)
+ {
+ Error_Handler();
+ }
+ sConfigOC.OCMode = TIM_OCMODE_PWM1;
+ sConfigOC.Pulse = 599;
+ sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
+ sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
+ if (HAL_TIM_PWM_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_3) != 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);
+
+}
+
+/**
* @brief USART1 Initialization Function
* @param None
* @retval None
@@ -658,10 +780,10 @@
}
-/**
+/**
* Enable DMA controller clock
*/
-static void MX_DMA_Init(void)
+static void MX_DMA_Init(void)
{
/* DMA controller clock enable */
@@ -693,7 +815,7 @@
HAL_GPIO_WritePin(GPIOA, SCL_Pin|SDA_Pin|SPI_CS_Pin, GPIO_PIN_SET);
/*Configure GPIO pin Output Level */
- HAL_GPIO_WritePin(GPIOB, BAT_MEAS_GND_Pin|MOTOR_Pin|PWR_CTL_Pin, GPIO_PIN_SET);
+ HAL_GPIO_WritePin(GPIOB, BAT_MEAS_GND_Pin|PWR_CTL_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);
@@ -706,12 +828,6 @@
GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING;
GPIO_InitStruct.Pull = GPIO_NOPULL;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
- /*Configure GPIO pin : BAT_MEAS_Pin */
- GPIO_InitStruct.Pin = BAT_MEAS_Pin;
- GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
- GPIO_InitStruct.Pull = GPIO_NOPULL;
- HAL_GPIO_Init(BAT_MEAS_GPIO_Port, &GPIO_InitStruct);
/*Configure GPIO pins : SCL_Pin SDA_Pin */
GPIO_InitStruct.Pin = SCL_Pin|SDA_Pin;
@@ -740,20 +856,18 @@
GPIO_InitStruct.Pull = GPIO_PULLUP;
HAL_GPIO_Init(USER_KEY_GPIO_Port, &GPIO_InitStruct);
- /*Configure GPIO pins : MOTOR_Pin LED1_G_Pin LED1_R_Pin LED2_R_Pin
- PWR_CTL_Pin */
- GPIO_InitStruct.Pin = MOTOR_Pin|LED1_G_Pin|LED1_R_Pin|LED2_R_Pin
- |PWR_CTL_Pin;
- GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
- GPIO_InitStruct.Pull = GPIO_NOPULL;
- GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
- HAL_GPIO_Init(GPIOB, &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;
+ GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+ 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;
@@ -809,6 +923,10 @@
current_slotnum++;
SetNextPollTime(tyncpoll_time);
nomove_count+=(float)g_com_map[COM_INTERVAL]/1000;
+ if(motor_keeptime>0)
+ {
+ motor_keeptime-=(float)g_com_map[COM_INTERVAL]/1000;
+ }
if(!GET_USERKEY)
{
key_keeptime+=(float)g_com_map[COM_INTERVAL]/1000;
@@ -857,7 +975,7 @@
* @retval None
*/
void assert_failed(uint8_t *file, uint32_t line)
-{
+{
/* USER CODE BEGIN 6 */
/* User can add his own implementation to report the file name and line number,
tex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
--
Gitblit v1.9.3