feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/module_logging_tag_lower_case' into 'master'

Browse Source 
mqtt: unite supported components tags under common structure

See merge request espressif/esp-idf!22418
This commit is contained in:
Rocha Euripedes
2023-09-05 14:06:33 +08:00
parent 8a4df2d5a7 6a42266795
commit 10c21f704c
13 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
examples/protocols/mqtt/ssl/main/app_main.c
View File

@@ -24,7 +24,7 @@
#include "esp_ota_ops.h" #include "esp_ota_ops.h"
#include <sys/param.h> #include <sys/param.h>
static const char *TAG = "MQTTS_EXAMPLE"; static const char *TAG = "mqtts_example";
#if CONFIG_BROKER_CERTIFICATE_OVERRIDDEN == 1 #if CONFIG_BROKER_CERTIFICATE_OVERRIDDEN == 1
@@ -145,11 +145,11 @@ void app_main(void)
esp_log_level_set("*", ESP_LOG_INFO); esp_log_level_set("*", ESP_LOG_INFO);
esp_log_level_set("esp-tls", ESP_LOG_VERBOSE); esp_log_level_set("esp-tls", ESP_LOG_VERBOSE);
esp_log_level_set("MQTT_CLIENT", ESP_LOG_VERBOSE); esp_log_level_set("mqtt_client", ESP_LOG_VERBOSE);
esp_log_level_set("MQTT_EXAMPLE", ESP_LOG_VERBOSE); esp_log_level_set("mqtt_example", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT_BASE", ESP_LOG_VERBOSE); esp_log_level_set("transport_base", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT", ESP_LOG_VERBOSE); esp_log_level_set("transport", ESP_LOG_VERBOSE);
esp_log_level_set("OUTBOX", ESP_LOG_VERBOSE); esp_log_level_set("outbox", ESP_LOG_VERBOSE);
ESP_ERROR_CHECK(nvs_flash_init()); ESP_ERROR_CHECK(nvs_flash_init());
ESP_ERROR_CHECK(esp_netif_init()); ESP_ERROR_CHECK(esp_netif_init());

10
examples/protocols/mqtt/ssl_ds/main/app_main.c
View File

@@ -30,7 +30,7 @@
#include "rsa_sign_alt.h" #include "rsa_sign_alt.h"
#include "esp_secure_cert_read.h" #include "esp_secure_cert_read.h"
static const char *TAG = "MQTTS_EXAMPLE"; static const char *TAG = "mqtts_example";
extern const uint8_t server_cert_pem_start[] asm("_binary_mosquitto_org_crt_start"); extern const uint8_t server_cert_pem_start[] asm("_binary_mosquitto_org_crt_start");
extern const uint8_t server_cert_pem_end[] asm("_binary_mosquitto_org_crt_end"); extern const uint8_t server_cert_pem_end[] asm("_binary_mosquitto_org_crt_end");
@@ -137,10 +137,10 @@ void app_main(void)
ESP_LOGI(TAG, "[APP] IDF version: %s", esp_get_idf_version()); ESP_LOGI(TAG, "[APP] IDF version: %s", esp_get_idf_version());
esp_log_level_set("*", ESP_LOG_INFO); esp_log_level_set("*", ESP_LOG_INFO);
esp_log_level_set("MQTT_CLIENT", ESP_LOG_VERBOSE); esp_log_level_set("mqtt_client", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT_BASE", ESP_LOG_VERBOSE); esp_log_level_set("transport_base", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT", ESP_LOG_VERBOSE); esp_log_level_set("transport", ESP_LOG_VERBOSE);
esp_log_level_set("OUTBOX", ESP_LOG_VERBOSE); esp_log_level_set("outbox", ESP_LOG_VERBOSE);
ESP_ERROR_CHECK(nvs_flash_init()); ESP_ERROR_CHECK(nvs_flash_init());
ESP_ERROR_CHECK(esp_netif_init()); ESP_ERROR_CHECK(esp_netif_init());

10
examples/protocols/mqtt/ssl_mutual_auth/main/app_main.c
View File

@@ -29,7 +29,7 @@
#include "esp_log.h" #include "esp_log.h"
#include "mqtt_client.h" #include "mqtt_client.h"
static const char *TAG = "MQTTS_EXAMPLE"; static const char *TAG = "mqtts_example";
extern const uint8_t client_cert_pem_start[] asm("_binary_client_crt_start"); extern const uint8_t client_cert_pem_start[] asm("_binary_client_crt_start");
extern const uint8_t client_cert_pem_end[] asm("_binary_client_crt_end"); extern const uint8_t client_cert_pem_end[] asm("_binary_client_crt_end");
@@ -136,10 +136,10 @@ void app_main(void)
ESP_LOGI(TAG, "[APP] IDF version: %s", esp_get_idf_version()); ESP_LOGI(TAG, "[APP] IDF version: %s", esp_get_idf_version());
esp_log_level_set("*", ESP_LOG_INFO); esp_log_level_set("*", ESP_LOG_INFO);
esp_log_level_set("MQTT_CLIENT", ESP_LOG_VERBOSE); esp_log_level_set("mqtt_client", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT_BASE", ESP_LOG_VERBOSE); esp_log_level_set("transport_base", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT", ESP_LOG_VERBOSE); esp_log_level_set("transport", ESP_LOG_VERBOSE);
esp_log_level_set("OUTBOX", ESP_LOG_VERBOSE); esp_log_level_set("outbox", ESP_LOG_VERBOSE);
ESP_ERROR_CHECK(nvs_flash_init()); ESP_ERROR_CHECK(nvs_flash_init());
ESP_ERROR_CHECK(esp_netif_init()); ESP_ERROR_CHECK(esp_netif_init());

10
examples/protocols/mqtt/ssl_psk/main/app_main.c
View File

@@ -36,7 +36,7 @@
*/ */
#define EXAMPLE_BROKER_URI "mqtts://192.168.0.2" #define EXAMPLE_BROKER_URI "mqtts://192.168.0.2"
static const char *TAG = "MQTTS_EXAMPLE"; static const char *TAG = "mqtts_example";
/* /*
* Define psk key and hint as defined in mqtt broker * Define psk key and hint as defined in mqtt broker
@@ -131,11 +131,11 @@ void app_main(void)
ESP_LOGI(TAG, "[APP] IDF version: %s", esp_get_idf_version()); ESP_LOGI(TAG, "[APP] IDF version: %s", esp_get_idf_version());
esp_log_level_set("*", ESP_LOG_INFO); esp_log_level_set("*", ESP_LOG_INFO);
esp_log_level_set("MQTT_CLIENT", ESP_LOG_VERBOSE); esp_log_level_set("mqtt_client", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT_BASE", ESP_LOG_VERBOSE); esp_log_level_set("transport_base", ESP_LOG_VERBOSE);
esp_log_level_set("esp-tls", ESP_LOG_VERBOSE); esp_log_level_set("esp-tls", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT", ESP_LOG_VERBOSE); esp_log_level_set("transport", ESP_LOG_VERBOSE);
esp_log_level_set("OUTBOX", ESP_LOG_VERBOSE); esp_log_level_set("outbox", ESP_LOG_VERBOSE);
ESP_ERROR_CHECK(nvs_flash_init()); ESP_ERROR_CHECK(nvs_flash_init());
ESP_ERROR_CHECK(esp_netif_init()); ESP_ERROR_CHECK(esp_netif_init());

8
examples/protocols/mqtt/tcp/main/app_main.c
View File

@@ -30,7 +30,7 @@
#include "esp_log.h" #include "esp_log.h"
#include "mqtt_client.h" #include "mqtt_client.h"
static const char *TAG = "MQTT_EXAMPLE"; static const char *TAG = "mqtt_example";
static void log_error_if_nonzero(const char *message, int error_code) static void log_error_if_nonzero(const char *message, int error_code)
@@ -151,10 +151,10 @@ void app_main(void)
esp_log_level_set("*", ESP_LOG_INFO); esp_log_level_set("*", ESP_LOG_INFO);
esp_log_level_set("mqtt_client", ESP_LOG_VERBOSE); esp_log_level_set("mqtt_client", ESP_LOG_VERBOSE);
esp_log_level_set("MQTT_EXAMPLE", ESP_LOG_VERBOSE); esp_log_level_set("mqtt_example", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT_BASE", ESP_LOG_VERBOSE); esp_log_level_set("transport_base", ESP_LOG_VERBOSE);
esp_log_level_set("esp-tls", ESP_LOG_VERBOSE); esp_log_level_set("esp-tls", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT", ESP_LOG_VERBOSE); esp_log_level_set("transport", ESP_LOG_VERBOSE);
esp_log_level_set("outbox", ESP_LOG_VERBOSE); esp_log_level_set("outbox", ESP_LOG_VERBOSE);
ESP_ERROR_CHECK(nvs_flash_init()); ESP_ERROR_CHECK(nvs_flash_init());

14
examples/protocols/mqtt/ws/main/app_main.c
View File

@@ -29,7 +29,7 @@
#include "esp_log.h" #include "esp_log.h"
#include "mqtt_client.h" #include "mqtt_client.h"
static const char *TAG = "MQTTWS_EXAMPLE"; static const char *TAG = "mqttws_example";
static void log_error_if_nonzero(const char *message, int error_code) static void log_error_if_nonzero(const char *message, int error_code)
{ {
@@ -123,12 +123,12 @@ void app_main(void)
ESP_LOGI(TAG, "[APP] IDF version: %s", esp_get_idf_version()); ESP_LOGI(TAG, "[APP] IDF version: %s", esp_get_idf_version());
esp_log_level_set("*", ESP_LOG_INFO); esp_log_level_set("*", ESP_LOG_INFO);
esp_log_level_set("MQTT_CLIENT", ESP_LOG_VERBOSE); esp_log_level_set("mqtt_client", ESP_LOG_VERBOSE);
esp_log_level_set("MQTT_EXAMPLE", ESP_LOG_VERBOSE); esp_log_level_set("mqtt_example", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT_BASE", ESP_LOG_VERBOSE); esp_log_level_set("transport_base", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT_WS", ESP_LOG_VERBOSE); esp_log_level_set("transport_ws", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT", ESP_LOG_VERBOSE); esp_log_level_set("transport", ESP_LOG_VERBOSE);
esp_log_level_set("OUTBOX", ESP_LOG_VERBOSE); esp_log_level_set("outbox", ESP_LOG_VERBOSE);
ESP_ERROR_CHECK(nvs_flash_init()); ESP_ERROR_CHECK(nvs_flash_init());
ESP_ERROR_CHECK(esp_netif_init()); ESP_ERROR_CHECK(esp_netif_init());

12
examples/protocols/mqtt/wss/main/app_main.c
View File

@@ -29,7 +29,7 @@
#include "esp_log.h" #include "esp_log.h"
#include "mqtt_client.h" #include "mqtt_client.h"
static const char *TAG = "MQTTWSS_EXAMPLE"; static const char *TAG = "mqttwss_example";
#if CONFIG_BROKER_CERTIFICATE_OVERRIDDEN == 1 #if CONFIG_BROKER_CERTIFICATE_OVERRIDDEN == 1
@@ -115,11 +115,11 @@ void app_main(void)
ESP_LOGI(TAG, "[APP] IDF version: %s", esp_get_idf_version()); ESP_LOGI(TAG, "[APP] IDF version: %s", esp_get_idf_version());
esp_log_level_set("*", ESP_LOG_INFO); esp_log_level_set("*", ESP_LOG_INFO);
esp_log_level_set("MQTT_CLIENT", ESP_LOG_VERBOSE); esp_log_level_set("mqtt_client", ESP_LOG_VERBOSE);
esp_log_level_set("MQTT_EXAMPLE", ESP_LOG_VERBOSE); esp_log_level_set("mqtt_example", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT_BASE", ESP_LOG_VERBOSE); esp_log_level_set("transport_base", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT", ESP_LOG_VERBOSE); esp_log_level_set("transport", ESP_LOG_VERBOSE);
esp_log_level_set("OUTBOX", ESP_LOG_VERBOSE); esp_log_level_set("outbox", ESP_LOG_VERBOSE);
ESP_ERROR_CHECK(nvs_flash_init()); ESP_ERROR_CHECK(nvs_flash_init());
ESP_ERROR_CHECK(esp_netif_init()); ESP_ERROR_CHECK(esp_netif_init());

12
examples/protocols/mqtt5/main/app_main.c
View File

@@ -16,7 +16,7 @@
#include "esp_log.h" #include "esp_log.h"
#include "mqtt_client.h" #include "mqtt_client.h"
static const char *TAG = "MQTT5_EXAMPLE"; static const char *TAG = "mqtt5_example";
static void log_error_if_nonzero(const char *message, int error_code) static void log_error_if_nonzero(const char *message, int error_code)
{ {
@@ -269,12 +269,12 @@ void app_main(void)
ESP_LOGI(TAG, "[APP] IDF version: %s", esp_get_idf_version()); ESP_LOGI(TAG, "[APP] IDF version: %s", esp_get_idf_version());
esp_log_level_set("*", ESP_LOG_INFO); esp_log_level_set("*", ESP_LOG_INFO);
esp_log_level_set("MQTT_CLIENT", ESP_LOG_VERBOSE); esp_log_level_set("mqtt_client", ESP_LOG_VERBOSE);
esp_log_level_set("MQTT_EXAMPLE", ESP_LOG_VERBOSE); esp_log_level_set("mqtt_example", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT_BASE", ESP_LOG_VERBOSE); esp_log_level_set("transport_base", ESP_LOG_VERBOSE);
esp_log_level_set("esp-tls", ESP_LOG_VERBOSE); esp_log_level_set("esp-tls", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT", ESP_LOG_VERBOSE); esp_log_level_set("transport", ESP_LOG_VERBOSE);
esp_log_level_set("OUTBOX", ESP_LOG_VERBOSE); esp_log_level_set("outbox", ESP_LOG_VERBOSE);
ESP_ERROR_CHECK(nvs_flash_init()); ESP_ERROR_CHECK(nvs_flash_init());
ESP_ERROR_CHECK(esp_netif_init()); ESP_ERROR_CHECK(esp_netif_init());

2
examples/protocols/sockets/icmpv6_ping/main/icmpv6_ping.c
View File

@@ -19,7 +19,7 @@
#define MSG_BUFF_SIZE (256) #define MSG_BUFF_SIZE (256)
static const char *TAG = "ICMPv6_PING"; static const char *TAG = "icmpv6_ping";
/* types of ipv6 addresses to be displayed on ipv6 events */ /* types of ipv6 addresses to be displayed on ipv6 events */
static const char *s_ipv6_addr_types[] = { static const char *s_ipv6_addr_types[] = {

14
tools/test_apps/protocols/mqtt/build_test/main/mqtt_app.cpp
View File

@@ -15,7 +15,7 @@
#include "esp_log.h" #include "esp_log.h"
#include "mqtt_client.h" #include "mqtt_client.h"
static const char *TAG = "MQTT_EXAMPLE"; static const char *TAG = "mqtt_example";
static esp_err_t mqtt_event_handler_cb(esp_mqtt_event_handle_t event) static esp_err_t mqtt_event_handler_cb(esp_mqtt_event_handle_t event)
@@ -86,12 +86,12 @@ extern "C" void app_main(void)
ESP_LOGI(TAG, "[APP] IDF version: %s", esp_get_idf_version()); ESP_LOGI(TAG, "[APP] IDF version: %s", esp_get_idf_version());
esp_log_level_set("*", ESP_LOG_INFO); esp_log_level_set("*", ESP_LOG_INFO);
esp_log_level_set("MQTT_CLIENT", ESP_LOG_VERBOSE); esp_log_level_set("mqtt_client", ESP_LOG_VERBOSE);
esp_log_level_set("MQTT_EXAMPLE", ESP_LOG_VERBOSE); esp_log_level_set("mqtt_example", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT_TCP", ESP_LOG_VERBOSE); esp_log_level_set("transport_tcp", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT_SSL", ESP_LOG_VERBOSE); esp_log_level_set("transport_ssl", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT", ESP_LOG_VERBOSE); esp_log_level_set("transport", ESP_LOG_VERBOSE);
esp_log_level_set("OUTBOX", ESP_LOG_VERBOSE); esp_log_level_set("outbox", ESP_LOG_VERBOSE);
ESP_ERROR_CHECK(nvs_flash_init()); ESP_ERROR_CHECK(nvs_flash_init());
ESP_ERROR_CHECK(esp_netif_init()); ESP_ERROR_CHECK(esp_netif_init());

2
tools/test_apps/protocols/mqtt/publish_connect_test/main/connect_test.c
View File

@@ -33,7 +33,7 @@ extern const uint8_t client_pwd_key[] asm("_binary_client_pwd_key_start");
extern const uint8_t client_inv_crt[] asm("_binary_client_inv_crt_start"); extern const uint8_t client_inv_crt[] asm("_binary_client_inv_crt_start");
extern const uint8_t client_no_pwd_key[] asm("_binary_client_no_pwd_key_start"); extern const uint8_t client_no_pwd_key[] asm("_binary_client_no_pwd_key_start");
static const char *TAG = "CONNECT_TEST"; static const char *TAG = "connect_test";
static esp_mqtt_client_handle_t mqtt_client = NULL; static esp_mqtt_client_handle_t mqtt_client = NULL;
static int running_test_case = 0; static int running_test_case = 0;

10
tools/test_apps/protocols/mqtt/publish_connect_test/main/publish_connect_test.c
View File

@@ -16,7 +16,7 @@
#include "protocol_examples_common.h" #include "protocol_examples_common.h"
#include "esp_log.h" #include "esp_log.h"
static const char *TAG = "PUBLISH_CONNECT_TEST"; static const char *TAG = "publish_connect_test";
void connection_test(const char *line); void connection_test(const char *line);
void publish_test(const char *line); void publish_test(const char *line);
@@ -45,10 +45,10 @@ void app_main(void)
ESP_LOGI(TAG, "[APP] IDF version: %s", esp_get_idf_version()); ESP_LOGI(TAG, "[APP] IDF version: %s", esp_get_idf_version());
esp_log_level_set("*", ESP_LOG_INFO); esp_log_level_set("*", ESP_LOG_INFO);
esp_log_level_set("MQTT_CLIENT", ESP_LOG_VERBOSE); esp_log_level_set("mqtt_client", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT_BASE", ESP_LOG_VERBOSE); esp_log_level_set("transport_base", ESP_LOG_VERBOSE);
esp_log_level_set("TRANSPORT", ESP_LOG_VERBOSE); esp_log_level_set("transport", ESP_LOG_VERBOSE);
esp_log_level_set("OUTBOX", ESP_LOG_VERBOSE); esp_log_level_set("outbox", ESP_LOG_VERBOSE);
ESP_ERROR_CHECK(nvs_flash_init()); ESP_ERROR_CHECK(nvs_flash_init());
ESP_ERROR_CHECK(esp_netif_init()); ESP_ERROR_CHECK(esp_netif_init());

2
tools/test_apps/protocols/mqtt/publish_connect_test/main/publish_test.c
View File

@@ -19,7 +19,7 @@
#include "mqtt_client.h" #include "mqtt_client.h"
#include "sdkconfig.h" #include "sdkconfig.h"
static const char *TAG = "PUBLISH_TEST"; static const char *TAG = "publish_test";
static EventGroupHandle_t mqtt_event_group; static EventGroupHandle_t mqtt_event_group;
const static int CONNECTED_BIT = BIT0; const static int CONNECTED_BIT = BIT0;