From 3e165b6f13bfaf66385d857819cacff6e4d6f37c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 20 六月 2020 22:31:03 +0800
Subject: [PATCH] 时间同步完成，多基站有问题，时间不对
---
Src/OnChipDevices/ADC.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/Src/OnChipDevices/ADC.c b/Src/OnChipDevices/ADC.c
index c16ecd7..de06e6d 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;
--
Gitblit v1.9.3