From 46e90214c23d76f3ab11b185323d6a7cfc827a64 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 06 四月 2023 10:22:06 +0800
Subject: [PATCH] 1
---
Src/OnChipDevices/ADC.c | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/Src/OnChipDevices/ADC.c b/Src/OnChipDevices/ADC.c
index 2e512e7..9b34737 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,57 @@
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;
+}
+
+uint16_t verfint_cal,adc_val;
+uint8_t Get_VDDVlotage(void)
+{ static float last_value = 100;
+ static uint8_t first=1;
+ static uint16_t bat_count = 0;
+ if(bat_count++%600==0)
+ {
+ MX_ADC_Init();
+ HAL_Delay(30);
+ adc_val = Get_ADC_Value();
+ MX_ADC_DeInit();
+ //temp_voltage = (float)Get_ADC_Value()/621; //(value/4096*3.3*2-3.5)/0.7
+ verfint_cal = *(__IO uint16_t *)(0X1FF80078);
+ bat_volt = 3*(float)verfint_cal/adc_val+0.13;
+ if(bat_volt>=3.0)
+ {
+ if(first)
+ {
+ first = 0;
+ last_value =(bat_volt-3.0)*167;//(bat_volt-3.5)/0.6*100
+ }
+ last_value = 0.9*last_value + (bat_volt-3.0)*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