Merge branch 'main' into feat/i2s-move

Author: AstrickHarren

esp-alloc/CHANGELOG.md

@@ -11,12 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added chip-selection features (#4023)
 - New default feature (`compat`) enables implementations for `malloc`, `free`, `calloc`, `realloc` and others (#3890, #4043)
-- `ESP_ALLOC_CONFIG_HEAP_ALGORITHM` to select the global heap algorithm (#4130)
+- `ESP_ALLOC_CONFIG_HEAP_ALGORITHM` to select the global heap algorithm (LLFF, TLSF) (#4130, #4316)
+- Added option to use TLSF as the heap allocator, implemented by the `rlsf` crate (#4130, #4316)
 
 ### Changed
 
 - Make stats structs fields public (#3828)
-- The default heap allocator is now TLSF, implemented by the `rlsf` crate (#3950)
 - Fixed documentation to use `ram(reclaimed)` instead of a no longer valid linker_section syntax. (#4245)
 
 ### Fixed

esp-alloc/esp_config.yml

@@ -5,7 +5,7 @@ options:
     description: "The heap algorithm to use. TLSF offers higher performance
       and bounded allocation time, but uses more memory."
     default:
-      - value: '"TLSF"'
+      - value: '"LLFF"'
     constraints:
       - type:
           validator: enumeration

esp-backtrace/Cargo.toml

@@ -66,6 +66,10 @@ esp32s3 = ["esp-println?/esp32s3", "esp-metadata-generated/esp32s3", "semihostin
 println = ["dep:esp-println"]
 
 ## Use `defmt`
+##
+## Please note that `defmt` does _not_ provide MSRV guarantees with releases, and as such we are
+## not able to make any MSRV guarantees when this feature is enabled. For more information refer to
+## the MSRV section of `defmt`'s README: https://github.com/knurling-rs/defmt?tab=readme-ov-file#msrv
 defmt = ["dep:defmt"]
 
 print-float-registers = [] # TODO support esp32p4

esp-backtrace/README.md

@@ -6,43 +6,14 @@
 ![Crates.io](https://img.shields.io/crates/l/esp-backtrace?labelColor=1C2C2E&style=flat-square)
 [![Matrix](https://img.shields.io/matrix/esp-rs:matrix.org?label=join%20matrix&labelColor=1C2C2E&color=BEC5C9&logo=matrix&style=flat-square)](https://matrix.to/#/#esp-rs:matrix.org)
 
-Supports the ESP32, ESP32-C2/C3/C6, ESP32-H2, ESP32-P4, and ESP32-S2/S3. Optional exception and panic handlers are included, both of which can be enabled via their respective features.
+Supports the ESP32, ESP32-C2/C3/C6, ESP32-H2, ESP32-P4, and ESP32-S2/S3. Optional panic handler is included, which can be enabled via its respective feature.
 
 Please note that when targeting a RISC-V device, you **need** to force frame pointers (i.e. `"-C", "force-frame-pointers",` in your `.cargo/config.toml`); this is **not** required for Xtensa.
 
 You can get an array of backtrace addresses (currently limited to 10) via `arch::backtrace()` if
-you want to create a backtrace yourself (i.e. not using the panic or exception handler).
+you want to create a backtrace yourself (i.e. not using the panic handler).
 
-When using the panic and/or exception handler make sure to include `use esp_backtrace as _;`.
-
-## Features
-
-| Feature              | Description                                                                                                        |
-| -------------------- | ------------------------------------------------------------------------------------------------------------------ |
-| esp32                | Target ESP32                                                                                                       |
-| esp32c2              | Target ESP32-C2                                                                                                    |
-| esp32c3              | Target ESP32-C3                                                                                                    |
-| esp32c6              | Target ESP32-C6                                                                                                    |
-| esp32h2              | Target ESP32-H2                                                                                                    |
-| esp32p4              | Target ESP32-P4                                                                                                    |
-| esp32s2              | Target ESP32-S2                                                                                                    |
-| esp32s3              | Target ESP32-S3                                                                                                    |
-| panic-handler        | Include a panic handler, will add `esp-println` as a dependency                                                    |
-| exception-handler    | Include an exception handler, will add `esp-println` as a dependency                                               |
-| println              | Use `esp-println` to print messages                                                                                |
-| defmt                | Use `defmt` logging to print messages\* (check [example](https://github.com/playfulFence/backtrace-defmt-example)) |
-| colors               | Print messages in red\*                                                                                            |
-| halt-cores           | Halt both CPUs on ESP32 / ESP32-S3 instead of doing a `loop {}` in case of a panic or exception                    |
-| semihosting          | Call `semihosting::process::abort()` on panic.                                                                     |
-| custom-halt          | Invoke the extern function `custom_halt()` instead of doing a `loop {}` in case of a panic or exception            |
-| custom-pre-backtrace | Invoke the extern function `custom_pre_backtrace()` before handling a panic or exception                           |
-
-\* _only used for panic and exception handlers_
-
-### `defmt` Feature
-
-Please note that `defmt` does _not_ provide MSRV guarantees with releases, and as such we are not able to make any MSRV guarantees when this feature is enabled. For more information refer to the MSRV section of `defmt`'s README:
-https://github.com/knurling-rs/defmt?tab=readme-ov-file#msrv
+When using the panic handler make sure to include `use esp_backtrace as _;`.
 
 ## Minimum Supported Rust Version (MSRV)