From 98043ff151cf43018a7383fa9565e1085a8652c2 Mon Sep 17 00:00:00 2001 From: jzlv Date: Mon, 12 Jul 2021 16:58:29 +0800 Subject: [PATCH] [fix][adc] fix adc device channel table for ch6 and ch7 --- drivers/bl702_driver/hal_drv/src/hal_adc.c | 8 ++------ drivers/bl702_driver/std_drv/src/bl702_adc.c | 3 ++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/bl702_driver/hal_drv/src/hal_adc.c b/drivers/bl702_driver/hal_drv/src/hal_adc.c index 560c5cff..41b859c5 100644 --- a/drivers/bl702_driver/hal_drv/src/hal_adc.c +++ b/drivers/bl702_driver/hal_drv/src/hal_adc.c @@ -121,8 +121,8 @@ uint8_t adc_check_channel_status(uint8_t *pos_list, uint8_t *neg_list, uint16_t GPIO_PIN_11, /* CH3 IO */ GPIO_PIN_12, /* CH4 IO */ GPIO_PIN_14, /* CH5 IO */ - 0xff, /* CH6 IO */ - 0xff, /* CH7 IO */ + GPIO_PIN_7, /* CH6 IO */ + GPIO_PIN_9, /* CH7 IO */ GPIO_PIN_18, /* CH8 IO */ GPIO_PIN_19, /* CH9 IO */ GPIO_PIN_20, /* CH10 IO */ @@ -135,10 +135,6 @@ uint8_t adc_check_channel_status(uint8_t *pos_list, uint8_t *neg_list, uint16_t continue; } - if (channel_io_reference_table[pos_list[i]] == 0xff) { - return ERROR; - } - if (GLB_GPIO_Get_Fun(channel_io_reference_table[pos_list[i]]) != GPIO_FUN_ANALOG) { return ERROR; } diff --git a/drivers/bl702_driver/std_drv/src/bl702_adc.c b/drivers/bl702_driver/std_drv/src/bl702_adc.c index 8969dbe2..caf54dc9 100644 --- a/drivers/bl702_driver/std_drv/src/bl702_adc.c +++ b/drivers/bl702_driver/std_drv/src/bl702_adc.c @@ -579,7 +579,7 @@ void ADC_Parse_Result(uint32_t *orgVal, uint32_t len, ADC_Result_Type *result) * @param intMask: mask or unmask * * @return None - * + * *******************************************************************************/ BL_Mask_Type ADC_IntGetMask(ADC_INT_Type intType) { @@ -622,6 +622,7 @@ BL_Mask_Type ADC_IntGetMask(ADC_INT_Type intType) default: break; } + return 0; } /****************************************************************************/ /**