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 | 37 ++-----------------------------------
1 files changed, 2 insertions(+), 35 deletions(-)
diff --git a/Src/OnChipDevices/ADC.c b/Src/OnChipDevices/ADC.c
index 9f9766d..8f11431 100644
--- a/Src/OnChipDevices/ADC.c
+++ b/Src/OnChipDevices/ADC.c
@@ -29,41 +29,8 @@
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;
- 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;
- }
+}else{
+ last_value=0;
}
return last_value;
}
\ No newline at end of file
--
Gitblit v1.9.3