Skip to content

KSDK2 - set ADC mux before taking measurement #2146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2016
Merged

KSDK2 - set ADC mux before taking measurement #2146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions hal/targets/hal/TARGET_Freescale/TARGET_KSDK2_MCUS/api/analogin_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ void analogin_init(analogin_t *obj, PinName pin) {
ADC16_Init(adc_addrs[instance], &adc16_config);
ADC16_EnableHardwareTrigger(adc_addrs[instance], false);
ADC16_SetHardwareAverage(adc_addrs[instance], kADC16_HardwareAverageCount4);
ADC16_SetChannelMuxMode(adc_addrs[instance],
obj->adc & (1 << ADC_B_CHANNEL_SHIFT) ? kADC16_ChannelMuxB : kADC16_ChannelMuxA);

pinmap_pinout(pin, PinMap_ADC);
}

Expand All @@ -71,6 +68,9 @@ uint16_t analogin_read_u16(analogin_t *obj) {
adc16_channel_config.enableDifferentialConversion = false;
#endif

ADC16_SetChannelMuxMode(adc_addrs[instance],
obj->adc & (1 << ADC_B_CHANNEL_SHIFT) ? kADC16_ChannelMuxB : kADC16_ChannelMuxA);

/*
* When in software trigger mode, each conversion would be launched once calling the "ADC16_ChannelConfigure()"
* function, which works like writing a conversion command and executing it.
Expand Down