From 9510cf0760cf50ddeef4b304a2322ceb9560066c Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 24 一月 2024 10:31:52 +0800
Subject: [PATCH] Merge branch '免布线基站-lora' of http://47.108.70.204:60062/r/XRange_Tag into 免布线基站-lora
---
Src/OnChipDevices/ADC.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Src/OnChipDevices/ADC.c b/Src/OnChipDevices/ADC.c
index 9b34737..26863f4 100644
--- a/Src/OnChipDevices/ADC.c
+++ b/Src/OnChipDevices/ADC.c
@@ -42,13 +42,13 @@
static uint16_t bat_count = 0;
if(bat_count++%600==0)
{
- MX_ADC_Init();
+ READC_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;
+ bat_volt = 3*(float)verfint_cal/adc_val-0.329;
if(bat_volt>=3.0)
{
if(first)
--
Gitblit v1.9.3