Merge branch 'master' into fix/nand_flash_not_working_with_esp32p4

Author: RathiSonika

.build-test-rules.yml

@@ -24,6 +24,11 @@ esp_encrypted_img/examples/pre_encrypted_ota:
     - if: IDF_TARGET in ["esp32", "esp32s3"]
       reason: ESP32 runs RSA OTA encryption test, ESP32-S3 runs ECC OTA encryption test
 
+esp_ext_part_tables/test_apps:
+  enable:
+    - if: ((IDF_VERSION_MAJOR == 5 and IDF_VERSION_MINOR >= 1) or (IDF_VERSION_MAJOR >= 6)) and IDF_TARGET == "linux"
+      reason: Host test is enough
+
 sh2lib/examples/http2_request:
   enable:
     - if: IDF_VERSION_MAJOR > 4 and INCLUDE_DEFAULT == 1

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -32,13 +32,16 @@ body:
         - eigen
         - esp_daylight
         - esp_delta_ota
+        - esp_cli_commands
         - esp_encrypted_img
         - esp_flash_dispatcher
+        - esp_ext_part_tables
         - esp_gcov
         - esp_isotp
         - esp_jpeg
         - esp_lcd_qemu_rgb
         - esp_schedule
+        - esp_cli
         - esp_serial_slave_link
         - expat
         - fmt

.github/workflows/upload_component.yml

@@ -34,15 +34,18 @@ jobs:
             dhara
             eigen
             esp_daylight
+            esp_cli_commands
             esp_delta_ota
             esp_encrypted_img
             esp_flash_dispatcher
+            esp_ext_part_tables
             esp_gcov
             esp_isotp
             esp_lcd_qemu_rgb
             esp_linenoise
             esp_jpeg
             esp_schedule
+            esp_cli
             esp_serial_slave_link
             expat
             fmt

.idf_build_apps.toml

@@ -8,12 +8,15 @@ manifest_file = [
     "ccomp_timer/.build-test-rules.yml",
     "coremark/.build-test-rules.yml",
     "esp_daylight/.build-test-rules.yml",
+    "esp_cli_commands/.build-test-rules.yml",
     "esp_encrypted_img/.build-test-rules.yml",
     "esp_flash_dispatcher/.build-test-rules.yml",
     "esp_gcov/.build-test-rules.yml",
     "esp_jpeg/.build-test-rules.yml",
     "esp_linenoise/.build-test-rules.yml",
     "esp_schedule/.build-test-rules.yml",
+    "esp_cli/.build-test-rules.yml",
+    "esp_ext_part_tables/.build-test-rules.yml",
     "esp_serial_slave_link/.build-test-rules.yml",
     "expat/.build-test-rules.yml",
     "iqmath/.build-test-rules.yml",

cbor/CMakeLists.txt

@@ -10,8 +10,7 @@ idf_component_register(SRCS "tinycbor/src/cborencoder_close_container_checked.c"
                             "tinycbor/src/cbortojson.c"
                             "tinycbor/src/cborvalidation.c"
                             "tinycbor/src/open_memstream.c"
-                    INCLUDE_DIRS "port/include"
-                    PRIV_INCLUDE_DIRS "tinycbor/src")
+                    INCLUDE_DIRS "tinycbor/src")
 
 # for open_memstream.c
 set_source_files_properties(tinycbor/src/open_memstream.c PROPERTIES

cbor/examples/cbor/main/cbor_example_main.c

@@ -15,6 +15,7 @@
 #include <stdlib.h>
 #include "esp_log.h"
 #include "cbor.h"
+#include "cborjson.h"
 
 static const char *TAG = "example";
 

cbor/idf_component.yml

@@ -1,4 +1,4 @@
-version: "0.6.1~3"
+version: "0.6.1~4"
 description: "CBOR: Concise Binary Object Representation Library"
 url: https://github.com/espressif/idf-extra-components/tree/master/cbor
 dependencies:

cbor/port/include/cbor.h

@@ -0,0 +1,15 @@
+esp_cli/host_test:
+  enable:
+    - if: IDF_TARGET == "linux"
+      reason: "Sufficient to test on Linux target"
+  disable:
+    - if: IDF_VERSION_MAJOR <= 5 and IDF_VERSION_MINOR <= 4
+      reason: "those versions of esp-idf do not support eventfd for linux target"
+
+esp_cli/test_apps:
+  enable:
+    - if: IDF_TARGET == "esp32s3"
+      reason: "Need support for USB Serial JTAG"
+  disable:
+    - if: IDF_VERSION_MAJOR <= 5 and IDF_VERSION_MINOR <= 3
+      reason: "esp_vfs_fs_ops_t not available"

esp_cli/.build-test-rules.yml

@@ -0,0 +1,9 @@
+idf_build_get_property(target IDF_TARGET)
+
+set(srcs "src/esp_cli.c")
+
+idf_component_register(
+                    SRCS ${srcs}
+                    INCLUDE_DIRS include
+                    REQUIRES esp_linenoise esp_cli_commands
+                    WHOLE_ARCHIVE)