From 7a9d02a18b00633b2981b055e95635b41a91701b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Br=C3=A9livet?= Date: Tue, 17 Mar 2020 14:03:03 +0100 Subject: [PATCH 1/2] esp_mqtt: add option to configure mqtt task priority. Merges https://github.com/espressif/esp-idf/pull/4947 --- components/mqtt/Kconfig | 17 ++++++++++++++++- components/mqtt/esp-mqtt | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/components/mqtt/Kconfig b/components/mqtt/Kconfig index 624b28673f..d1661e5a11 100644 --- a/components/mqtt/Kconfig +++ b/components/mqtt/Kconfig @@ -91,7 +91,22 @@ choice MQTT_TASK_CORE_SELECTION bool "Core 0" config MQTT_USE_CORE_1 bool "Core 1" - endchoice +endchoice + +config MQTT_DISABLE_API_LOCKS + bool "Disable API locks" + default n + depends on MQTT_USE_CUSTOM_CONFIG + help + Default config employs API locks to protect internal structures. It is possible to disable + these locks if the user code doesn't access MQTT API from multiple concurrent tasks + +config MQTT_TASK_PRIORITY + int "MQTT task priority" + default 5 + depends on MQTT_USE_CUSTOM_CONFIG + help + MQTT task priority. Higher number denotes higher priority. config MQTT_CUSTOM_OUTBOX bool "Enable custom outbox implementation" diff --git a/components/mqtt/esp-mqtt b/components/mqtt/esp-mqtt index 86fc8b7584..d8e2081332 160000 --- a/components/mqtt/esp-mqtt +++ b/components/mqtt/esp-mqtt @@ -1 +1 @@ -Subproject commit 86fc8b7584f7f3aebf422843d84a26655e485fbe +Subproject commit d8e20813326cb6c9fe0303fc5ba1813ccca53065 From 13c40b53d1180f528aaf8541b5bdc9f8eb79abb8 Mon Sep 17 00:00:00 2001 From: David Cermak Date: Tue, 28 Apr 2020 16:30:28 +0200 Subject: [PATCH 2/2] mqtt: clenaup logs and docs, esp_mqtt_abort_connection race condition esp_mqtt_abort_connection: Fixed an issue which could result in a race condition and subsequent crash esp_mqtt: Change an error print to use ESP_LOGE instead of ESP_LOGI Move Sending MQTT connect message log from Info to Debug level docs: Makes clear that publish API could block Change the message printed after MQTT connection failure --- components/mqtt/esp-mqtt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/mqtt/esp-mqtt b/components/mqtt/esp-mqtt index d8e2081332..6bc94add89 160000 --- a/components/mqtt/esp-mqtt +++ b/components/mqtt/esp-mqtt @@ -1 +1 @@ -Subproject commit d8e20813326cb6c9fe0303fc5ba1813ccca53065 +Subproject commit 6bc94add892437d0fd50f26bfabe78c646648c13