Skip to content

Commit 5c3544c

Browse files
authored
Merge pull request #59 from miri64/task04/fix/xtimer-API-change
task-04: fix README for xtimer_now() change
2 parents 66bf7ed + 8e4f464 commit 5c3544c

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

slides/slides.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,12 +207,12 @@ pid = thread_create(stack, sizeof(stack),
207207
## `xtimer` primer
208208
* `xtimer` is the high level API of RIOT to multiplex hardware timers
209209
* Examples for functionality:
210-
- `xtimer_now()` to get current system time in microseconds
210+
- `xtimer_now_usec()` to get current system time in microseconds
211211
- `xtimer_sleep(sec)` to sleep `sec` seconds
212212
- `xtimer_usleep(usec)` to sleep `usec` microseconds
213213

214214
## Task 4.1 -- Use `xtimer`
215-
* Reminder: Functions `xtimer_now()`, `xtimer_sleep()`, and `xtimer_usleep()` were introduced
215+
* Reminder: Functions `xtimer_now_usec()`, `xtimer_sleep()`, and `xtimer_usleep()` were introduced
216216
* Go to task-04 directory (`cd ../task-04`)
217217
* Note the inclusion of `xtimer` in Makefile
218218

slides/tutorial-slides.pdf

88.7 KB
Binary file not shown.

task-04/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[`xtimer`](https://doc.riot-os.org/group__sys__xtimer.html) is the high level API of RIOT to multiplex hardware timers.
55
For this task we need only the following functions
66

7-
- `xtimer_now()` to get current system time in microseconds
7+
- `xtimer_now_usec()` to get current system time in microseconds
88
- `xtimer_sleep(sec)` to sleep `sec` seconds
99
- `xtimer_usleep(usec)` to sleep `usec` microseconds
1010

0 commit comments

Comments
 (0)