diff options
| author | Dion Dokter <[email protected]> | 2023-10-20 14:17:55 +0200 |
|---|---|---|
| committer | Dion Dokter <[email protected]> | 2023-10-20 14:17:55 +0200 |
| commit | 5b3f75dc726afaf21b6c957b88f8eeb0c9ae322c (patch) | |
| tree | c2b2920f63d83e32dd7f3f2ef18c64d73b997557 /docs/modules/ROOT/pages/basic_application.adoc | |
| parent | 6f2995cd4c70a2b6c977f553a2d5efcd8216bba7 (diff) | |
| parent | 88ada521461031b7241b09e40aa56f4e64827967 (diff) | |
Merge branch 'master' into center-align
Diffstat (limited to 'docs/modules/ROOT/pages/basic_application.adoc')
| -rw-r--r-- | docs/modules/ROOT/pages/basic_application.adoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/modules/ROOT/pages/basic_application.adoc b/docs/modules/ROOT/pages/basic_application.adoc index 3f4f16e28..73774c71b 100644 --- a/docs/modules/ROOT/pages/basic_application.adoc +++ b/docs/modules/ROOT/pages/basic_application.adoc | |||
| @@ -48,7 +48,7 @@ The `Spawner` is the way the main application spawns other tasks. The `Periphera | |||
| 48 | include::example$basic/src/main.rs[lines="22..-1"] | 48 | include::example$basic/src/main.rs[lines="22..-1"] |
| 49 | ---- | 49 | ---- |
| 50 | 50 | ||
| 51 | What happens when the `blinker` task has been spawned and main returns? Well, the main entry point is actually just like any other task, except that you can only have one and it takes some specific type arguments. The magic lies within the `#[embassy::main]` macro. The macro does the following: | 51 | What happens when the `blinker` task has been spawned and main returns? Well, the main entry point is actually just like any other task, except that you can only have one and it takes some specific type arguments. The magic lies within the `#[embassy_executor::main]` macro. The macro does the following: |
| 52 | 52 | ||
| 53 | . Creates an Embassy Executor | 53 | . Creates an Embassy Executor |
| 54 | . Initializes the microcontroller HAL to get the `Peripherals` | 54 | . Initializes the microcontroller HAL to get the `Peripherals` |