Skip to content

Commit

Permalink
Merge pull request #7313 from mprse/NRF52840_ticker_width_fix
Browse files Browse the repository at this point in the history
NRF_52840: Fix us ticker counter size
  • Loading branch information
0xc0170 authored Jun 29, 2018
2 parents 2be3c13 + 9966110 commit 58fa28b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion targets/TARGET_NORDIC/TARGET_NRF5x/us_ticker.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 58fa28b

Please sign in to comment.