From 387d1ffc16ce9e050403baee0ed07f3d9accf632 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 04 七月 2025 14:55:15 +0800
Subject: [PATCH] 初步移植完成0.6.8SDK，但发送有len太长未找到原因
---
keil/include/drivers/mk_adc.c | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/keil/include/drivers/mk_adc.c b/keil/include/drivers/mk_adc.c
index eac4e53..6bccb99 100644
--- a/keil/include/drivers/mk_adc.c
+++ b/keil/include/drivers/mk_adc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019-2023 Beijing Hanwei Innovation Technology Ltd. Co. and
+ * Copyright (c) 2019-2025 Beijing Hanwei Innovation Technology Ltd. Co. and
* its subsidiaries and affiliates (collectly called MKSEMI).
*
* All rights reserved.
@@ -62,8 +62,7 @@
return DRV_ERROR;
}
- // check if ADC is using by HW or not
- if (adc_handle.base->STATUS & ADC_STATUS_BUSY_MSK)
+ if (adc_handle.state == ADC_STATE_BUSY)
{
return DRV_BUSY;
}
@@ -104,6 +103,7 @@
/* If the external reference voltage driving capability is insufficient */
/* It is recommended to enable this configuration */
// val |= (9 << 1) | (1 << 4);
+ val |= (1 << 9) | (7 << 5) | (1 << 4);
}
REG_WRITE(0x4000062C, val);
@@ -125,8 +125,7 @@
int adc_close(void)
{
- // check if ADC is using by HW or not
- if ((adc_handle.base->STATUS & ADC_STATUS_BUSY_MSK) && (adc_handle.state != ADC_STATE_BUSY))
+ if (adc_handle.state == ADC_STATE_BUSY)
{
return DRV_BUSY;
}
@@ -209,6 +208,9 @@
dma_open(adc_handle.dma_ch, &adc_dma_cfg);
dma_transfer(adc_handle.dma_ch, (uint32_t *)&adc_handle.base->DATA, data, number, adc_dma_callback);
+
+ adc_handle.base->DMA_EN = ADC_DMA_EN_MSK;
+
// start conversion
adc_handle.base->CTRL2 = ADC_CTRL2_CONV_EN_MSK;
#endif
@@ -278,6 +280,8 @@
{
if (adc_handle.mode == ADC_MODE_CONTINUE)
{
+ adc_handle.base->DMA_EN &= ~ADC_DMA_EN_MSK;
+
// stop conversion
adc_handle.base->CTRL2 &= ~ADC_CTRL2_CONV_EN_MSK;
}
@@ -380,7 +384,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 */
@@ -405,17 +409,12 @@
adc_close();
}
-static void adc_continue_callback(void *data, uint32_t number)
-{
-
-//LOG_INFO(TRACE_MODULE_APP, "Chip adc callback %d degree\r\n", data);
-}
int16_t battery_monitor_get(void)
{
-#define NUM_SAMPLES (1)
+#define NUM_SAMPLES (3)
uint32_t sample[NUM_SAMPLES];
- adc_get(&sample[0], NUM_SAMPLES, adc_continue_callback);
+ adc_get(&sample[0], NUM_SAMPLES, NULL);
int32_t sum = 0;
for (int i = 0; i < NUM_SAMPLES; i++)
--
Gitblit v1.9.3