GitHub-Mirror/bl_mcu_sdk
2
0
Fork 0
mirror of https://github.com/Fishwaldo/bl_mcu_sdk.git synced 2025-07-07 05:18:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[fix][adc] fix adc device channel table for ch6 and ch7

Browse source
This commit is contained in:
jzlv 2021-07-12 16:58:29 +08:00
parent 2c6382a4e1
commit 98043ff151
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/bl702_driver/hal_drv/src/hal_adc.c
View file

@ -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;
}

3
drivers/bl702_driver/std_drv/src/bl702_adc.c
View file

@ -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;
}
/****************************************************************************/ /**