From 4624326cda77cc2d6c594dc3129d4489a7a423ce Mon Sep 17 00:00:00 2001 From: Roland Dobai Date: Thu, 9 May 2019 16:43:06 +0200 Subject: [PATCH] Rename Kconfig options (examples) --- .../mqtt/publish_test/main/Kconfig.projbuild | 18 +++++++++--------- .../mqtt/publish_test/main/publish_test.c | 16 ++++++++-------- .../protocols/mqtt/publish_test/sdkconfig.ci | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/protocols/mqtt/publish_test/main/Kconfig.projbuild b/examples/protocols/mqtt/publish_test/main/Kconfig.projbuild index 66d3cb0..8360e57 100644 --- a/examples/protocols/mqtt/publish_test/main/Kconfig.projbuild +++ b/examples/protocols/mqtt/publish_test/main/Kconfig.projbuild @@ -1,50 +1,50 @@ menu "Example Configuration" - config BROKER_SSL_URI + config EXAMPLE_BROKER_SSL_URI string "Broker SSL URL" default "mqtts://iot.eclipse.org:8883" help URL of an mqtt broker for ssl transport - config BROKER_TCP_URI + config EXAMPLE_BROKER_TCP_URI string "Broker TCP URL" default "mqtt://iot.eclipse.org:1883" help URL of an mqtt broker for tcp transport - config BROKER_WS_URI + config EXAMPLE_BROKER_WS_URI string "Broker WS URL" default "ws://iot.eclipse.org:80/ws" help URL of an mqtt broker for ws transport - config BROKER_WSS_URI + config EXAMPLE_BROKER_WSS_URI string "Broker WSS URL" default "wss://iot.eclipse.org:443/ws" help URL of an mqtt broker for wss transport - config PUBLISH_TOPIC + config EXAMPLE_PUBLISH_TOPIC string "publish topic" default "/topic/publish/esp2py" help topic to which esp32 client publishes - config SUBSCIBE_TOPIC + config EXAMPLE_SUBSCIBE_TOPIC string "subscribe topic" default "/topic/subscribe/py2esp" help topic to which esp32 client subsribes (and expects data) - config BROKER_CERTIFICATE_OVERRIDE + config EXAMPLE_BROKER_CERTIFICATE_OVERRIDE string "Broker certificate override" default "" help Please leave empty if broker certificate included from a textfile; otherwise fill in a base64 part of PEM format certificate - config BROKER_CERTIFICATE_OVERRIDDEN + config EXAMPLE_BROKER_CERTIFICATE_OVERRIDDEN bool - default y if BROKER_CERTIFICATE_OVERRIDE != "" + default y if EXAMPLE_BROKER_CERTIFICATE_OVERRIDE != "" endmenu diff --git a/examples/protocols/mqtt/publish_test/main/publish_test.c b/examples/protocols/mqtt/publish_test/main/publish_test.c index 99ef19d..15cd2b0 100644 --- a/examples/protocols/mqtt/publish_test/main/publish_test.c +++ b/examples/protocols/mqtt/publish_test/main/publish_test.c @@ -45,8 +45,8 @@ static size_t actual_published = 0; static int qos_test = 0; -#if CONFIG_BROKER_CERTIFICATE_OVERRIDDEN == 1 -static const uint8_t iot_eclipse_org_pem_start[] = "-----BEGIN CERTIFICATE-----\n" CONFIG_BROKER_CERTIFICATE_OVERRIDE "\n-----END CERTIFICATE-----"; +#if CONFIG_EXAMPLE_BROKER_CERTIFICATE_OVERRIDDEN == 1 +static const uint8_t iot_eclipse_org_pem_start[] = "-----BEGIN CERTIFICATE-----\n" CONFIG_EXAMPLE_BROKER_CERTIFICATE_OVERRIDE "\n-----END CERTIFICATE-----"; #else extern const uint8_t iot_eclipse_org_pem_start[] asm("_binary_iot_eclipse_org_pem_start"); #endif @@ -62,7 +62,7 @@ static esp_err_t mqtt_event_handler(esp_mqtt_event_handle_t event) case MQTT_EVENT_CONNECTED: ESP_LOGI(TAG, "MQTT_EVENT_CONNECTED"); xEventGroupSetBits(mqtt_event_group, CONNECTED_BIT); - msg_id = esp_mqtt_client_subscribe(client, CONFIG_SUBSCIBE_TOPIC, qos_test); + msg_id = esp_mqtt_client_subscribe(client, CONFIG_EXAMPLE_SUBSCIBE_TOPIC, qos_test); ESP_LOGI(TAG, "sent subscribe successful, msg_id=%d", msg_id); break; @@ -199,16 +199,16 @@ void app_main() if (0 == strcmp(transport, "tcp")) { ESP_LOGI(TAG, "[TCP transport] Startup.."); - esp_mqtt_client_set_uri(mqtt_client, CONFIG_BROKER_TCP_URI); + esp_mqtt_client_set_uri(mqtt_client, CONFIG_EXAMPLE_BROKER_TCP_URI); } else if (0 == strcmp(transport, "ssl")) { ESP_LOGI(TAG, "[SSL transport] Startup.."); - esp_mqtt_client_set_uri(mqtt_client, CONFIG_BROKER_SSL_URI); + esp_mqtt_client_set_uri(mqtt_client, CONFIG_EXAMPLE_BROKER_SSL_URI); } else if (0 == strcmp(transport, "ws")) { ESP_LOGI(TAG, "[WS transport] Startup.."); - esp_mqtt_client_set_uri(mqtt_client, CONFIG_BROKER_WS_URI); + esp_mqtt_client_set_uri(mqtt_client, CONFIG_EXAMPLE_BROKER_WS_URI); } else if (0 == strcmp(transport, "wss")) { ESP_LOGI(TAG, "[WSS transport] Startup.."); - esp_mqtt_client_set_uri(mqtt_client, CONFIG_BROKER_WSS_URI); + esp_mqtt_client_set_uri(mqtt_client, CONFIG_EXAMPLE_BROKER_WSS_URI); } else { ESP_LOGE(TAG, "Unexpected transport"); abort(); @@ -219,7 +219,7 @@ void app_main() xEventGroupWaitBits(mqtt_event_group, CONNECTED_BIT, false, true, portMAX_DELAY); for (int i = 0; i < expected_published; i++) { - int msg_id = esp_mqtt_client_publish(mqtt_client, CONFIG_PUBLISH_TOPIC, expected_data, expected_size, qos_test, 0); + int msg_id = esp_mqtt_client_publish(mqtt_client, CONFIG_EXAMPLE_PUBLISH_TOPIC, expected_data, expected_size, qos_test, 0); ESP_LOGI(TAG, "[%d] Publishing...", msg_id); } } diff --git a/examples/protocols/mqtt/publish_test/sdkconfig.ci b/examples/protocols/mqtt/publish_test/sdkconfig.ci index 00db776..4ff3a8d 100644 --- a/examples/protocols/mqtt/publish_test/sdkconfig.ci +++ b/examples/protocols/mqtt/publish_test/sdkconfig.ci @@ -1,5 +1,5 @@ -CONFIG_BROKER_SSL_URI="mqtts://${EXAMPLE_MQTT_BROKER_SSL}" -CONFIG_BROKER_TCP_URI="mqtt://${EXAMPLE_MQTT_BROKER_TCP}" -CONFIG_BROKER_WS_URI="ws://${EXAMPLE_MQTT_BROKER_WS}/ws" -CONFIG_BROKER_WSS_URI="wss://${EXAMPLE_MQTT_BROKER_WSS}/ws" -CONFIG_BROKER_CERTIFICATE_OVERRIDE="${EXAMPLE_MQTT_BROKER_CERTIFICATE}" +CONFIG_EXAMPLE_BROKER_SSL_URI="mqtts://${EXAMPLE_MQTT_BROKER_SSL}" +CONFIG_EXAMPLE_BROKER_TCP_URI="mqtt://${EXAMPLE_MQTT_BROKER_TCP}" +CONFIG_EXAMPLE_BROKER_WS_URI="ws://${EXAMPLE_MQTT_BROKER_WS}/ws" +CONFIG_EXAMPLE_BROKER_WSS_URI="wss://${EXAMPLE_MQTT_BROKER_WSS}/ws" +CONFIG_EXAMPLE_BROKER_CERTIFICATE_OVERRIDE="${EXAMPLE_MQTT_BROKER_CERTIFICATE}"