ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7429 from codeauroraforum/MXRT_Fix_AnalogIn 

MXRT1050: Ensure the pins are in input mode for analogin
pull/7437/head
Cruz Monrreal 2018-07-06 11:24:40 -05:00 committed by GitHub
parent 59defa29e9 19b6ef2e87
commit 69d8c0bac3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_IMX/analogin_api.c
View File

@ -20,6 +20,7 @@
#include "cmsis.h"
#include "pinmap.h"
#include "gpio_api.h"
#include "PeripheralNames.h"
#include "fsl_adc.h"
#include "PeripheralPins.h"
@ -34,6 +35,7 @@ void analogin_init(analogin_t *obj, PinName pin)
uint32_t instance = obj->adc >> ADC_INSTANCE_SHIFT;
adc_config_t adc_config;
gpio_t gpio;
ADC_GetDefaultConfig(&adc_config);
ADC_Init(adc_addrs[instance], &adc_config);
@ -41,6 +43,10 @@ void analogin_init(analogin_t *obj, PinName pin)
ADC_EnableHardwareTrigger(adc_addrs[instance], false);
#endif
ADC_DoAutoCalibration(adc_addrs[instance]);
/* Need to ensure the pin is in input mode */
gpio_init(&gpio, pin);
gpio_dir(&gpio, PIN_INPUT);
}
uint16_t analogin_read_u16(analogin_t *obj)

8
targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MIMXRT1050/TARGET_EVK/PeripheralPins.c
View File

@ -23,8 +23,12 @@ const PinMap PinMap_RTC[] = {
/************ADC***************/
const PinMap PinMap_ADC[] = {
{GPIO_AD_B1_11, ADC1_0, 0},
{GPIO_AD_B1_04, ADC1_9, 0},
{GPIO_AD_B1_10, ADC1_15, 5},
{GPIO_AD_B1_11, ADC2_0, 5},
{GPIO_AD_B1_04, ADC1_9, 5},
{GPIO_AD_B1_05, ADC1_10, 5},
{GPIO_AD_B1_01, ADC1_6, 5},
{GPIO_AD_B1_00, ADC1_5, 5},
{NC , NC , 0}
};