IDF release/v4.4 5e6cffbb14

Author: me-no-dev

platform.txt

@@ -322,7 +322,7 @@
         "UNITY_INCLUDE_CONFIG_H",
         "WITH_POSIX",
         "_GNU_SOURCE",
-        ("IDF_VER", '\\"v4.4.1-238-gae0e3e2e2a\\"'),
+        ("IDF_VER", '\\"v4.4.1-262-g5e6cffbb14\\"'),
         "ESP_PLATFORM",
         "_POSIX_READER_WRITER_LOCKS",
         "ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32.py

@@ -316,7 +316,7 @@
         "UNITY_INCLUDE_CONFIG_H",
         "WITH_POSIX",
         "_GNU_SOURCE",
-        ("IDF_VER", '\\"v4.4.1-238-gae0e3e2e2a\\"'),
+        ("IDF_VER", '\\"v4.4.1-262-g5e6cffbb14\\"'),
         "ESP_PLATFORM",
         "_POSIX_READER_WRITER_LOCKS",
         "ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32c3.py

@@ -304,7 +304,7 @@
         "UNITY_INCLUDE_CONFIG_H",
         "WITH_POSIX",
         "_GNU_SOURCE",
-        ("IDF_VER", '\\"v4.4.1-238-gae0e3e2e2a\\"'),
+        ("IDF_VER", '\\"v4.4.1-262-g5e6cffbb14\\"'),
         "ESP_PLATFORM",
         "_POSIX_READER_WRITER_LOCKS",
         "ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32s2.py

@@ -321,7 +321,7 @@
         "UNITY_INCLUDE_CONFIG_H",
         "WITH_POSIX",
         "_GNU_SOURCE",
-        ("IDF_VER", '\\"v4.4.1-238-gae0e3e2e2a\\"'),
+        ("IDF_VER", '\\"v4.4.1-262-g5e6cffbb14\\"'),
         "ESP_PLATFORM",
         "_POSIX_READER_WRITER_LOCKS",
         "ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32s3.py

@@ -347,6 +347,7 @@ typedef union {
     struct read_rmt_name_param {
         esp_bt_status_t stat;                  /*!< read Remote Name status */
         uint8_t rmt_name[ESP_BT_GAP_MAX_BDNAME_LEN + 1]; /*!< Remote device name */
+        esp_bd_addr_t bda;                     /*!< remote bluetooth device address*/
     } read_rmt_name;                        /*!< read Remote Name parameter struct */
 
     /**

tools/sdk/esp32/include/bt/host/bluedroid/api/include/api/esp_gap_bt_api.h

@@ -917,6 +917,20 @@ esp_err_t esp_rmaker_system_service_enable(esp_rmaker_system_serv_config_t *conf
  */
 bool esp_rmaker_local_ctrl_service_started(void);
 
+/**
+ * Enable Default RainMaker OTA Firmware Upgrade
+ *
+ * This enables the default recommended RainMaker OTA Firmware Upgrade, which is
+ * "Using the Topics", which allows performing OTA from Dashboard.
+ * This OTA can be triggered by Admin Users only.
+ * On Public RainMaker deployment, for nodes using "Self Claiming", since there
+ * is no associated admin user, the Primary user will automatically become the admin
+ * and can perform OTA from dashboard.
+ *
+ * @return ESP_OK on success
+ * @return error on failure
+ */
+esp_err_t esp_rmaker_ota_enable_default(void);
 #ifdef __cplusplus
 }
 #endif

tools/sdk/esp32/include/esp_rainmaker/include/esp_rmaker_core.h

@@ -174,7 +174,7 @@ int json_gen_end_array(json_gen_str_t *jstr);
  * is passed to json_gen_str_start(). Else, buffer will be flushed out and new data
  * added after that
  */
-int json_gen_push_object(json_gen_str_t *jstr, char *name);
+int json_gen_push_object(json_gen_str_t *jstr, const char *name);
 
 /** Pop a named JSON object
  *
@@ -208,7 +208,7 @@ int json_gen_pop_object(json_gen_str_t *jstr);
  * is passed to json_gen_str_start(). Else, buffer will be flushed out and new data
  * added after that.
  */
-int json_gen_push_object_str(json_gen_str_t *jstr, char *name, char *object_str);
+int json_gen_push_object_str(json_gen_str_t *jstr, const char *name, const char *object_str);
 
 /** Push a named JSON array
  *
@@ -223,7 +223,7 @@ int json_gen_push_object_str(json_gen_str_t *jstr, char *name, char *object_str)
  * is passed to json_gen_str_start(). Else, buffer will be flushed out and new data
  * added after that
  */
-int json_gen_push_array(json_gen_str_t *jstr, char *name);
+int json_gen_push_array(json_gen_str_t *jstr, const char *name);
 
 /** Pop a named JSON array
  *
@@ -257,7 +257,7 @@ int json_gen_pop_array(json_gen_str_t *jstr);
  * is passed to json_gen_str_start(). Else, buffer will be flushed out and new data
  * added after that.
  */
-int json_gen_push_array_str(json_gen_str_t *jstr, char *name, char *array_str);
+int json_gen_push_array_str(json_gen_str_t *jstr, const char *name, const char *array_str);
 
 /** Add a boolean element to an object
  *
@@ -276,7 +276,7 @@ int json_gen_push_array_str(json_gen_str_t *jstr, char *name, char *array_str);
  * is passed to json_gen_str_start(). Else, buffer will be flushed out and new data
  * added after that
  */
-int json_gen_obj_set_bool(json_gen_str_t *jstr, char *name, bool val);
+int json_gen_obj_set_bool(json_gen_str_t *jstr, const char *name, bool val);
 
 /** Add an integer element to an object
  *
@@ -295,7 +295,7 @@ int json_gen_obj_set_bool(json_gen_str_t *jstr, char *name, bool val);
  * is passed to json_gen_str_start(). Else, buffer will be flushed out and new data
  * added after that
  */
-int json_gen_obj_set_int(json_gen_str_t *jstr, char *name, int val);
+int json_gen_obj_set_int(json_gen_str_t *jstr, const char *name, int val);
 
 /** Add a float element to an object
  *
@@ -314,7 +314,7 @@ int json_gen_obj_set_int(json_gen_str_t *jstr, char *name, int val);
  * is passed to json_gen_str_start(). Else, buffer will be flushed out and new data
  * added after that
  */
-int json_gen_obj_set_float(json_gen_str_t *jstr, char *name, float val);
+int json_gen_obj_set_float(json_gen_str_t *jstr, const char *name, float val);
 
 /** Add a string element to an object
  *
@@ -333,7 +333,7 @@ int json_gen_obj_set_float(json_gen_str_t *jstr, char *name, float val);
  * is passed to json_gen_str_start(). Else, buffer will be flushed out and new data
  * added after that
  */
-int json_gen_obj_set_string(json_gen_str_t *jstr, char *name, char *val);
+int json_gen_obj_set_string(json_gen_str_t *jstr, const char *name, const char *val);
 
 /** Add a NULL element to an object
  *
@@ -351,7 +351,7 @@ int json_gen_obj_set_string(json_gen_str_t *jstr, char *name, char *val);
  * is passed to json_gen_str_start(). Else, buffer will be flushed out and new data
  * added after that
  */
-int json_gen_obj_set_null(json_gen_str_t *jstr, char *name);
+int json_gen_obj_set_null(json_gen_str_t *jstr, const char *name);
 
 /** Add a boolean element to an array
  *
@@ -415,7 +415,7 @@ int json_gen_arr_set_float(json_gen_str_t *jstr, float val);
  * is passed to json_gen_str_start(). Else, buffer will be flushed out and new data
  * added after that
  */
-int json_gen_arr_set_string(json_gen_str_t *jstr, char *val);
+int json_gen_arr_set_string(json_gen_str_t *jstr, const char *val);
 
 /** Add a NULL element to an array
  *
@@ -452,7 +452,7 @@ int json_gen_arr_set_null(json_gen_str_t *jstr);
  * is passed to json_gen_str_start(). Else, buffer will be flushed out and new data
  * added after that
  */
-int json_gen_obj_start_long_string(json_gen_str_t *jstr, char *name, char *val);
+int json_gen_obj_start_long_string(json_gen_str_t *jstr, const char *name, const char *val);
 
 /** Start a Long string in an array
  *
@@ -473,7 +473,7 @@ int json_gen_obj_start_long_string(json_gen_str_t *jstr, char *name, char *val);
  * is passed to json_gen_str_start(). Else, buffer will be flushed out and new data
  * added after that
  */
-int json_gen_arr_start_long_string(json_gen_str_t *jstr, char *val);
+int json_gen_arr_start_long_string(json_gen_str_t *jstr, const char *val);
 
 /** Add to a JSON Long string
  *
@@ -489,7 +489,7 @@ int json_gen_arr_start_long_string(json_gen_str_t *jstr, char *val);
  * is passed to json_gen_str_start(). Else, buffer will be flushed out and new data
  * added after that
  */
-int json_gen_add_to_long_string(json_gen_str_t *jstr, char *val);
+int json_gen_add_to_long_string(json_gen_str_t *jstr, const char *val);
 
 /** End a JSON Long string
  *

tools/sdk/esp32/include/json_generator/upstream/json_generator.h

@@ -16,6 +16,7 @@
 #ifndef _JSON_PARSER_H_
 #define _JSON_PARSER_H_
 
+#define JSMN_PARENT_LINKS
 #define JSMN_HEADER
 #include <jsmn/jsmn.h>
 #include <stdint.h>
@@ -34,29 +35,31 @@ typedef jsmntok_t json_tok_t;
 
 typedef struct {
 	json_parser_t parser;
-	char *js;
+	const char *js;
 	json_tok_t *tokens;
 	json_tok_t *cur;
 	int num_tokens;
 } jparse_ctx_t;
 
-int json_parse_start(jparse_ctx_t *jctx, char *js, int len);
+int json_parse_start(jparse_ctx_t *jctx, const char *js, int len);
 int json_parse_end(jparse_ctx_t *jctx);
+int json_parse_start_static(jparse_ctx_t *jctx, const char *js, int len, json_tok_t *buffer_tokens, int buffer_tokens_max_count);
+int json_parse_end_static(jparse_ctx_t *jctx);
 
-int json_obj_get_array(jparse_ctx_t *jctx, char *name, int *num_elem);
+int json_obj_get_array(jparse_ctx_t *jctx, const char *name, int *num_elem);
 int json_obj_leave_array(jparse_ctx_t *jctx);
-int json_obj_get_object(jparse_ctx_t *jctx, char *name);
+int json_obj_get_object(jparse_ctx_t *jctx, const char *name);
 int json_obj_leave_object(jparse_ctx_t *jctx);
-int json_obj_get_bool(jparse_ctx_t *jctx, char *name, bool *val);
-int json_obj_get_int(jparse_ctx_t *jctx, char *name, int *val);
-int json_obj_get_int64(jparse_ctx_t *jctx, char *name, int64_t *val);
-int json_obj_get_float(jparse_ctx_t *jctx, char *name, float *val);
-int json_obj_get_string(jparse_ctx_t *jctx, char *name, char *val, int size);
-int json_obj_get_strlen(jparse_ctx_t *jctx, char *name, int *strlen);
-int json_obj_get_object_str(jparse_ctx_t *jctx, char *name, char *val, int size);
-int json_obj_get_object_strlen(jparse_ctx_t *jctx, char *name, int *strlen);
-int json_obj_get_array_str(jparse_ctx_t *jctx, char *name, char *val, int size);
-int json_obj_get_array_strlen(jparse_ctx_t *jctx, char *name, int *strlen);
+int json_obj_get_bool(jparse_ctx_t *jctx, const char *name, bool *val);
+int json_obj_get_int(jparse_ctx_t *jctx, const char *name, int *val);
+int json_obj_get_int64(jparse_ctx_t *jctx, const char *name, int64_t *val);
+int json_obj_get_float(jparse_ctx_t *jctx, const char *name, float *val);
+int json_obj_get_string(jparse_ctx_t *jctx, const char *name, char *val, int size);
+int json_obj_get_strlen(jparse_ctx_t *jctx, const char *name, int *strlen);
+int json_obj_get_object_str(jparse_ctx_t *jctx, const char *name, char *val, int size);
+int json_obj_get_object_strlen(jparse_ctx_t *jctx, const char *name, int *strlen);
+int json_obj_get_array_str(jparse_ctx_t *jctx, const char *name, char *val, int size);
+int json_obj_get_array_strlen(jparse_ctx_t *jctx, const char *name, int *strlen);
 
 int json_arr_get_array(jparse_ctx_t *jctx, uint32_t index);
 int json_arr_leave_array(jparse_ctx_t *jctx);
@@ -74,3 +77,4 @@ int json_arr_get_strlen(jparse_ctx_t *jctx, uint32_t index, int *strlen);
 #endif
 
 #endif /* _JSON_PARSER_H_ */
+

tools/sdk/esp32/include/json_parser/upstream/include/json_parser.h

@@ -1,21 +1,14 @@
-// Copyright 2017-2019 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 
 #ifndef _ESP_CRT_BUNDLE_H_
 #define _ESP_CRT_BUNDLE_H_
 
+#include "esp_err.h"
 #include "mbedtls/ssl.h"
 
 #ifdef __cplusplus
@@ -52,13 +45,19 @@ void esp_crt_bundle_detach(mbedtls_ssl_config *conf);
 /**
  * @brief      Set the default certificate bundle used for verification
  *
- * Overrides the default certificate bundle. In most use cases the bundle should be
+ * Overrides the default certificate bundle only in case of successful initialization. In most use cases the bundle should be
  * set through menuconfig. The bundle needs to be sorted by subject name since binary search is
  * used to find certificates.
  *
  * @param[in]  x509_bundle     A pointer to the certificate bundle.
+ *
+ * @param[in]  bundle_size     Size of the certificate bundle in bytes.
+ *
+ * @return
+ *             - ESP_OK  if adding certificates was successful.
+ *             - Other   if an error occured or an action must be taken by the calling process.
  */
-void esp_crt_bundle_set(const uint8_t *x509_bundle);
+esp_err_t esp_crt_bundle_set(const uint8_t *x509_bundle, size_t bundle_size);
 
 
 #ifdef __cplusplus