NRF_52840: Fix us ticker counter size #7313
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
|
Ticker/Timer test results ( |
0xc0170
previously approved these changes
Jun 25, 2018
| @@ -77,7 +77,7 @@ void us_ticker_init(void) | |||
|
|
|||
| nrf_timer_frequency_set(NRF_TIMER1, NRF_TIMER_FREQ_1MHz); | |||
|
|
|||
| #ifdef NRF52 | |||
| #if defined(NRF52) || defined(NRF52840_XXAA) | |||
There was a problem hiding this comment.
If you use TARGET_NRF52 it will also work for the new NRF52810.
mprse
force-pushed
the
NRF52840_ticker_width_fix
branch
from
ef0f949
to
94cd20b
Compare
|
Fixed as suggested by @marcuschangarm. |
Merged
It has been noticed that there is a problem with us ticker on NRF_52840 board after 32 bit counter has been used for us ticker on NRF52 family boards. Currently NRF52 symbol is defined only for MCU_NRF52832 (not for MCU_NRF52840) and based on this symbol 16 or 32 bit counter is selected (16 bit for NRF51 family and 32 for NRF52 family). Since MCU_NRF52840 defines NRF52840_XXAA and provides 32 bit counters, 32 bit counter should be selected also when NRF52840_XXAA symbol is defined.
mprse
force-pushed
the
NRF52840_ticker_width_fix
branch
from
94cd20b
to
9966110
Compare
pan-
approved these changes
Jun 28, 2018
0xc0170
approved these changes
Jun 28, 2018
|
/morph build |
Build : SUCCESSBuild number : 2467 Triggering tests/morph test |
Exporter Build : SUCCESSBuild number : 2096 |
Test : SUCCESSBuild number : 2244 |
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.
Description
It has been noticed that there is a problem with us ticker on NRF_52840 board after 32 bit counter has been used for us ticker on NRF52 family boards.
Currently
NRF52symbol is defined only for MCU_NRF52832 (not for MCU_NRF52840) and based on this symbol 16 or 32 bit counter is selected (16 bit for NRF51 family and 32 for NRF52 family).Since MCU_NRF52840 defines
NRF52840_XXAAand provides 32 bit counters, 32 bit counter should be selected also whenNRF52840_XXAAsymbol is defined.@marcuschangarm Can you review this PR?
Pull request type