aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bors[bot] <26634292+bors[bot]@users.noreply.github.com> 2022-01-08 06:19:22 +0000
committerGravatar GitHub <noreply@github.com> 2022-01-08 06:19:22 +0000
commitd51aaf3ad3ffb2314f8885515e223ca2f591b5a3 (patch)
treeda09d02bcbadc61b599aec98163333718c2701a4
parent4a16310443002ae8cca946d94775ca38172a7885 (diff)
parentce6e014cf07ba03327e9b5b5f348aa3deeb0fdbe (diff)
downloadrtic-d51aaf3ad3ffb2314f8885515e223ca2f591b5a3.tar.gz
rtic-d51aaf3ad3ffb2314f8885515e223ca2f591b5a3.tar.zst
rtic-d51aaf3ad3ffb2314f8885515e223ca2f591b5a3.zip
Merge #584
584: mq/minor corrections r=korken89 a=mareq Co-authored-by: Mareq Balint <mareq@balint.eu>
-rw-r--r--book/en/src/by-example/resources.md2
-rw-r--r--book/en/src/by-example/software_tasks.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/book/en/src/by-example/resources.md b/book/en/src/by-example/resources.md
index 9f2c6c57..0b69c4db 100644
--- a/book/en/src/by-example/resources.md
+++ b/book/en/src/by-example/resources.md
@@ -6,7 +6,7 @@ storage and safe accesses without the use of `unsafe` code.
RTIC resources are visible only to functions declared within the `#[app]` module and the framework
gives the user complete control (on a per-task basis) over resource accessibility.
-Declaration of system-wide resources are by annotating **two** `struct`s within the `#[app]` module
+Declaration of system-wide resources is done by annotating **two** `struct`s within the `#[app]` module
with the attribute `#[local]` and `#[shared]`.
Each field in these structures corresponds to a different resource (identified by field name).
The difference between these two sets of resources will be covered below.
diff --git a/book/en/src/by-example/software_tasks.md b/book/en/src/by-example/software_tasks.md
index 370792f8..f244ca68 100644
--- a/book/en/src/by-example/software_tasks.md
+++ b/book/en/src/by-example/software_tasks.md
@@ -10,7 +10,7 @@ bound interrupt vector.
These free interrupts used as dispatchers are interrupt vectors not used by hardware tasks.
The `#[task]` attribute used on a function declare it as a software tasks.
-The static method `task_name::spawn()` spawn (start) a software task and
+The static method `task_name::spawn()` spawns (starts) a software task and
given that there are no higher priority tasks running the task will start executing directly.
A list of “free” and usable interrupts allows the framework to dispatch software tasks.