cpu/esp32: fix of periph_* submodule compilation#11337
Merged
leandrolanzieri merged 7 commits intoRIOT-OS:masterfrom May 1, 2019
Merged
cpu/esp32: fix of periph_* submodule compilation#11337leandrolanzieri merged 7 commits intoRIOT-OS:masterfrom
leandrolanzieri merged 7 commits intoRIOT-OS:masterfrom
Conversation
Includes now $(RIOTMAKE)/periph.mk instead of $(RIOTBASE)/Makefile.include to control compilation of periph submodules.
leandrolanzieri
requested changes
Apr 15, 2019
Contributor
leandrolanzieri
left a comment
There was a problem hiding this comment.
Just a few comments, it looks good. I will be testing this shortly.
Contributor
|
I tested the ADC and DAC on esp32-wroom-32 and works fine. |
Contributor
Author
|
@leandrolanzieri I addressed all change requests. |
leandrolanzieri
approved these changes
Apr 30, 2019
Contributor
There was a problem hiding this comment.
Changes look good. ACK. Please @gschorcht squash!
Functions that are used by ADC and DAC peripherals are moved to a new submodule periph_adc_ctrl. This is necessary to compile separate submodules for ADC and DAC.
da08c46 to
94a1af3
Compare
Contributor
Author
|
@leandrolanzieri Squashed |
Contributor
Author
|
@leandrolanzieri Thanks for reviewing and merging it. |
Contributor
Author
|
@leandrolanzieri Next, I will rebase PRs #11289 to #11294 |
This file contains hidden or 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
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.
Contribution description
This PR changes the handling of
periph_*submoduls during compilation for ESP32. Until now, allperiph_*submodules were always compiled.#if MODULE_PERIPH_*wrappers were used instead for the following reason:ADC and DAC channels are implemented by the same hardware controller. Therefore, both peripherals were implemented in the same file
periph/adc.c, which in turn prevented the use of$(RIOTMAKE)/periph.mkand periph_ * submodules.With this PR
periph_adc_ctrl,Testing procedure
Since the implementation of peripherals did not change with exception of ADC and DAC, successful compilation of tests that use peripherals should be enough.
Due to the changes of ADC and DAC implementation structure,
tests/periph_adcandtests/periph_dacshould be executed on any ESP32 board with ADC and DAC channels, e.g.,esp32-wroom-32.Issues/PRs references
This PR was initiated by the discussion in PR #11289.