From aac57c50c24aed1776566048819ad6945834be00 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期四, 14 十一月 2024 16:12:27 +0800
Subject: [PATCH] MK_GPS_4G定位手环V1.0版本，增加多数据读取功能，修改部分4G回复逻辑，修改部分充电保护4G重连逻辑
---
keil/include/drivers/mk_adc.c | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/keil/include/drivers/mk_adc.c b/keil/include/drivers/mk_adc.c
index bd6371a..9763eb5 100644
--- a/keil/include/drivers/mk_adc.c
+++ b/keil/include/drivers/mk_adc.c
@@ -85,7 +85,7 @@
/* If the sampling rate setting exceeds the conversion rate threshold, the maximum sampling rate is used by default */
uint32_t rate = (adc_clk == ADC_CLK_LOW_FREQ) ? ((config->rate < ADC_CLK_L_MAX_SAMPLE_RATE) ? config->rate : ADC_CLK_L_MAX_SAMPLE_RATE)
- : (config->rate < ADC_CLK_H_MAX_SAMPLE_RATE ? config->rate : ADC_CLK_H_MAX_SAMPLE_RATE);
+ : (config->rate < ADC_CLK_H_MAX_SAMPLE_RATE ? config->rate : ADC_CLK_H_MAX_SAMPLE_RATE);
/* If the sample rate is set to 0, no frequency division */
uint16_t div = (uint16_t)((adc_clk / ((rate == 0) ? 1 : rate)) - 1);
@@ -173,17 +173,17 @@
// update state
switch (adc_handle.state)
{
- case ADC_STATE_READY:
- adc_handle.state = ADC_STATE_BUSY;
- break;
- case ADC_STATE_BUSY:
- int_unlock(lock);
- return DRV_BUSY;
- case ADC_STATE_RESET:
- case ADC_STATE_TIMEOUT:
- case ADC_STATE_ERROR:
- int_unlock(lock);
- return DRV_ERROR;
+ case ADC_STATE_READY:
+ adc_handle.state = ADC_STATE_BUSY;
+ break;
+ case ADC_STATE_BUSY:
+ int_unlock(lock);
+ return DRV_BUSY;
+ case ADC_STATE_RESET:
+ case ADC_STATE_TIMEOUT:
+ case ADC_STATE_ERROR:
+ int_unlock(lock);
+ return DRV_ERROR;
}
adc_handle.data = data;
@@ -380,7 +380,7 @@
{
// enable ADC
struct ADC_CFG_T vs_adc_cfg;
- vs_adc_cfg.mode = ADC_MODE_SINGLE; /* Selected single conversion mode */
+ vs_adc_cfg.mode = ADC_MODE_CONTINUE; /* Selected single conversion mode */
vs_adc_cfg.clk_sel = ADC_CLK_HIGH; /* Selected 62.4M high speed clock */
vs_adc_cfg.vref_sel = ADC_SEL_VREF_INT; /* Using internal reference voltage (1.2V)*/
vs_adc_cfg.rate = 1000; /* ADC works at high frequency system clock, the maximum sampling rate is 2M */
@@ -408,7 +408,7 @@
static void adc_continue_callback(void *data, uint32_t number)
{
-LOG_INFO(TRACE_MODULE_APP, "Chip adc callback %d degree\r\n", data);
+ LOG_INFO(TRACE_MODULE_APP, "Chip adc callback %d degree\r\n", data);
}
int16_t battery_monitor_get(void)
{
--
Gitblit v1.9.3