ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7313 from mprse/NRF52840_ticker_width_fix 

NRF_52840: Fix us ticker counter size
pull/7239/head
Martin Kojtal 2018-06-29 10:10:40 +02:00 committed by GitHub
parent 2be3c13534 9966110dd9
commit 58fa28b9b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
targets/TARGET_NORDIC/TARGET_NRF5x/us_ticker.c
View File

@ -77,7 +77,7 @@ void us_ticker_init(void)
nrf_timer_frequency_set(NRF_TIMER1, NRF_TIMER_FREQ_1MHz);
#ifdef NRF52
#ifdef TARGET_NRF52
nrf_timer_bit_width_set(NRF_TIMER1, NRF_TIMER_BIT_WIDTH_32);
#else
nrf_timer_bit_width_set(NRF_TIMER1, NRF_TIMER_BIT_WIDTH_16);