Skip to content
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.

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

cpu/esp32: fix xtimer dependency #12757

Merged
merged 1 commit into from
Nov 21, 2019

Conversation

gschorcht
Copy link
Contributor

Contribution description

Removes the dependency of the riot_freertos module from module xtimer. This avoids that xtimer is used even if it is not really needed which in turn occupies the first timer device so tests/periph_timer fails.

Fixes the automatic test output of tests/periph_timers for ESP32.

This PR belongs to the series of PRs, each with very small changes that fix automatic tests on ESP32 boards.

Testing procedure

Make, flash and test `tests/periph_timer.

make BOARD=esp32-wroom-32 -C tests/periph_timer flash test

Issues/PRs references

Requires #12752

@gschorcht gschorcht added Area: cpu Area: CPU/MCU ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Platform: ESP Platform: This PR/issue effects ESP-based platforms Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation labels Nov 20, 2019
Copy link
Contributor

@aabadie aabadie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I confirm this is fixing tests/periph_timer on esp32 but it introduces other problems with the CI. See below.

cpu/esp32/Makefile.dep Show resolved Hide resolved
Removes the dependency of the module riot_freertos from module xtimer. This avoids that xtimer is used even if it is not really needed which in turn occupies the first timer device and tests/periph_timer fails.
Copy link
Contributor

@aabadie aabadie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI is green now.

ACK and go!

@aabadie aabadie merged commit bef34d4 into RIOT-OS:master Nov 21, 2019
@gschorcht
Copy link
Contributor Author

Thanks for reviewing, testing and merging.

@gschorcht gschorcht deleted the cpu/esp32/fix_xtimer_deps branch November 21, 2019 09:30
@fjmolinas fjmolinas added this to the Release 2020.01 milestone Dec 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: cpu Area: CPU/MCU ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Platform: ESP Platform: This PR/issue effects ESP-based platforms Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants