Merge branch 'feature/update_esp32c6_to_v4.0.0.0' into 'master'

feat: Updated esp32-c6 version to v4.0.0.0 and core version to 3fe3806c See merge request application/esp-at!1497
espressif · Dec 29, 2023 · 89040be · 89040be
2 parents 7bf8775 + 0de3064
commit 89040be
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ The AT command firmware allows for rapid integration by providing:
 
 - ESP32-C6 Series
   - **Preferred recommended chip for using ESP-AT on**
-  - The first version of ESP-AT firmware (v4.0.0.0) is planned to be released in December 2023.
+  - Recommended released version: [v4.0.0.0](https://github.com/espressif/esp-at/releases/tag/v4.0.0.0)
 
 - ESP32 Series
   - Recommended released version: [v3.2.0.0](https://github.com/espressif/esp-at/releases/tag/v3.2.0.0)
@@ -98,7 +98,7 @@ esp-at 作为由 Espressif Systems (@[espressif](https://github.com/espressif/))
 
 - ESP32-C6 系列
   - **ESP-AT 首选推荐芯片**
-  - 计划在 2023 年 12 月发布首版 ESP-AT 固件（v4.0.0.0）
+  - 推荐使用的发布版本：[v4.0.0.0](https://github.com/espressif/esp-at/releases/tag/v4.0.0.0)
 
 - ESP32 系列
   - 推荐使用的发布版本：[v3.2.0.0](https://github.com/espressif/esp-at/releases/tag/v3.2.0.0)

diff --git a/components/at/lib/VERSION b/components/at/lib/VERSION
@@ -1,4 +1,4 @@
-ESP32:   e434e4d
-ESP32C3: e434e4d
-ESP32C2: e434e4d
-ESP32C6: e434e4d
+ESP32:   3fe3806
+ESP32C3: 3fe3806
+ESP32C2: 3fe3806
+ESP32C6: 3fe3806
diff --git a/components/at/lib/libesp32_at_core.a b/components/at/lib/libesp32_at_core.a
diff --git a/components/at/lib/libesp32_at_core_silence.a b/components/at/lib/libesp32_at_core_silence.a
diff --git a/components/at/lib/libesp32c2_at_core.a b/components/at/lib/libesp32c2_at_core.a
diff --git a/components/at/lib/libesp32c2_at_core_silence.a b/components/at/lib/libesp32c2_at_core_silence.a
diff --git a/components/at/lib/libesp32c3_at_core.a b/components/at/lib/libesp32c3_at_core.a
diff --git a/components/at/lib/libesp32c3_at_core_silence.a b/components/at/lib/libesp32c3_at_core_silence.a
diff --git a/components/at/lib/libesp32c6_at_core.a b/components/at/lib/libesp32c6_at_core.a
diff --git a/components/at/lib/libesp32c6_at_core_silence.a b/components/at/lib/libesp32c6_at_core_silence.a
diff --git a/docs/_static/js/at_versions.js b/docs/_static/js/at_versions.js
@@ -6,6 +6,9 @@ var DOCUMENTATION_VERSIONS = {
         // latest
         { name: "latest", has_targets: true, supported_targets: [ "esp32", "esp32c2", "esp32c3", "esp32c6"] },
 
+        // v4.0.0.0
+        { name: "release-v4.0.0.0", has_targets: true, supported_targets: [ "esp32", "esp32c2", "esp32c3", "esp32c6" ] },
+
         // v3.2.0.0
         { name: "release-v3.2.0.0", has_targets: true, supported_targets: [ "esp32", "esp32c2", "esp32c3", "esp32c6" ] },
 

diff --git a/docs/en/AT_Binary_Lists/ESP32-C6_AT_binaries.rst b/docs/en/AT_Binary_Lists/ESP32-C6_AT_binaries.rst
@@ -3,4 +3,16 @@ Released Firmware
 
 :link_to_translation:`zh_CN:[中文]`
 
-- The first version of ESP-AT firmware (v4.0.0.0) is planned to be released in December 2023.
+It is recommended to use the lastest version of firmware. Currently, Espressif only releases AT firmware for the following {IDF_TARGET_NAME} series of modules. 
+
+.. note::
+  If there is no released firmware for your module, you can either use the firmware for the module that has the same hardware configuration as yours (see :doc:`../Compile_and_Develop/esp-at_firmware_differences` for which module has the same configuration), or if you need to modify the following configurations, you can generate a new firmware for your module by modifying the released firmware using the :doc:`../Compile_and_Develop/tools_at_py`.
+
+  * :ref:`at-py-modify-uart`
+  * :ref:`at-py-modify-wifi`
+  * :ref:`at-py-modify-pki`
+
+ESP32-C6 4MB Series
+^^^^^^^^^^^^^^^^^^^
+
+- v4.0.0.0 `ESP32-C6-4MB-AT-V4.0.0.0.zip <https://dl.espressif.com/esp-at/firmwares/esp32c6/ESP32-C6-4MB-AT-V4.0.0.0.zip>`__ (Recommended)
diff --git a/docs/zh_CN/AT_Binary_Lists/ESP32-C6_AT_binaries.rst b/docs/zh_CN/AT_Binary_Lists/ESP32-C6_AT_binaries.rst
@@ -3,4 +3,16 @@
 
 :link_to_translation:`en:[English]`
 
-- 计划在 2023 年 12 月发布首版 ESP-AT 固件 (v4.0.0.0)
+推荐下载最新版本的固件。目前，乐鑫只发布了以下 {IDF_TARGET_NAME} 系列模组的 AT 固件。
+
+.. note::
+  如果您的模组没有发布的固件，可以使用相同硬件配置的模组的固件（点击 :doc:`../Compile_and_Develop/esp-at_firmware_differences` 查看与您的模组硬件配置相同的固件），或者如果您需要修改下面的配置，则可以通过 :doc:`../Compile_and_Develop/tools_at_py` 修改发布的固件，为您的模组生成新的固件。
+
+  * :ref:`at-py-modify-uart`
+  * :ref:`at-py-modify-wifi`
+  * :ref:`at-py-modify-pki`
+
+ESP32-C6 4MB 系列
+^^^^^^^^^^^^^^^^^^^^^^
+
+- v4.0.0.0 `ESP32-C6-4MB-AT-V4.0.0.0.zip <https://dl.espressif.com/esp-at/firmwares/esp32c6/ESP32-C6-4MB-AT-V4.0.0.0.zip>`__ （推荐）
diff --git a/module_config/module_esp32c6_default/sdkconfig.defaults b/module_config/module_esp32c6_default/sdkconfig.defaults
@@ -147,7 +147,7 @@ CONFIG_AT_OTA_SERVER_PORT=80
 CONFIG_AT_OTA_TOKEN_KEY="dd93253c287f725de50d4071a05dd28b72056ca7"
 CONFIG_AT_OTA_SSL_TOKEN_KEY="dd93253c287f725de50d4071a05dd28b72056ca7"
 CONFIG_AT_SOCKET_MAX_CONN_NUM=5
-CONFIG_ESP_AT_FW_VERSION="v4.0.0.0-dev"
+CONFIG_ESP_AT_FW_VERSION="v4.0.0.0"
 
 # Wear Levelling
 CONFIG_WL_SECTOR_SIZE_512=y

diff --git a/module_config/module_esp32c6_default/sdkconfig_silence.defaults b/module_config/module_esp32c6_default/sdkconfig_silence.defaults
@@ -151,7 +151,7 @@ CONFIG_AT_OTA_SERVER_PORT=80
 CONFIG_AT_OTA_TOKEN_KEY="dd93253c287f725de50d4071a05dd28b72056ca7"
 CONFIG_AT_OTA_SSL_TOKEN_KEY="dd93253c287f725de50d4071a05dd28b72056ca7"
 CONFIG_AT_SOCKET_MAX_CONN_NUM=5
-CONFIG_ESP_AT_FW_VERSION="v4.0.0.0-dev"
+CONFIG_ESP_AT_FW_VERSION="v4.0.0.0"
 
 # Wear Levelling
 CONFIG_WL_SECTOR_SIZE_512=y