diff options
| author | Marti Bolivar <mbolivar@mit.edu> | 2010-12-08 23:39:37 -0500 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@mit.edu> | 2010-12-08 23:39:37 -0500 |
| commit | b67d281d85bd59a9738a9a43c4db1027f81d9208 (patch) | |
| tree | 1940b4743a945160d21eb37c8578fa46e9118d4e /wirish/time.h | |
| parent | b34f826ae1470aaa791bd8ed8dd66ccd4d96d82c (diff) | |
| download | librambutan-b67d281d85bd59a9738a9a43c4db1027f81d9208.tar.gz librambutan-b67d281d85bd59a9738a9a43c4db1027f81d9208.zip | |
Servo library tested and debugged.
Some additional HardwareTimer methods introduced to make this
convenient; ancillary libmaple/timers.h changes resulted.
Diffstat (limited to 'wirish/time.h')
| -rw-r--r-- | wirish/time.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wirish/time.h b/wirish/time.h index fad47a4..c3dfe2d 100644 --- a/wirish/time.h +++ b/wirish/time.h @@ -59,10 +59,10 @@ static inline uint32 micros(void) { nvic_globalirq_enable(); - /* MAPLE_RELOAD_VAL is 1 less than the number of cycles it actually - takes to complete a systick reload */ + /* SYSTICK_RELOAD_VAL is 1 less than the number of cycles it + actually takes to complete a SysTick reload */ res = (ms * US_PER_MS) + - (MAPLE_RELOAD_VAL + 1 - cycle_cnt)/CYCLES_PER_MICROSECOND; + (SYSTICK_RELOAD_VAL + 1 - cycle_cnt)/CYCLES_PER_MICROSECOND; return res; } |