Merge branch 'master' into feat/nand_flash_bdl_support

RathiSonika · web-flow · commit eab79c227a1b · 2025-11-14T08:45:52.000+01:00
diff --git a/cbor/CMakeLists.txt b/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
diff --git a/cbor/examples/cbor/main/cbor_example_main.c b/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";
 
diff --git a/cbor/idf_component.yml b/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:
diff --git a/cbor/port/include/cbor.h b/cbor/port/include/cbor.h

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