From 232d14746937bec0a0396f764e71ceeb30f19b34 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 19 九月 2022 17:50:57 +0800
Subject: [PATCH] 1
---
Src/OnChipDevices/ADC.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Src/OnChipDevices/ADC.c b/Src/OnChipDevices/ADC.c
index 2e512e7..8f11431 100644
--- a/Src/OnChipDevices/ADC.c
+++ b/Src/OnChipDevices/ADC.c
@@ -1,6 +1,6 @@
#include "ADC.h"
#include "main.h"
-static uint16_t Get_ADC_Value()
+uint16_t Get_ADC_Value()
{
HAL_ADC_Start(&hadc);
HAL_ADC_PollForConversion(&hadc, 10);
@@ -13,19 +13,24 @@
uint8_t Get_Battary(void)
{static float last_value = 100;
static uint8_t first=1;
+ HAL_GPIO_WritePin(GPIOB, BAT_MEAS_GND_Pin, GPIO_PIN_RESET);
bat_volt = (float)Get_ADC_Value()/621; //(value/4096*3.3*2-3.5)/0.7
+ HAL_GPIO_WritePin(GPIOB, BAT_MEAS_GND_Pin, GPIO_PIN_SET);
if(bat_volt>=3.5)
{
if(first)
{
first = 0;
- last_value =(bat_volt-3.5)*143;
+ bat_volt = (float)Get_ADC_Value()/621;
+ last_value =(bat_volt-3.5)*167;//(bat_volt-3.5)/0.6*100
}
- last_value = 0.9*last_value + (bat_volt-3.5)*14.3;
+ last_value = 0.9*last_value + (bat_volt-3.5)*16.7;
if(last_value>100)
last_value = 100;
if(last_value<0)
last_value = 0;
+}else{
+ last_value=0;
}
return last_value;
}
\ No newline at end of file
--
Gitblit v1.9.3