mirror of
https://github.com/rtic-rs/rtic.git
synced 2024-11-29 15:04:32 +01:00
Merge #660
660: Clarify r=AfoHT a=01joja I made 3 suggested changes - `.cargo/config` -> `.cargo/config.toml`. Now extensions for vs code recognizes that it is a toml-file. - Moved a note about how to configure target in cargo.toml to by-example.md from app_init.md. - changed all occurrences of `.cargo/config` to `.cargo/config.toml` in the ru and eng version of the book. Co-authored-by: Jonas Jacobsson <01joja@gmail.com>
This commit is contained in:
commit
a79cc08380
4 changed files with 7 additions and 7 deletions
|
@ -30,3 +30,9 @@ Yields this output:
|
||||||
``` console
|
``` console
|
||||||
{{#include ../../../ci/expected/locals.run}}
|
{{#include ../../../ci/expected/locals.run}}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
> **NOTE**: You can choose target device by passing a target
|
||||||
|
> triple to cargo (e.g. `cargo run --example init --target thumbv7m-none-eabi`) or
|
||||||
|
> configure a default target in `.cargo/config.toml`.
|
||||||
|
>
|
||||||
|
> For running the examples, we use a Cortex M3 emulated in QEMU, so the target is `thumbv7m-none-eabi`.
|
|
@ -28,9 +28,3 @@ Running the example will print `init` to the console and then exit the QEMU proc
|
||||||
$ cargo run --target thumbv7m-none-eabi --example init
|
$ cargo run --target thumbv7m-none-eabi --example init
|
||||||
{{#include ../../../../ci/expected/init.run}}
|
{{#include ../../../../ci/expected/init.run}}
|
||||||
```
|
```
|
||||||
|
|
||||||
> **NOTE**: You can choose target device by passing a target
|
|
||||||
> triple to cargo (e.g. `cargo run --example init --target thumbv7m-none-eabi`) or
|
|
||||||
> configure a default target in `.cargo/config.toml`.
|
|
||||||
>
|
|
||||||
> For running the examples, we use a Cortex M3 emulated in QEMU, so the target is `thumbv7m-none-eabi`.
|
|
||||||
|
|
|
@ -78,7 +78,7 @@ $ cargo add panic-semihosting
|
||||||
5. Соберите его, загрузите в микроконтроллер и запустите.
|
5. Соберите его, загрузите в микроконтроллер и запустите.
|
||||||
|
|
||||||
``` console
|
``` console
|
||||||
$ # ПРИМЕЧАНИЕ: Я раскомментировал опцию `runner` в `.cargo/config`
|
$ # ПРИМЕЧАНИЕ: Я раскомментировал опцию `runner` в `.cargo/config.toml`
|
||||||
$ cargo run
|
$ cargo run
|
||||||
{{#include ../../../../ci/expected/init.run}}
|
{{#include ../../../../ci/expected/init.run}}
|
||||||
```
|
```
|
||||||
|
|
Loading…
Reference in a new issue