Skip to content

Commit

Permalink
mqtt: Set state on stoping; Add error code to Subscribed event
Browse files Browse the repository at this point in the history
* Update submodule: git log --oneline ae53d799da294f03ef65c33e88fa33648e638134..fde00340f19b9f5ae81fff02ccfa9926f0e33687

Detailed description of the changes:
* Fix the default configuration for event queue
  - See merge request espressif/esp-mqtt!153
  - See commit espressif/esp-mqtt@fb42588
* Adds missing header.
  - See merge request espressif/esp-mqtt!152
  - See commit espressif/esp-mqtt@8a60057
* Moves state change when stopping the client
  - See merge request espressif/esp-mqtt!150
  - Closes espressif/esp-mqtt#239
  - See commit espressif/esp-mqtt@3738fcd
* Adds error code to MQTT_EVENT_SUBSCRIBED in case of failure
  - See merge request espressif/esp-mqtt!143
  - - Closes espressif/esp-mqtt#233
  - See commit espressif/esp-mqtt@9af5c26
* Adds debug information on sending dup messages
  - See merge request espressif/esp-mqtt!145
  - See commit espressif/esp-mqtt@47b3f9b
* ci: Fix qemu build
  - See merge request espressif/esp-mqtt!147
  - See commit espressif/esp-mqtt@68e8c4f
* ci: Build and Test QEMU on v5.0
  - See merge request espressif/esp-mqtt!142
  - See commit espressif/esp-mqtt@9db9ee7
* client: Add support for user events
  - See merge request espressif/esp-mqtt!140
  - Closes espressif/esp-mqtt#230
  - See commit espressif/esp-mqtt@97503cc
* Adds unregister event API
  - See merge request espressif/esp-mqtt!139
  - Closes #9194
  - See commit espressif/esp-mqtt@a9a9fe7
  • Loading branch information
euripedesrocha committed Dec 13, 2022
1 parent c01f71c commit 4ec9d4b
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 2 deletions.
2 changes: 1 addition & 1 deletion components/mqtt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS esp-mqtt/include
PRIV_INCLUDE_DIRS "esp-mqtt/lib/include"
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")
7 changes: 7 additions & 0 deletions components/mqtt/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,13 @@ menu "ESP-MQTT Configurations"
help
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
bool "Enable MQTT task core selection"
help
Expand Down
2 changes: 1 addition & 1 deletion components/mqtt/esp-mqtt
1 change: 1 addition & 0 deletions components/mqtt/host_test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.16)
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
set(COMPONENTS main)
list(APPEND EXTRA_COMPONENT_DIRS
"mocks/heap/"
"$ENV{IDF_PATH}/tools/mocks/esp_hw_support/"
"$ENV{IDF_PATH}/tools/mocks/freertos/"
"$ENV{IDF_PATH}/tools/mocks/esp_timer/"
Expand Down
4 changes: 4 additions & 0 deletions components/mqtt/host_test/mocks/heap/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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 changes: 16 additions & 0 deletions components/mqtt/host_test/mocks/heap/heap_mock.c
Original file line number Diff line number Diff line change
@@ -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);

}

0 comments on commit 4ec9d4b

Please sign in to comment.