From 1d51ac11e1da7c9b55da8c8b3a7e3756cc5f4ad8 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 08 三月 2024 18:19:16 +0800
Subject: [PATCH] 阶段性调试完毕 可以测距跟给网关发送。
---
Src/OnChipDevices/ADC.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Src/OnChipDevices/ADC.c b/Src/OnChipDevices/ADC.c
index 5c3351d..cd0bf0f 100644
--- a/Src/OnChipDevices/ADC.c
+++ b/Src/OnChipDevices/ADC.c
@@ -13,9 +13,9 @@
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);
+// 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);
+// HAL_GPIO_WritePin(GPIOB, BAT_MEAS_GND_Pin, GPIO_PIN_SET);
if(bat_volt>=3.5)
{
if(first)
@@ -42,8 +42,8 @@
static uint16_t bat_count = 0;
if(bat_count++%600==0)
{
- MX_ADC_Init();
- HAL_Delay(30);
+ MX_ADC1_Init();
+ Delay_Us(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
--
Gitblit v1.9.3