IDF release/v3.3 b65a37795

Author: me-no-dev

tools/sdk/include/config/sdkconfig.h

@@ -397,5 +397,5 @@
 #define CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG 1
 #define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
 #define CONFIG_FATFS_API_ENCODING_ANSI_OEM 1
-#define CONFIG_ARDUINO_IDF_COMMIT "6aaddf972"
+#define CONFIG_ARDUINO_IDF_COMMIT "b65a37795"
 #define CONFIG_ARDUINO_IDF_BRANCH "release/v3.3"

tools/sdk/include/mqtt/mqtt_client.h

@@ -12,11 +12,7 @@
 #include <string.h>
 #include "esp_err.h"
 
-#include "mqtt_config.h"
 #include "esp_event.h"
-#if CONFIG_ESP_TLS_USE_DS_PERIPHERAL
-#include "rsa_sign_alt.h"
-#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -61,6 +57,13 @@ typedef enum {
                                         and current data offset updating.
                                          */
     MQTT_EVENT_BEFORE_CONNECT,     /*!< The event occurs before connecting */
+    MQTT_EVENT_DELETED,            /*!< Notification on delete of one message from the internal outbox,
+                                        if the message couldn't have been sent and acknowledged before expiring
+                                        defined in OUTBOX_EXPIRED_TIMEOUT_MS.
+                                        (events are not posted upon deletion of successfully acknowledged messages)
+                                        - This event id is posted only if MQTT_REPORT_DELETED_MESSAGES==1
+                                        - Additional context: msg_id (id of the deleted message).
+                                        */
 } esp_mqtt_event_id_t;
 
 /**
@@ -306,8 +309,10 @@ int esp_mqtt_client_unsubscribe(esp_mqtt_client_handle_t client, const char *top
  * - This API might block for several seconds, either due to network timeout (10s)
  *   or if publishing payloads longer than internal buffer (due to message
  *   fragmentation)
- * - Client doesn't have to be connected to send publish message
- *   (although it would drop all qos=0 messages, qos>1 messages would be enqueued)
+ * - Client doesn't have to be connected for this API to work, enqueueing the messages
+ *   with qos>1 (returning -1 for all the qos=0 messages if disconnected).
+ *   If MQTT_SKIP_PUBLISH_IF_DISCONNECTED is enabled, this API will not attempt to publish
+ *   when the client is not connected and will always return -1.
  * - It is thread safe, please refer to `esp_mqtt_client_subscribe` for details
  *
  * @param client    mqtt client handle
@@ -322,6 +327,27 @@ int esp_mqtt_client_unsubscribe(esp_mqtt_client_handle_t client, const char *top
  */
 int esp_mqtt_client_publish(esp_mqtt_client_handle_t client, const char *topic, const char *data, int len, int qos, int retain);
 
+/**
+ * @brief Enqueue a message to the outbox, to be sent later. Typically used for messages with qos>0, but could
+ * be also used for qos=0 messages if store=true.
+ *
+ * This API generates and stores the publish message into the internal outbox and the actual sending
+ * to the network is performed in the mqtt-task context (in contrast to the esp_mqtt_client_publish()
+ * which sends the publish message immediately in the user task's context).
+ * Thus, it could be used as a non blocking version of esp_mqtt_client_publish().
+ *
+ * @param client    mqtt client handle
+ * @param topic     topic string
+ * @param data      payload string (set to NULL, sending empty payload message)
+ * @param len       data length, if set to 0, length is calculated from payload string
+ * @param qos       qos of publish message
+ * @param retain    retain flag
+ * @param store     if true, all messages are enqueued; otherwise only qos1 and qos 2 are enqueued
+ *
+ * @return message_id if queued successfully, -1 otherwise
+ */
+int esp_mqtt_client_enqueue(esp_mqtt_client_handle_t client, const char *topic, const char *data, int len, int qos, int retain, bool store);
+
 /**
  * @brief Destroys the client handle
  *

tools/sdk/include/mqtt/mqtt_config.h

@@ -124,6 +124,7 @@ PROVIDE ( jd_prepare = 0x40060fa8 );
 PROVIDE ( ke_env = 0x3ffb93cc );
 PROVIDE ( ke_handler_search = 0x4001a430 );
 PROVIDE ( ke_task_env = 0x3ffb81d4 );
+PROVIDE ( ke_event_env = 0x3ffb81a4 );
 PROVIDE ( lb_default_handler = 0x3ff982b8 );
 PROVIDE ( lb_default_state_tab_p_get = 0x4001c198 );
 PROVIDE ( lb_env = 0x3ffb9424 );
@@ -1632,5 +1633,22 @@ PROVIDE ( prbs_64bytes = 0x3ff98992 );
 PROVIDE ( nvds_env = 0x3ffb8364 );
 PROVIDE ( nvds_magic_number = 0x3ff9912a );
 PROVIDE ( TASK_DESC_LLD = 0x3ff98b58 );
+PROVIDE ( ld_acl_clk_isr = 0x40030cf8 );
+PROVIDE ( ld_acl_evt_canceled_cbk = 0x40033944 );
+PROVIDE ( ld_acl_evt_stop_cbk = 0x40033870 );
+PROVIDE ( ld_acl_evt_start_cbk = 0x40030ab0 );
+PROVIDE ( ld_acl_test_mode_update = 0x40032050 );
+PROVIDE ( ld_acl_resched = 0x40033814 );
+PROVIDE ( ld_acl_rx_isr = 0x40033aa8 );
+PROVIDE ( lc_acl_disc_ind_handler = 0x4002f270 );
+PROVIDE ( lc_pca_sscan_start_req_handler = 0x40029b34 );
+PROVIDE ( lmp_feats_req_ext_handler = 0x4002ccb0 );
+PROVIDE ( ld_pscan_em_init = 0x4003e5e8 );
+PROVIDE ( ld_acl_rsw_start = 0x40032e90 );
+PROVIDE ( ld_acl_sniff_enter = 0x40031244 );
+PROVIDE ( ld_acl_sniff_trans_sched = 0x40033734 );
+PROVIDE ( lc_pwr_decr_ind_handler = 0x4002859c );
+PROVIDE ( lc_pwr_incr_ind_handler = 0x400284a8 );
+PROVIDE ( lc_pwr_max_ind_handler = 0x40028690 );
 /* Above are static data, but can be used, not generated by script >>>>> btdm data */
 

tools/sdk/include/mqtt/mqtt_supported_features.h

@@ -221,7 +221,6 @@ CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
 CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
 CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM=100
 CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
-CONFIG_BTDM_COEX_BT_OPTIONS=
 CONFIG_BLUEDROID_ENABLED=y
 CONFIG_BLUEDROID_PINNED_TO_CORE_0=y
 CONFIG_BLUEDROID_PINNED_TO_CORE_1=
@@ -445,6 +444,7 @@ CONFIG_ESP32_XTAL_FREQ=0
 CONFIG_DISABLE_BASIC_ROM_CONSOLE=
 CONFIG_ESP_TIMER_PROFILING=
 CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS=
+CONFIG_ESP32_COMPATIBLE_PRE_V3_1_BOOTLOADERS=
 CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
 CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5