From f8b2fa433d03144490a1e887f3ffb56ca8fad97d Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 09 七月 2020 23:24:34 +0800
Subject: [PATCH] 修改部分bug，华星测试没问题
---
Src/OnChipDevices/ADC.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Src/OnChipDevices/ADC.c b/Src/OnChipDevices/ADC.c
index c16ecd7..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,12 +13,15 @@
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;
+ 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)*16.7;
@@ -26,6 +29,8 @@
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