Skip to content

boards/nrf51-based: split shared timer/rtt config#11625

Merged
aabadie merged 1 commit into
RIOT-OS:masterfrom
haukepetersen:opt_nrf51_timerrttcfg
Jun 5, 2019
Merged

boards/nrf51-based: split shared timer/rtt config#11625
aabadie merged 1 commit into
RIOT-OS:masterfrom
haukepetersen:opt_nrf51_timerrttcfg

Conversation

@haukepetersen

Copy link
Copy Markdown
Contributor

Contribution description

This PR streamlines the shared RTT and timer configuration for nrf51-based boards:

  • split RTT and timer config into separate headers
  • allow to map 2 or all 3 hardware timers -> the microbit and calliope use TIMER_DEV(2) for their LED-matrix driver

Testing procedure

Run tests/periph_timer for any of the effected boards

Issues/PRs references

enables simpler adaption of #11463

@haukepetersen haukepetersen added Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Area: boards Area: Board ports labels Jun 4, 2019
@haukepetersen haukepetersen requested a review from aabadie June 4, 2019 11:05

@aabadie aabadie left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks good in general. I can test this on nrf51dk and microbit. I don't have access to the other boards.

@haukepetersen

Copy link
Copy Markdown
Contributor Author

IMHO a thorough review combined with the build-test should do for the others, as all of them are equal to either of those two boards.

@aabadie aabadie left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The CI is complaining because of invalid header guards. You can squash directly.

Otherwise, I tested tests/periph_timer and a couple of xtimer test applications on microbit and nrf51dk with success.

* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*/

#ifndef PERIPH_CONF_COMMON_H

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

As reported by the CI, the guard must be updated as well.

* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*/

#ifndef PERIPH_CONF_COMMON_H

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same here

@haukepetersen haukepetersen force-pushed the opt_nrf51_timerrttcfg branch from a15998a to 44625ec Compare June 5, 2019 07:53
@haukepetersen

Copy link
Copy Markdown
Contributor Author

fixed the header guards, and squashed.

@aabadie aabadie left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

ACK and go!

@aabadie aabadie merged commit e53b117 into RIOT-OS:master Jun 5, 2019
@haukepetersen haukepetersen deleted the opt_nrf51_timerrttcfg branch June 6, 2019 12:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: boards Area: Board ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR 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.

2 participants