Merge branch 'feature/enable_build_wifi_examples_esp32c6' into 'master'

examples: enable build esp32c2/esp32c6 for wifi and network examples See merge request espressif/esp-idf!21970
espressif · Jan 13, 2023 · db9586c · db9586c
2 parents b1ff550 + f4ff1b5
commit db9586c
Show file tree

Hide file tree

Showing 66 changed files with 154 additions and 333 deletions.
diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
@@ -616,7 +616,7 @@ build_examples_cmake_esp32c6:
   extends:
     - .build_cmake_template
     - .rules:build:example_test-esp32c6
-  parallel: 2
+  parallel: 4
   variables:
     IDF_TARGET: esp32c6
     TEST_DIR: examples

diff --git a/components/esp_wifi/include/esp_wifi_he_types.h b/components/esp_wifi/include/esp_wifi_he_types.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -14,6 +14,9 @@
 extern "C" {
 #endif
 
+#define FLOW_ID_ALL                  (8)
+#define BSS_MAX_COLOR                (63)
+
 /**
   * @brief Access category
   */
@@ -130,7 +133,7 @@ typedef struct {
     uint16_t he_siga2;                            /**< HE-SIGA2 */
     unsigned : 7;                                 /**< reserved */
     unsigned is_group : 1;                        /**< indicate whether the reception is a group addressed frame */
-    unsigned : 32;                                /**< reserved */
+    unsigned timestamp : 32;                      /**< timestamp. The local time when this packet is received. It is precise only if modem sleep or light sleep is not enabled. unit: microsecond */
     unsigned : 15;                                /**< reserved */
     unsigned : 15;                                /**< reserved */
     unsigned : 2;                                 /**< reserved */

diff --git a/examples/mesh/.build-test-rules.yml b/examples/mesh/.build-test-rules.yml
@@ -2,6 +2,6 @@
 
 examples/mesh:
   disable:
-    - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6"
+    - if: IDF_TARGET == "esp32c2"
       temporary: true
       reason: target(s) not supported yet
diff --git a/examples/mesh/internal_communication/README.md b/examples/mesh/internal_communication/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- |
 
 # Mesh Internal Communication Example
 

diff --git a/examples/mesh/ip_internal_network/README.md b/examples/mesh/ip_internal_network/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- |
 
 # Mesh IP Internal Networking example
 

diff --git a/examples/mesh/manual_networking/README.md b/examples/mesh/manual_networking/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- |
 
 # Mesh Manual Networking Example
 

diff --git a/examples/network/.build-test-rules.yml b/examples/network/.build-test-rules.yml
@@ -1,16 +1,10 @@
 # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
 
-examples/network/network_tests:
-  disable:
-    - if: IDF_TARGET == "esp32c2"
-      temporary: true
-      reason: target esp32c2 is not supported yet
+examples/network:
+  enable:
+    - if: INCLUDE_DEFAULT == 1
 
 examples/network/simple_sniffer:
-  disable:
-    - if: IDF_TARGET == "esp32c6"
-      temporary: true
-      reason: target esp32c6 is not supported yet
   disable_test:
     - if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3"]
       temporary: true

diff --git a/examples/network/network_tests/README.md b/examples/network/network_tests/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
 
 # Intel net test suite for LwIP network stack
 

diff --git a/examples/network/simple_sniffer/README.md b/examples/network/simple_sniffer/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
 
 # Simple Sniffer Example