hw/nrf/adc: Fix adc device configuration #1052
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sjanc
approved these changes
Apr 25, 2018
This patch fixes the way ADC is configured for nRF5x boards as it was
confused what configuration should be provided when created adc device
and how to configure it on open.
With this patch when ADC os_dev is created (what happens in hal_bsp.c),
It is expected to provide 'struct nrf52_adc_dev_cfg' or 'struct
nrf51_adc_dev_cfg' which contains reference mv which can be
configured by MYNEWT_VALs e.g. ADC_0_REFMV_0
When opening adc os_device (what happens in application), user needs
to provide 'nrfx_saadc_config_t' with appropriate resolution, oversample
etc. e.g.
nrfx_saadc_config_t adc_config = {
.resolution = NRF_SAADC_RESOLUTION_8BIT,
.oversample = NRF_SAADC_OVERSAMPLE_DISABLED,
.interrupt_priority = 7,
.low_power_mode = NRFX_SAADC_CONFIG_LP_MODE
};
adc = (struct adc_dev *) os_dev_open("adc0", 0, &adc_config);
and later channel config using 'nrf_saadc_channel_config_t':
nrf_saadc_channel_config_t cc =
NRFX_SAADC_DEFAULT_CHANNEL_CONFIG_SE(NRF_SAADC_INPUT_AIN0);
cc.gain = NRF_SAADC_GAIN1_5;
cc.reference = NRF_SAADC_REFERENCE_INTERNAL;
adc_chan_config(adc, cnum, &cc);
This patch removes MYNEWT_VALs ADC_0_RESOLUTION, ADC_0_OVERSAMPLE,
ADC_0_INTERRUPT_PRIORITY in favour of using nrfx specific defines.
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR reverts #951 and introduce proper fix for the same problem
This is basically copy of #957 but with fixed commit message.