Skip to content

Commit

Permalink
Merge branch 'docs/update_front_page_for_esp32p4' into 'master'
Browse files Browse the repository at this point in the history
docs: update front page for esp32p4

See merge request espressif/esp-idf!26479
  • Loading branch information
Lindazhxy committed Oct 18, 2023
2 parents fdb4e0e + c1c4424 commit 1685dbc
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 23 deletions.
19 changes: 0 additions & 19 deletions docs/docs_not_updated/esp32p4.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
languages.rst
contribute/esp-idf-tests-with-pytest.rst
contribute/contributor-agreement.rst
contribute/documenting-code.rst
contribute/creating-examples.rst
contribute/style-guide.rst
contribute/copyright-guide.rst
contribute/install-pre-commit-hook.rst
contribute/index.rst
api-guides/core_dump_internals.rst
api-guides/performance/speed.rst
api-guides/performance/size.rst
Expand Down Expand Up @@ -67,13 +58,7 @@ api-guides/openthread.rst
api-guides/fatal-errors.rst
api-guides/memory-types.rst
api-guides/general-notes.rst
third-party-tools/platformio.rst
COPYRIGHT.rst
libraries-and-frameworks/libs-frameworks.rst
libraries-and-frameworks/index.rst
libraries-and-frameworks/cloud-frameworks.rst
conf.py
versions.rst
api-reference/api-conventions.rst
api-reference/template.rst
api-reference/provisioning/protocomm.rst
Expand Down Expand Up @@ -198,8 +183,6 @@ security/flash-encryption.rst
security/security.rst
security/esp32p4_log.inc
security/index.rst
about.rst
resources.rst
migration-guides/release-5.x/5.2/protocols.rst
migration-guides/release-5.x/5.2/index.rst
migration-guides/release-5.x/5.2/peripherals.rst
Expand All @@ -214,6 +197,4 @@ get-started/flashing-troubleshooting.rst
get-started/windows-start-project.rst
get-started/index.rst
get-started/windows-setup-update.rst
404.rst
index.rst
hw-reference/index.rst
4 changes: 2 additions & 2 deletions docs/en/COPYRIGHT.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Copyrights and Licenses
Software Copyrights
===================

All original source code in this repository is Copyright (C) 2015-2022 Espressif Systems. This source code is licensed under the Apache License 2.0 as described in the file LICENSE.
All original source code in this repository is Copyright (C) 2015-2023 Espressif Systems. This source code is licensed under the Apache License 2.0 as described in the file LICENSE.

Additional third party copyrighted code is included under the following licenses.

Expand Down Expand Up @@ -75,7 +75,7 @@ Documentation
ROM Source Code Copyrights
==========================

ESP32, ESP32-S and ESP32-C Series SoCs mask ROM hardware includes binaries compiled from portions of the following third party software:
Espressif SoCs mask ROM hardware includes binaries compiled from portions of the following third party software:

* :component:`Newlib <newlib>`, licensed under the BSD License and is Copyright of various parties, as described in :component_file:`COPYING.NEWLIB <newlib/COPYING.NEWLIB>`.

Expand Down
6 changes: 6 additions & 0 deletions docs/en/about.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ About

The {IDF_TARGET_NAME} is a Bluetooth Low Energy and 802.15.4 Thread/Zigbee combo SoC, which integrates a 32-bit RISC-V RV32IMAC single-core processor.

.. only:: esp32p4

This is documentation of `ESP-IDF <https://github.com/espressif/esp-idf>`_, the framework to develop applications for {IDF_TARGET_NAME}.

The {IDF_TARGET_NAME} is a high-performance MCU that supports large internal memory and has powerful image and voice processing capabilities. The MCU consists of a High Performance (HP) system and a Low Power (LP) system. The HP system contains a RISC-V dual-core CPU running up to 400 MHz and rich peripherals, while the LP system contains a low-power RISC-V single-core CPU running up to 40 MHz and various peripherals optimized for low-power applications.

.. figure:: ../_static/about-doc.png
:align: center
:alt: Espressif IoT Integrated Development Framework
Expand Down
2 changes: 1 addition & 1 deletion docs/en/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ESP-IDF Programming Guide

The function API documentation is excluded from the preview. Add docs_full label to the MR to generate the complete documentation.

This is the documentation for Espressif IoT Development Framework (`esp-idf <https://github.com/espressif/esp-idf>`_). ESP-IDF is the official development framework for the `ESP32, ESP32-S, ESP32-C and ESP32-H Series SoCs <https://www.espressif.com/en/products/socs>`_.
This is the documentation for Espressif IoT Development Framework (`esp-idf <https://github.com/espressif/esp-idf>`_). ESP-IDF is the official development framework for the `ESP32, ESP32-S, ESP32-C, ESP32-H and ESP32-P Series SoCs <https://www.espressif.com/en/products/socs>`_.

.. only:: html

Expand Down
6 changes: 6 additions & 0 deletions docs/zh_CN/about.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@

{IDF_TARGET_NAME} 是一款支持 802.15.4 Thread/Zigbee 和低功耗蓝牙的芯片,搭载 RISC-V RV32IMAC 32 位单核处理器。

.. only:: esp32p4

本指南为 {IDF_TARGET_NAME} 官方应用开发框架 `ESP-IDF <https://github.com/espressif/esp-idf>`_ 的配套文档。

{IDF_TARGET_NAME} 是一款高性能 MCU,支持超大片上内存,具有强大的图像和语音处理能力。该款 MCU 包含一个高性能 (HP) 系统和一个低功耗 (LP) 系统。HP 系统由 RISC-V 双核处理器驱动,主频高达 400 MHz,并包含丰富的外设;LP 系统由 RISC-V 单核处理器驱动,主频高达 40 MHz,其外设针对低功耗应用进行了优化。

.. figure:: ../_static/about-doc.png
:align: center
:alt: 乐鑫物联网综合开发框架
Expand Down
2 changes: 1 addition & 1 deletion docs/zh_CN/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ESP-IDF 编程指南

快速预览中不包括 API 函数文档。如需生成完整的文档,请在 MR 中添加 docs_full 标签。

这里是乐鑫 IoT 开发框架 (`esp-idf <https://github.com/espressif/esp-idf>`_) 的文档中心。ESP-IDF 是 `ESP32、ESP32-S ESP32-C 和 ESP32-H <https://www.espressif.com/en/products/socs>`_ 系列芯片的官方开发框架。
这里是乐鑫 IoT 开发框架 (`esp-idf <https://github.com/espressif/esp-idf>`_) 的文档中心。ESP-IDF 是 `ESP32、ESP32-S ESP32-C、ESP32-H 和 ESP32-P <https://www.espressif.com/en/products/socs>`_ 系列芯片的官方开发框架。

.. only:: html

Expand Down

0 comments on commit 1685dbc

Please sign in to comment.