forked from espressif/esp-idf
Merge branch 'update/esp-mqtt' into 'master'
mqtt: [Update mqtt_client] - Set state on stoping; Add error code to Subscribed event See merge request espressif/esp-idf!20922
This commit is contained in:
@@ -8,6 +8,6 @@ idf_component_register(SRCS "${srcs}"
|
|||||||
INCLUDE_DIRS esp-mqtt/include
|
INCLUDE_DIRS esp-mqtt/include
|
||||||
PRIV_INCLUDE_DIRS "esp-mqtt/lib/include"
|
PRIV_INCLUDE_DIRS "esp-mqtt/lib/include"
|
||||||
REQUIRES esp_event tcp_transport
|
REQUIRES esp_event tcp_transport
|
||||||
PRIV_REQUIRES esp_timer http_parser esp_hw_support
|
PRIV_REQUIRES esp_timer http_parser esp_hw_support heap
|
||||||
)
|
)
|
||||||
target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")
|
target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")
|
||||||
|
@@ -124,6 +124,13 @@ menu "ESP-MQTT Configurations"
|
|||||||
help
|
help
|
||||||
MQTT task priority. Higher number denotes higher priority.
|
MQTT task priority. Higher number denotes higher priority.
|
||||||
|
|
||||||
|
config MQTT_EVENT_QUEUE_SIZE
|
||||||
|
int "Number of queued events."
|
||||||
|
default 1
|
||||||
|
depends on MQTT_USE_CUSTOM_CONFIG
|
||||||
|
help
|
||||||
|
A value higher than 1 enables multiple queued events.
|
||||||
|
|
||||||
config MQTT_TASK_CORE_SELECTION_ENABLED
|
config MQTT_TASK_CORE_SELECTION_ENABLED
|
||||||
bool "Enable MQTT task core selection"
|
bool "Enable MQTT task core selection"
|
||||||
help
|
help
|
||||||
|
Submodule components/mqtt/esp-mqtt updated: ae53d799da...fde00340f1
@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.16)
|
|||||||
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
||||||
set(COMPONENTS main)
|
set(COMPONENTS main)
|
||||||
list(APPEND EXTRA_COMPONENT_DIRS
|
list(APPEND EXTRA_COMPONENT_DIRS
|
||||||
|
"mocks/heap/"
|
||||||
"$ENV{IDF_PATH}/tools/mocks/esp_hw_support/"
|
"$ENV{IDF_PATH}/tools/mocks/esp_hw_support/"
|
||||||
"$ENV{IDF_PATH}/tools/mocks/freertos/"
|
"$ENV{IDF_PATH}/tools/mocks/freertos/"
|
||||||
"$ENV{IDF_PATH}/tools/mocks/esp_timer/"
|
"$ENV{IDF_PATH}/tools/mocks/esp_timer/"
|
||||||
|
4
components/mqtt/host_test/mocks/heap/CMakeLists.txt
Normal file
4
components/mqtt/host_test/mocks/heap/CMakeLists.txt
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
idf_component_get_property(original_heap_dir heap COMPONENT_OVERRIDEN_DIR)
|
||||||
|
|
||||||
|
idf_component_register(SRCS heap_mock.c
|
||||||
|
INCLUDE_DIRS "${original_heap_dir}/include")
|
16
components/mqtt/host_test/mocks/heap/heap_mock.c
Normal file
16
components/mqtt/host_test/mocks/heap/heap_mock.c
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
|
*/
|
||||||
|
#include "esp_heap_caps.h"
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void *heap_caps_calloc(size_t n, size_t size, uint32_t caps) {
|
||||||
|
(void)caps;
|
||||||
|
return calloc(n, size);
|
||||||
|
|
||||||
|
}
|
Reference in New Issue
Block a user