Skip to content

Commit 019bb7f

Browse files
committed
Merge branch 'docs/update_cn_translation_for_system' into 'master'
docs: Update CN translation for system.rst Closes DOC-12310, DOC-12344, DOC-12354, DOC-12367, and DOC-12385 See merge request espressif/esp-idf!41999
2 parents 4e082ef + 8d88ea8 commit 019bb7f

File tree

2 files changed

+38
-23
lines changed

2 files changed

+38
-23
lines changed

docs/en/migration-guides/release-6.x/6.0/system.rst

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ The deprecated ``soc_memory_types.h`` header file has been removed. Please inclu
5858

5959
The deprecated ``intr_types.h`` header file has been removed. Please include the replacement ``esp_intr_types.h`` instead.
6060

61-
The deprecated ``esp_private/interrupt_deprecated.h`` header file, which was available to users through the ``riscv/interrupt.h`` header, has been removed. The deprecated functions are no longer available, please use the non-deprecated versions instead.
61+
The deprecated ``esp_private/interrupt_deprecated.h`` header file, previously accessible through ``riscv/interrupt.h`` header, has been removed. The deprecated functions are no longer available; please use the non-deprecated versions instead.
6262

6363
ROM Headers
6464
-----------
@@ -136,18 +136,19 @@ The function :cpp:func:`pxTaskGetStackStart` has been deprecated. Use :cpp:func:
136136

137137
**API Added**
138138

139-
Task snapshot APIs have been made public due to their usage by external frameworks like ESP Insights. The APIs are now available through ``freertos/freertos_debug.h`` instead of the deprecated ``freertos/task_snapshot.h``.
140-
For safe usage with scheduler running, use ``vTaskSuspendAll()`` before calling snapshot functions and ``xTaskResumeAll()`` after.
139+
Task snapshot APIs have been made public to support external frameworks like ESP Insights. These APIs are now provided through ``freertos/freertos_debug.h`` instead of the deprecated ``freertos/task_snapshot.h``.
140+
141+
For safe use while the scheduler is running, use ``vTaskSuspendAll()`` before calling snapshot functions, and ``xTaskResumeAll()`` afterward.
141142

142143
**Memory Placement**
143144

144-
- To reduce IRAM usage, the default placement for most FreeRTOS functions has been changed from IRAM to Flash. Consequently, the ``CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH`` option has been removed. This change saves a significant amount of IRAM but may have a slight performance impact. For performance-critical applications, the previous behavior can be restored by enabling the new :ref:`CONFIG_FREERTOS_IN_IRAM` option.
145-
- When deciding whether to enable ``CONFIG_FREERTOS_IN_IRAM``, consider conducting performance testing to measure the actual impact on your specific use case. Performance differences between Flash and IRAM configurations can vary depending on flash cache efficiency, API usage patterns, and system load.
146-
- A baseline performance test is provided in ``components/freertos/test_apps/freertos/performance/test_freertos_api_performance.c`` that measures the execution time of commonly used FreeRTOS APIs. This test can help you evaluate the performance impact of memory placement for your target hardware and application requirements.
147-
- Task snapshot functions are automatically placed in IRAM when ``CONFIG_ESP_PANIC_HANDLER_IRAM`` is enabled, ensuring they remain accessible during panic handling
148-
- ``vTaskGetSnapshot`` is kept in IRAM unless ``CONFIG_FREERTOS_PLACE_ISR_FUNCTIONS_INTO_FLASH`` is enabled, as it's used by the Task Watchdog interrupt handler.
145+
- To reduce IRAM usage, the default placement for most FreeRTOS functions has been changed from IRAM to flash. Consequently, the ``CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH`` option has been removed. This change saves a significant amount of IRAM but may have a slight performance impact. For performance-critical applications, you can restore the previous behavior by enabling the new :ref:`CONFIG_FREERTOS_IN_IRAM` option.
146+
- Before enabling ``CONFIG_FREERTOS_IN_IRAM``, it is recommended to run performance tests to measure the actual impact on your specific use case. The performance difference between flash and IRAM configurations depends on factors such as flash cache efficiency, API usage patterns, and system load.
147+
- A baseline performance test is provided in ``components/freertos/test_apps/freertos/performance/test_freertos_api_performance.c``. This test measures the execution time of commonly used FreeRTOS APIs and can help you evaluate the effect of memory placement for your target hardware and application requirements.
148+
- Task snapshot functions are automatically placed in IRAM when ``CONFIG_ESP_PANIC_HANDLER_IRAM`` is enabled, ensuring they remain accessible during panic handling.
149+
- ``vTaskGetSnapshot`` is kept in IRAM unless ``CONFIG_FREERTOS_PLACE_ISR_FUNCTIONS_INTO_FLASH`` is enabled, as it is used by the Task Watchdog interrupt handler.
149150

150-
**Removed Configuration Options:**
151+
**Removed Configuration Options**
151152

152153
The following hidden (and always true) configuration options have been removed:
153154

@@ -180,7 +181,6 @@ ESP-Event
180181

181182
Unnecessary FreeRTOS headers have been removed from ``esp_event.h``. Code that previously depended on these implicit includes must now include the headers explicitly: ``#include "freertos/queue.h"`` and ``#include "freertos/semphr.h"`` to your files.
182183

183-
184184
Core Dump
185185
---------
186186

@@ -243,5 +243,4 @@ LibC
243243
ULP
244244
---
245245

246-
The LP-Core will now wake-up the main CPU when it encounters an exception during deep sleep. This feature is enabled by default but can be disabled via the :ref:`CONFIG_ULP_TRAP_WAKEUP` Kconfig option is this behavior is not desired.
247-
246+
The LP-Core will now wake up the main CPU when it encounters an exception during deep sleep. This feature is enabled by default but can be disabled via the :ref:`CONFIG_ULP_TRAP_WAKEUP` Kconfig option is this behavior is not desired.

docs/zh_CN/migration-guides/release-6.x/6.0/system.rst

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Xtensa 特殊寄存器头文件已更新,使用新的命名约定。旧的 ``s
5858

5959
已弃用的头文件 ``intr_types.h`` 已被移除,请改用替代头文件 ``esp_intr_types.h``。
6060

61-
已弃用的头文件 ``esp_private/interrupt_deprecated.h`` 已被移除,已弃用的函数不再可用,请改用非弃用版本。
61+
已弃用的头文件 ``esp_private/interrupt_deprecated.h`` (此前通过 ``riscv/interrupt.h`` 头文件提供)已被移除。相关已弃用的函数不再可用,请改用非弃用版本。
6262

6363
ROM 头文件
6464
-----------
@@ -136,20 +136,21 @@ FreeRTOS
136136

137137
**新增 API**
138138

139-
由于 ESP Insights 等外部框架的使用需求,任务快照 API 已重新设为公开。这些 API 现在通过 ``freertos/freertos_debug.h`` 提供,而不是已弃用的 ``freertos/task_snapshot.h``。
140-
为了在调度器运行时安全使用,请在调用快照函数前使用 ``vTaskSuspendAll()``,调用后使用 ``xTaskResumeAll()``。
139+
任务快照 API 已对外公开,以支持 ESP Insights 等外部框架。这些 API 现通过 ``freertos/freertos_debug.h`` 头文件提供,不再使用已弃用的 ``freertos/task_snapshot.h``。
140+
141+
在调度程序运行时安全使用的方案是:调用快照函数前先执行 ``vTaskSuspendAll()`` 暂停所有任务,完成后调用 ``xTaskResumeAll()`` 恢复运行。
141142

142143
**内存布局**
143144

144-
- 为了减少 IRAM 的使用,大多数 FreeRTOS 函数的默认位置已从 IRAM 更改为 flash。因此,``CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH`` 选项已被移除。这项变更可显著节省 IRAM 空间,但可能会对性能造成轻微影响。如果应用对性能有严苛要求,可通过启用新增的 :ref:`CONFIG_FREERTOS_IN_IRAM` 选项来恢复原先配置
145-
- 在决定是否启用 ``CONFIG_FREERTOS_IN_IRAM`` ,建议进行性能测试以评估对具体应用场景的实际影响。flash 和 IRAM 配置的性能差异会受 flash 缓存效率、API 调用模式和系统负载等因素影响
146-
- ``components/freertos/test_apps/freertos/performance/test_freertos_api_performance.c`` 中提供了基准性能测试,可测量常用 FreeRTOS API 的执行时间。该测试有助于根据目标硬件和应用需求评估内存布局调整带来的性能影响
147-
- 当启用 ``CONFIG_ESP_PANIC_HANDLER_IRAM`` 时,任务快照函数会自动放置在 IRAM 中,确保在恐慌处理期间仍可访问
148-
- ``vTaskGetSnapshot`` 会保持在 IRAM 中,除非启用了 ``CONFIG_FREERTOS_PLACE_ISR_FUNCTIONS_INTO_FLASH``,因为它被任务看门狗中断处理程序使用
145+
- 为了减少 IRAM 的使用,大多数 FreeRTOS 函数的默认存储位置已从 IRAM 更改为 flash。因此,``CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH`` 选项已被移除。这项变更可显著节省 IRAM 空间,但可能会对性能造成轻微影响。如果应用对性能有严苛要求,可通过启用新选项 :ref:`CONFIG_FREERTOS_IN_IRAM` 恢复原先配置
146+
- 启用 ``CONFIG_FREERTOS_IN_IRAM`` ,建议进行性能测试以评估对具体应用场景的实际影响。flash 和 IRAM 配置的性能差异取决于 flash 缓存效率、API 调用模式和系统负载等因素
147+
- ``components/freertos/test_apps/freertos/performance/test_freertos_api_performance.c`` 中提供了基准性能测试。该测试测量常用 FreeRTOS API 的执行时长,可帮助开发者根据目标硬件和应用需求评估内存布局方案带来的性能影响
148+
- 当启用 ``CONFIG_ESP_PANIC_HANDLER_IRAM`` 时,任务快照函数会自动存入 IRAM,确保在系统崩溃处理期间仍可调用。
149+
- 除非启用 ``CONFIG_FREERTOS_PLACE_ISR_FUNCTIONS_INTO_FLASH``,否则 ``vTaskGetSnapshot`` 将始终保留在 IRAM 中,因为该函数被任务看门狗中断处理程序所调用
149150

150-
**已移除的配置选项**
151+
**已移除的配置选项**
151152

152-
以下隐藏(且始终为真)的配置选项已被移除:
153+
以下隐藏(且始终启用)的配置选项已被移除:
153154

154155
- ``CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT``
155156
- ``CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH``
@@ -221,10 +222,25 @@ gcov 组件已移至独立仓库。`esp_gcov <https://components.espressif.com/c
221222
222223
**配置更改**
223224

224-
gcov 配置选项现在归类在 ``GNU Code Coverage`` 菜单下
225+
gcov 配置选项已从应用程序级别追踪菜单移至专用的 ``GNU Code Coverage`` 菜单
225226

226227
``CONFIG_APPTRACE_GCOV_ENABLE`` 选项已重命名为 ``CONFIG_ESP_GCOV_ENABLE``。
227228

228229
**头文件更改**
229230

230231
对于 gcov 功能,请改用 ``esp_gcov.h`` 头文件替代原有的 ``esp_app_trace.h``。
232+
233+
系统控制台 (STDIO)
234+
----------------------
235+
236+
``esp_vfs_cdcacm.h`` 头文件已移至新组件 ``esp_usb_cdc_romconsole`` 中。若需使用该头文件中的任何函数,现在需要显式添加对 ``esp_usb_cdc_rom_console`` 的 ``REQUIRES`` 依赖项。
237+
238+
LibC
239+
------
240+
241+
:ref:`CONFIG_COMPILER_ASSERT_NDEBUG_EVALUATE` 的默认值已改为 `n`。这意味着当设置了 ``NDEBUG`` 时,断言将不再对断言内的表达式进行求值。此更改将默认行为恢复为与 C 语言标准一致。
242+
243+
ULP
244+
---
245+
246+
LP-Core 在深度睡眠期间遇到异常时,将唤醒主 CPU。此功能默认启用,若不需要此行为,可以通过 :ref:`CONFIG_ULP_TRAP_WAKEUP` Kconfig 配置选项禁用。

0 commit comments

Comments
 (0)