Skip to content

Commit

Permalink
Merge branch 'bugfix/fix_calculation_overflow_of_timer_less_than_0x35…
Browse files Browse the repository at this point in the history
…A_us_error' into 'release/v2.x.x'

bugfix(hw_timer): fix calculation overflow of timer less than 0x35A us error

See merge request sdk/ESP8266_RTOS_SDK!533
  • Loading branch information
wujiangang committed Oct 19, 2018
2 parents 4951dae + 153c109 commit f079158
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion driver_lib/driver/hw_timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
((t) ? \
(((t) > 0x35A) ? \
(((t) >> 2) * ((APB_CLK_FREQ >> 4) / 250000) + ((t)&0x3) * ((APB_CLK_FREQ >> 4) / 1000000)) : \
(((t) *(APB_CLK_FREQ>>4)) / 1000000)) : \
((t) *((APB_CLK_FREQ>>4) / 1000000))) : \
0)

#define FRC1_ENABLE_TIMER BIT7
Expand Down

0 comments on commit f079158

Please sign in to comment.