Skip to content

Commit 0a97776

Browse files
authored
Merge branch 'main' into rtos
2 parents 98494bb + 648f629 commit 0a97776

File tree

6 files changed

+11
-12
lines changed

6 files changed

+11
-12
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ jobs:
4646
target: ${{ secrets.PRODUCTION_TARGET }}
4747
source: "book/"
4848
strip_components: 1 # remove the book prefix, it's already being placed in /projects/rust/book
49-
overwrite: true
49+
rm: true

src/application-development/configuration.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Configuration
22

3-
The [`esp-config`][esp-config] crate provides a way to manage additional configuration settings that don't fit into cargo features, for `esp-*` crates.
3+
The [`esp-config`][esp-config] crate provides a way to manage additional configuration settings that don't fit into Cargo features, for `esp-*` crates.
44

55
## Finding Available Configuration
66

7-
The full list of available options can be found in the [documentation] of the crate you are interested. For example, these are [esp-hal's configuration options] for the ESP32-C6.
7+
The full list of available options can be found in the [documentation] of the crate you are interested. For example, these are [`esp-hal`'s configuration options][esp-hal-config] for the ESP32-C6.
88

99
## Usage
1010

11-
While creating your project, you may need to configure some additional advanced parameters, for example, place a peripheral in RAM for better performance or change the size of RX/TX queue in some crate. In order to do so you will need to configure some settings provided by the `esp-config`.
11+
While creating your project, you may need to configure some additional advanced parameters, for example, place a peripheral in RAM for better performance or change the size of RX/TX queue in some crate. In order to do so you will need to configure some settings provided by the `esp-config`.
1212

1313
You are free to do this in two ways:
1414

@@ -31,7 +31,7 @@ Depending on your application, you may find yourself wanting to support differen
3131

3232
* A baseline `.cargo/config.toml` which has your typical build modifying flags (Cargo will _always_ read and respect this file, regardless of other `--config`'s passed)
3333
* A config file for each configuration in `.cargo/`
34-
* (**Recommended**) A Cargo [alias] to build with the given config, for example `run-config-a = "run --config=./.cargo/config_a.toml --release"`, but for simple cases you can pass `--config` on the CLI.
34+
* (**Recommended**) A Cargo [alias] to build with the given config, for example `run-config-a = "run --config=./.cargo/config_a.toml --release"`, but for simple cases you can pass `--config` on the CLI.
3535

3636
Checkout [this example repo] for a more comprehensive look at multi-config projects.
3737

@@ -43,6 +43,6 @@ You may also want to define certain configuration options in your project. To do
4343
[esp-config]: https://crates.io/crates/esp-config
4444
[Defining Configuration Options]: https://github.com/esp-rs/esp-hal/tree/main/esp-config#defining-configuration-options
4545
<!-- TODO, can we get latest to work here instead of 1.0.0-rc.0? -->
46-
[esp-hal's configuration options]: https://docs.espressif.com/projects/rust/esp-hal/1.0.0-rc.0/esp32c6/esp_hal/index.html#additional-configuration
46+
[esp-hal-config]: https://docs.espressif.com/projects/rust/esp-hal/1.0.0-rc.0/esp32c6/esp_hal/index.html#additional-configuration
4747
[this example repo]: https://github.com/bjoernQ/esp-hal-multiconfig-example/tree/main
48-
[alias]: https://doc.rust-lang.org/cargo/reference/config.html#alias
48+
[alias]: https://doc.rust-lang.org/cargo/reference/config.html#alias

src/application-development/ota.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
Over The Air Updates (OTA), is the ability to update an application _without_ the need of production flashing tools. OTA is heavily reliant on a bootloader to handle the switching, replacement and rollback of OTA images (firmware updates). For every bootloader we support, we have a bootloader support crate, as we only support the ESP-IDF bootloader right now we only have the [`esp-bootloader-esp-idf`] crate.
44

5-
We have a [small OTA example] in the esp-hal repository. This example is basic, but shows the building blocks to get OTA functionality working. Be sure to check out the documentation, as this example also provides the instructions to create an OTA binary using `espflash`.
5+
We have a [small OTA example] in the `esp-hal` repository. This example is basic, but shows the building blocks to get OTA functionality working. Be sure to check out the documentation, as this example also provides the instructions to create an OTA binary using `espflash`.
66

77

88
[`esp-bootloader-esp-idf`]: https://github.com/esp-rs/esp-hal/blob/main/esp-bootloader-esp-idf
9-
[docs]: https://docs.espressif.com/projects/rust/esp-bootloader-esp-idf/latest
10-
[small OTA example]: https://github.com/esp-rs/esp-hal/tree/main/examples/ota
9+
[small OTA example]: https://github.com/esp-rs/esp-hal/tree/main/examples/ota
-12 KB
Loading

src/conclusion.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ We hope this book has prepared you for building real-world applications using Es
44

55
We're excited to see what you create, be sure to add it to the [awesome-esp-rust] list or use this list for inspiration.
66

7-
If you're keen to contribute to esp-hal or the ancillary crates directly, checkout [our developer contribution documentation].
7+
If you're keen to contribute to `esp-hal` or the ancillary crates directly, checkout [our developer contribution documentation].
88

99

1010
[our developer contribution documentation]: https://github.com/esp-rs/esp-hal/tree/main/documentation

src/introduction/hardware-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ We won't go into the details or differences between the two architectures here.
1616
1717
Feel free to refer to the [Technical Documentation][espressif-docs] for more information about the different SoCs.
1818

19-
> ⚠️ **Note**: The ESP8266 is not supported by esp-hal.
19+
> ⚠️ **Note**: The ESP8266 is not supported by `esp-hal`.
2020
>
2121
> However, the ESP32-C2 (ESP8684) and ESP32-C3 (ESP8685) are supported. Notably, the ESP32-C3 is pin-compatible with the ESP8266, making it a suitable drop-in replacement.
2222

0 commit comments

Comments
 (0)