From fc78430a35be252a1cd5a29b5b66290a68cd9ca3 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 27 八月 2024 17:21:18 +0800
Subject: [PATCH] Merge branch '安邦测距手环' of http://47.108.70.204:60062/r/ChinaUWBProject into 安邦测距手环
---
keil/include/drivers/mk_adc.c | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/keil/include/drivers/mk_adc.c b/keil/include/drivers/mk_adc.c
index bd6371a..e6c3dbf 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;
@@ -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