libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5807 from rtthread-bot/rtt_bot 

[update] RT-Thread Robot automatic submission
This commit is contained in:
guo 2022-04-14 16:33:44 +08:00 committed by GitHub
parent ecb69f56ac 435d2b24f8
commit 54642ec639
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
bsp/gd32/libraries/gd32_drivers/drv_adc.c
View File

@ -6,91 +6,86 @@
* Change Logs: * Change Logs:
* Date Author Notes * Date Author Notes
* 2021-02-25 iysheng first version * 2021-02-25 iysheng first version
* 2022-04-13 wangh adc init and convert bug fix
*/ */
#include <board.h> #include <board.h>
#include <drivers/adc.h>
#define DBG_TAG "drv.adc"
#define DBG_LVL DBG_INFO
#include <rtdbg.h>
#ifdef RT_USING_ADC #ifdef RT_USING_ADC
#define DBG_TAG "drv.adc"
#define DBG_LVL DBG_INFO
#include <rtdbg.h>
#define MAX_EXTERN_ADC_CHANNEL 16 #define MAX_EXTERN_ADC_CHANNEL 16
typedef struct { typedef struct
{
struct rt_adc_device adc_dev; struct rt_adc_device adc_dev;
char name[8]; char name[8];
rt_base_t adc_pins[16]; rt_base_t adc_pins[16];
void *private_data; void *private_data;
} gd32_adc_device; } gd32_adc_device;
static gd32_adc_device g_gd32_devs[] = { static gd32_adc_device adc_devs[] = {
#ifdef BSP_USING_ADC0 #ifdef BSP_USING_ADC0
{ {
{}, .name = "adc0",
"adc0", .adc_pins = {
{
GET_PIN(A, 0), GET_PIN(A, 1), GET_PIN(A, 2), GET_PIN(A, 3), GET_PIN(A, 0), GET_PIN(A, 1), GET_PIN(A, 2), GET_PIN(A, 3),
GET_PIN(A, 4), GET_PIN(A, 5), GET_PIN(A, 6), GET_PIN(A, 7), GET_PIN(A, 4), GET_PIN(A, 5), GET_PIN(A, 6), GET_PIN(A, 7),
GET_PIN(B, 0), GET_PIN(B, 1), GET_PIN(C, 0), GET_PIN(C, 1), GET_PIN(B, 0), GET_PIN(B, 1), GET_PIN(C, 0), GET_PIN(C, 1),
GET_PIN(C, 2), GET_PIN(C, 3), GET_PIN(C, 4), GET_PIN(C, 5), GET_PIN(C, 2), GET_PIN(C, 3), GET_PIN(C, 4), GET_PIN(C, 5),
}, },
(void *)ADC0, .private_data = (void *)ADC0,
}, },
#endif #endif
#ifdef BSP_USING_ADC1 #ifdef BSP_USING_ADC1
{ {
{}, .name = "adc1",
"adc1", .adc_pins = {
{
GET_PIN(A, 0), GET_PIN(A, 1), GET_PIN(A, 2), GET_PIN(A, 3), GET_PIN(A, 0), GET_PIN(A, 1), GET_PIN(A, 2), GET_PIN(A, 3),
GET_PIN(A, 4), GET_PIN(A, 5), GET_PIN(A, 6), GET_PIN(A, 7), GET_PIN(A, 4), GET_PIN(A, 5), GET_PIN(A, 6), GET_PIN(A, 7),
GET_PIN(B, 0), GET_PIN(B, 1), GET_PIN(C, 0), GET_PIN(C, 1), GET_PIN(B, 0), GET_PIN(B, 1), GET_PIN(C, 0), GET_PIN(C, 1),
GET_PIN(C, 2), GET_PIN(C, 3), GET_PIN(C, 4), GET_PIN(C, 5), GET_PIN(C, 2), GET_PIN(C, 3), GET_PIN(C, 4), GET_PIN(C, 5),
}, },
(void *)ADC1, .private_data = (void *)ADC1,
}, },
#endif #endif
}; };
/* static void gd32_adc_gpio_init(rt_base_t pin)
* static void init_pin4adc
*
* @ rt_uint32_t pin: pin information
* return: N/A
*/
static void init_pin4adc(rt_base_t pin)
{ {
rcu_periph_clock_enable((rcu_periph_enum)PIN_GDRCU(pin));
gpio_init(PIN_GDPORT(pin), GPIO_MODE_AIN, GPIO_OSPEED_50MHZ, PIN_GDPIN(pin)); gpio_init(PIN_GDPORT(pin), GPIO_MODE_AIN, GPIO_OSPEED_50MHZ, PIN_GDPIN(pin));
} }
static rt_err_t gd32_adc_enabled(struct rt_adc_device *device, rt_uint32_t channel, rt_bool_t enabled) static rt_err_t drv_adc_enabled(struct rt_adc_device *device, rt_uint32_t channel, rt_bool_t enabled)
{ {
uint32_t adc_periph; if ((device == NULL) || (channel >= MAX_EXTERN_ADC_CHANNEL))
gd32_adc_device * gd32_adc = (gd32_adc_device *)device;
if (channel >= MAX_EXTERN_ADC_CHANNEL)
{ {
LOG_E("invalid channel"); LOG_E("invalid channel\r\n");
return -RT_EINVAL; return -RT_EINVAL;
} }
adc_periph = (uint32_t )(device->parent.user_data); gd32_adc_device *gd32_adc = (gd32_adc_device *)device;
uint32_t adc_periph = (uint32_t )(device->parent.user_data);
if (enabled == ENABLE) if (enabled == ENABLE)
{ {
init_pin4adc(gd32_adc->adc_pins[channel]); gd32_adc_gpio_init(gd32_adc->adc_pins[channel]);
adc_deinit(adc_periph); adc_deinit(adc_periph);
adc_channel_length_config(adc_periph, ADC_REGULAR_CHANNEL, 1); adc_channel_length_config(adc_periph, ADC_REGULAR_CHANNEL, 1);
adc_data_alignment_config(adc_periph, ADC_DATAALIGN_RIGHT); adc_data_alignment_config(adc_periph, ADC_DATAALIGN_RIGHT); /* 数据右对齐 */
adc_external_trigger_source_config(adc_periph, ADC_REGULAR_CHANNEL, ADC0_1_2_EXTTRIG_INSERTED_NONE); adc_external_trigger_config(adc_periph, ADC_REGULAR_CHANNEL, ENABLE); /* 规则组外部触发使能 */
adc_external_trigger_config(adc_periph, ADC_REGULAR_CHANNEL, ENABLE); adc_external_trigger_source_config(adc_periph, ADC_REGULAR_CHANNEL, ADC0_1_2_EXTTRIG_REGULAR_NONE);
adc_regular_channel_config(adc_periph, 0, channel, ADC_SAMPLETIME_13POINT5); adc_special_function_config(adc_periph, ADC_SCAN_MODE, DISABLE); /* 扫描模式禁止，单通道模式 */
adc_special_function_config(adc_periph, ADC_CONTINUOUS_MODE, DISABLE); /* 连续转换禁止，单次转换模式 */
adc_discontinuous_mode_config(adc_periph, ADC_REGULAR_CHANNEL, 1); /* 规则组间断使能及转换通道数目 */
adc_enable(adc_periph); adc_enable(adc_periph);
rt_hw_us_delay(500);
adc_calibration_enable(adc_periph); /* ADC自校准 */
} }
else else
{ {
@ -100,30 +95,32 @@ static rt_err_t gd32_adc_enabled(struct rt_adc_device *device, rt_uint32_t chann
return 0; return 0;
} }
static rt_err_t gd32_adc_convert(struct rt_adc_device *device, rt_uint32_t channel, rt_uint32_t *value) static rt_err_t drv_adc_convert(struct rt_adc_device *device, rt_uint32_t channel, rt_uint32_t *value)
{ {
uint32_t adc_periph; if ((device == NULL) || (channel >= MAX_EXTERN_ADC_CHANNEL) || (value == NULL))
if (!value)
{ {
LOG_E("invalid param"); LOG_E("invalid param\r\n");
return -RT_EINVAL; return -RT_EINVAL;
} }
adc_periph = (uint32_t )(device->parent.user_data); uint32_t adc_periph = (uint32_t )(device->parent.user_data);
adc_regular_channel_config(adc_periph, 0, channel, ADC_SAMPLETIME_239POINT5);
adc_software_trigger_enable(adc_periph, ADC_REGULAR_CHANNEL); adc_software_trigger_enable(adc_periph, ADC_REGULAR_CHANNEL);
while(!adc_flag_get(adc_periph, ADC_FLAG_EOC)); /* 等待ADC转换完成 */
adc_flag_clear(adc_periph, ADC_FLAG_EOC); /* 清除转换完成标志位 */
adc_flag_clear(adc_periph, ADC_FLAG_STRC);
*value = adc_regular_data_read(adc_periph); *value = adc_regular_data_read(adc_periph);
return 0; return 0;
} }
static struct rt_adc_ops g_gd32_adc_ops = { static struct rt_adc_ops drv_adc_ops = {
gd32_adc_enabled, .enabled = drv_adc_enabled,
gd32_adc_convert, .convert = drv_adc_convert,
}; };
static int rt_hw_adc_init(void) static int rt_hw_adc_init(void)
{ {
int ret, i = 0; int ret, i = 0;
@ -136,15 +133,18 @@ static int rt_hw_adc_init(void)
rcu_periph_clock_enable(RCU_ADC1); rcu_periph_clock_enable(RCU_ADC1);
#endif #endif
for (; i < sizeof(g_gd32_devs) / sizeof(g_gd32_devs[0]); i++) rcu_adc_clock_config(RCU_CKADC_CKAPB2_DIV6); /* 72/6 = 12MHz need < 14MHZ */
adc_mode_config(ADC_MODE_FREE);
for (; i < sizeof(adc_devs) / sizeof(gd32_adc_device); i++)
{ {
ret = rt_hw_adc_register(&g_gd32_devs[i].adc_dev, \ ret = rt_hw_adc_register(&adc_devs[i].adc_dev,
(const char *)g_gd32_devs[i].name, \ (const char *)adc_devs[i].name,
&g_gd32_adc_ops, (void *)g_gd32_devs[i].private_data); &drv_adc_ops, (void *)adc_devs[i].private_data);
if (ret != RT_EOK) if (ret != RT_EOK)
{ {
/* TODO err handler */ /* TODO err handler */
LOG_E("failed register %s, err=%d", g_gd32_devs[i].name, ret); LOG_E("failed register %s, err=%d\r\n", adc_devs[i].name, ret);
} }
} }

8
bsp/gd32/libraries/gd32_drivers/drv_gpio.h
View File

@ -48,11 +48,13 @@ extern "C" {
#define GET_PIN(PORTx,PIN) (rt_base_t)((16 * ( ((rt_base_t)__GD32_PORT(PORTx) - (rt_base_t)GPIO_BASE)/(0x0400UL) )) + PIN) #define GET_PIN(PORTx,PIN) (rt_base_t)((16 * ( ((rt_base_t)__GD32_PORT(PORTx) - (rt_base_t)GPIO_BASE)/(0x0400UL) )) + PIN)
#define PIN_NUM(port, no) (((((port)&0xFu) << 4) | ((no)&0xFu)))
#define PIN_PORT(pin) ((uint8_t)(((pin) >> 4) & 0xFu)) #define PIN_PORT(pin) ((uint8_t)(((pin) >> 4) & 0xFu))
#define PIN_NO(pin) ((uint8_t)((pin) & 0xFu)) #define PIN_NO(pin) ((uint8_t)((pin)&0xFu))
#define PIN_GDPORT(pin) (GPIO_BASE + (0x400u * PIN_PORT(pin))) #define PIN_GDPORT(pin) (GPIO_BASE + (0x400u * PIN_PORT(pin))) /* gpio_periph GPIOA~GPIOG */
#define PIN_GDPIN(pin) ((uint16_t)(1u << PIN_NO(pin))) #define PIN_GDPIN(pin) ((uint16_t)(1u << PIN_NO(pin))) /* GPIO_PIN_0~GPIO_PIN_15 */
#define PIN_GDRCU(pin) RCU_REGIDX_BIT(APB2EN_REG_OFFSET, PIN_PORT(pin) + 2) /* pin gpio外设时钟 */
struct pin_index struct pin_index
{ {