Skip to content

Commit 7e25e9f

Browse files
Cruz Monrreal IICruz Monrreal II
authored andcommitted
Merge branch 'naveenkaje-timer_doc_update' into rollup-aus_writathon
2 parents 72192c9 + 9489972 commit 7e25e9f

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

drivers/Timer.h

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace mbed {
3030
*
3131
* Example:
3232
* @code
33-
* // Count the time to toggle a LED
33+
* // Count the time to toggle an LED
3434
*
3535
* #include "mbed.h"
3636
*
@@ -65,7 +65,7 @@ class Timer : private NonCopyable<Timer> {
6565

6666
/** Reset the timer to 0.
6767
*
68-
* If it was already counting, it will continue
68+
* If it was already running, it will continue
6969
*/
7070
void reset();
7171

@@ -75,34 +75,37 @@ class Timer : private NonCopyable<Timer> {
7575
*/
7676
float read();
7777

78-
/** Get the time passed in milli-seconds
78+
/** Get the time passed in milliseconds
7979
*
80-
* @returns Time passed in milli seconds
80+
* @returns Time passed in milliseconds
8181
*/
8282
int read_ms();
8383

84-
/** Get the time passed in micro-seconds
84+
/** Get the time passed in microseconds
8585
*
86-
* @returns Time passed in micro seconds
86+
* @returns Time passed in microseconds
8787
*/
8888
int read_us();
8989

9090
/** An operator shorthand for read()
9191
*/
9292
operator float();
9393

94-
/** Get in a high resolution type the time passed in micro-seconds.
94+
/** Get in a high resolution type the time passed in microseconds.
95+
* Returns a 64 bit integer.
9596
*/
9697
us_timestamp_t read_high_resolution_us();
9798

99+
#if !defined(DOXYGEN_ONLY)
98100
protected:
99101
us_timestamp_t slicetime();
100102
int _running; // whether the timer is running
101103
us_timestamp_t _start; // the start time of the latest slice
102104
us_timestamp_t _time; // any accumulated time from previous slices
103105
const ticker_data_t *_ticker_data;
104-
bool _lock_deepsleep; // flag which indicates if deep-sleep should be disabled
106+
bool _lock_deepsleep; // flag that indicates if deep sleep should be disabled
105107
};
108+
#endif
106109

107110
} // namespace mbed
108111

0 commit comments

Comments
 (0)