From 2b07faacf6d1ce3de7ace73af366e5b84e652c14 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 13 十一月 2024 16:37:43 +0800
Subject: [PATCH] Merge branch '免布线标签-lora-泰斗GPS' of http://47.108.70.204:60062/r/XRange_Tag into 免布线标签-lora-泰斗GPS
---
Src/OnChipDevices/ADC.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Src/OnChipDevices/ADC.c b/Src/OnChipDevices/ADC.c
index d662e86..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);
@@ -15,7 +15,7 @@
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_RESET);
+ HAL_GPIO_WritePin(GPIOB, BAT_MEAS_GND_Pin, GPIO_PIN_SET);
if(bat_volt>=3.5)
{
if(first)
@@ -29,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