@@ -30,7 +30,7 @@ namespace mbed {
30
30
*
31
31
* Example:
32
32
* @code
33
- * // Count the time to toggle a LED
33
+ * // Count the time to toggle an LED
34
34
*
35
35
* #include "mbed.h"
36
36
*
@@ -65,7 +65,7 @@ class Timer : private NonCopyable<Timer> {
65
65
66
66
/* * Reset the timer to 0.
67
67
*
68
- * If it was already counting , it will continue
68
+ * If it was already running , it will continue
69
69
*/
70
70
void reset ();
71
71
@@ -75,34 +75,37 @@ class Timer : private NonCopyable<Timer> {
75
75
*/
76
76
float read ();
77
77
78
- /* * Get the time passed in milli-seconds
78
+ /* * Get the time passed in milliseconds
79
79
*
80
- * @returns Time passed in milli seconds
80
+ * @returns Time passed in milliseconds
81
81
*/
82
82
int read_ms ();
83
83
84
- /* * Get the time passed in micro-seconds
84
+ /* * Get the time passed in microseconds
85
85
*
86
- * @returns Time passed in micro seconds
86
+ * @returns Time passed in microseconds
87
87
*/
88
88
int read_us ();
89
89
90
90
/* * An operator shorthand for read()
91
91
*/
92
92
operator float ();
93
93
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.
95
96
*/
96
97
us_timestamp_t read_high_resolution_us ();
97
98
99
+ #if !defined(DOXYGEN_ONLY)
98
100
protected:
99
101
us_timestamp_t slicetime ();
100
102
int _running; // whether the timer is running
101
103
us_timestamp_t _start; // the start time of the latest slice
102
104
us_timestamp_t _time; // any accumulated time from previous slices
103
105
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
105
107
};
108
+ #endif
106
109
107
110
} // namespace mbed
108
111
0 commit comments