Skip to content

Commit

Permalink
Merge branch 'docs/fix_spiram_mistake_v5.1' into 'release/v5.1'
Browse files Browse the repository at this point in the history
docs(heap): Fixed mistake in the heap allocator docs (v5.1)

See merge request espressif/esp-idf!29589
  • Loading branch information
ESP-Marius committed Mar 13, 2024
2 parents 1a50f08 + 0a0c74a commit 9ceabe7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions docs/en/api-guides/external-ram.rst
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ This allows any application to use the external RAM without having to rewrite th

An additional configuration item, :ref:`CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL`, can be used to set the size threshold when a single allocation should prefer external memory:

- When allocating a size less than the threshold, the allocator will try internal memory first.
- When allocating a size equal to or larger than the threshold, the allocator will try external memory first.
- When allocating a size less than or equal to the threshold, the allocator will try internal memory first.
- When allocating a size larger than the threshold, the allocator will try external memory first.

If a suitable block of preferred internal/external memory is not available, the allocator will try the other type of memory.

Expand Down
4 changes: 2 additions & 2 deletions docs/zh_CN/api-guides/external-ram.rst
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ ESP-IDF 启动过程中,片外 RAM 被映射到以 {IDF_TARGET_PSRAM_ADDR_STAR

如果某次内存分配偏向于片外存储器,您也可以使用 :ref:`CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL` 设置分配空间的大小阈值,控制分配结果:

- 如果分配的空间小于阈值,分配程序将首先选择内部存储器。
- 如果分配的空间等于或大于阈值,分配程序将首先选择外部存储器。
- 如果分配的空间小于或等于阈值,分配程序将首先选择内部存储器。
- 如果分配的空间大于阈值,分配程序将首先选择外部存储器。

如果优先考虑的内部或外部存储器中没有可用的存储块,分配程序则会选择其他类型存储。

Expand Down

0 comments on commit 9ceabe7

Please sign in to comment.