From 9db2443d5a006e0f19f8fa79bc7eca9f774385c4 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 27 七月 2023 10:36:55 +0800
Subject: [PATCH] V1.36 VDD电量
---
Src/main.c | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 3e6b6da..8f082d9 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -75,7 +75,7 @@
static void MX_LPTIM1_Init(void);
static void MX_USART1_UART_Init(void);
static void MX_SPI1_Init(void);
-static void MX_ADC_Init(void);
+void MX_ADC_Init(void);
static void MX_DMA_Init(void);
static void MX_TIM2_Init(void);
/* USER CODE BEGIN PFP */
@@ -188,7 +188,7 @@
if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
{
nomove_count = 0;
- bat_percent=Get_Battary();
+ bat_percent=Get_VDDVlotage();
if(state5v==0)
{
state5v=1;
@@ -305,7 +305,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)|35;
+ g_com_map[VERSION] = (1<<8)|36;
active_flag = g_com_map[ACTIVE_INDEX];
module_power = g_com_map[POWER];
imu_enable=g_com_map[IMU_ENABLE];
@@ -386,6 +386,11 @@
{
//SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
+void MX_ADC_DeInit(void)
+{
+ HAL_ADC_DeInit(&hadc);
+ HAL_ADCEx_DisableVREFINT();
+}
/* USER CODE END 0 */
/**
@@ -417,12 +422,11 @@
/* 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_TIM2_Init();
/* USER CODE BEGIN 2 */
LED_LG_ON;
Program_Init();
@@ -465,7 +469,7 @@
// }
// LED_TR_BLINK;s
- bat_percent=Get_Battary();
+ bat_percent=Get_VDDVlotage();
if(bat_percent>15)
{ LED_TB_ON;
Tag_App();
@@ -518,7 +522,7 @@
/** Configure LSE Drive Capability
*/
HAL_PWR_EnableBkUpAccess();
- __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_HIGH);
+ __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
/** Initializes the CPU, AHB and APB busses clocks
*/
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_LSE;
@@ -561,7 +565,7 @@
* @param None
* @retval None
*/
-static void MX_ADC_Init(void)
+void MX_ADC_Init(void)
{
/* USER CODE BEGIN ADC_Init 0 */
@@ -598,7 +602,7 @@
}
/** Configure for the selected ADC regular channel to be converted.
*/
- sConfig.Channel = ADC_CHANNEL_1;
+ sConfig.Channel = ADC_CHANNEL_VREFINT;
sConfig.Rank = ADC_RANK_CHANNEL_NUMBER;
if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
{
--
Gitblit v1.9.3