Merge branch 'feature/remove_ibm_mqtt' into 'master'

feat(mqtt): remove ibm-mqtt component and example

See merge request sdk/ESP8266_RTOS_SDK!1245

Author: donghengqaz

components/mqtt/CMakeLists.txt

@@ -1,30 +1,10 @@
-if(CONFIG_MQTT_USING_IBM)
-set(COMPONENT_ADD_INCLUDEDIRS
-    "ibm-mqtt/MQTTClient-C/src"
-    "ibm-mqtt/MQTTClient-C/src/FreeRTOS"
-    "ibm-mqtt/MQTTPacket/src")
-
-set(COMPONENT_SRCDIRS
-    "ibm-mqtt/MQTTClient-C/src"
-    "ibm-mqtt/MQTTClient-C/src/FreeRTOS"
-    "ibm-mqtt/MQTTPacket/src")
-
-endif()
-
-if (CONFIG_MQTT_USING_ESP)
 set(COMPONENT_ADD_INCLUDEDIRS "esp-mqtt/include")
 set(COMPONENT_PRIV_INCLUDEDIRS "esp-mqtt/lib/include")
 set(COMPONENT_SRCS "esp-mqtt/mqtt_client.c"
                    "esp-mqtt/lib/mqtt_msg.c"
                    "esp-mqtt/lib/mqtt_outbox.c"
                    "esp-mqtt/lib/platform_idf.c")
 
-endif()
-
 set(COMPONENT_REQUIRES lwip http_parser tcp_transport freertos lwip mbedtls openssl)
 
 register_component()
-
-if(CONFIG_MQTT_USING_IBM)
-target_compile_options(${COMPONENT_LIB} PUBLIC -DMQTT_TASK -DMQTTCLIENT_PLATFORM_HEADER=MQTTFreeRTOS.h)
-endif()

components/mqtt/Kconfig

@@ -1,160 +1,5 @@
 menu "MQTT"
 
-choice MQTT_LIBRARY_CHOOSE
-    prompt "Choose MQTT library"
-    default MQTT_USING_ESP
-    help
-        Choose the MQTT library which you want to use.
-
-        Currently we support ESP-MQTT and IBM-MQTT(paho).
-
-config MQTT_USING_ESP
-    bool "ESP-MQTT(Recommended)"
-config MQTT_USING_IBM
-    bool "IBM-MQTT(not recommended and will be removed at v3.4)"
-endchoice
-
-menu "IBM-MQTT(paho)"
-    depends on MQTT_USING_IBM
-
-choice MQTT_VERSION
-    prompt "MQTT version"
-    default V3_1
-    help
-        Current supported MQTT version.
-
-config V3_1
-    bool "V3.1"
-config V3_1_1
-    bool "V3.1.1"
-endchoice
-
-config DEFAULT_MQTT_VERSION
-    int
-    default 3 if V3_1
-    default 4 if V3_1_1
-
-config MQTT_CLIENT_ID
-    string "MQTT client ID"
-    default "espressif_sample"
-    help
-        MQTT client ID for MQTT broker to identify ESP device.
-
-config MQTT_KEEP_ALIVE
-    int "MQTT keep-alive(seconds)"
-    default 30
-    help
-        MQTT keep alive interval, Recommended value: 30s - 60s.
-        The last MQTT packet timestamp will be recorded,
-        a PING request will be sent if (current_timestamp - last_mqtt_packet_timestamp) > MQTT_KEEP_ALIVE.
-
-config MQTT_USERNAME
-    string "MQTT username"
-    default "espressif"
-    help
-        Username used for logging to MQTT broker.
-        Generally, you should use a valid MQTT_USERNAME if MQTT broker does not allow an anonymous login.
-
-config MQTT_PASSWORD
-    string "MQTT password"
-    default "admin"
-    help
-        Password used for logging to MQTT broker.
-        Generally, you should use a valid MQTT_PASSWORD if MQTT broker does not allow an anonymous login.
-
-choice MQTT_SESSION
-    prompt "MQTT Session"
-    default CLEAN_SESSION
-    help
-        Clean session to start a new session.
-        If clean-seesion is set, it will discard any previous session and start a new one. 
-        If keep-session is set, it will store session state and the communication can resume.
-
-config CLEAN_SESSION
-    bool "Clean Session"
-config KEEP_SESSION
-    bool "Keep Session"
-endchoice
-
-config DEFAULT_MQTT_SESSION
-    int
-    default 0 if KEEP_SESSION
-    default 1 if CLEAN_SESSION
-
-choice MQTT_SECURITY
-    prompt "MQTT over TCP/SSL/TLS feature"
-    default NO_TLS
-    help
-        MQTT over TCP/SSL/TLS.
-        MQTT_SECURITY=0: MQTT over TCP
-        MQTT_SECURITY=1: MQTT over TLS with no verify
-        MQTT_SECURITY=2: MQTT over TLS with verify peer
-        MQTT_SECURITY=3: MQTT over TLS with verify client
-
-config NO_TLS
-    bool "TCP"
-config TLS_VERIFY_NONE
-    bool "TLS Verify None"
-config TLS_VERIFY_PEER
-    bool "TLS Verify Peer"
-config TLS_VERIFY_CLIENT
-    bool "TLS Verify Client"
-endchoice
-
-config DEFAULT_MQTT_SECURITY
-    int
-    default 0 if NO_TLS
-    default 1 if TLS_VERIFY_NONE
-    default 2 if TLS_VERIFY_PEER
-    default 3 if TLS_VERIFY_CLIENT
-
-config MQTT_SEND_BUFFER
-    int "MQTT send buffer"
-    default 2048
-    help
-        Recommended value: 1460 - 2048.
-        Buffer used for sending MQTT messages, including MQTT header, MQTT topic, payload and etc.
-
-config MQTT_RECV_BUFFER
-    int "MQTT recv buffer"
-    default 2048
-    help
-        Recommended value: 1460 - 2048.
-        Buffer used for receiving MQTT messages, including MQTT header, MQTT topic, payload and etc.
-
-config MQTT_SEND_CYCLE
-    int "MQTT send cycle(ms)"
-    default 30000
-    help
-        Recommended value: 30000 - 60000.
-        MQTT send interval in every cycle.
-        A MQTT packet should be sent out in MQTT_SEND_CYCLE,
-        will block for MQTT_SEND_CYCLE if weak network, and return timeout.
-
-config MQTT_RECV_CYCLE
-    int "MQTT recv cycle(ms)"
-    default 0
-    help
-        Recommended value: 0ms - 500ms.
-        MQTT receive interval in every cycle.
-        a MQTT packet should be received in MQTT_RECV_CYCLE,
-        will block for MQTT_RECV_CYCLE if weak network , and return timeout.
-
-config MQTT_PING_TIMEOUT
-    int "MQTT ping timeout(ms)"
-    default 3000
-    help
-        Recommended value: 3000ms - 10000ms.
-        MQTT ping timeout.
-        When MQTT_KEEP_ALIVE expired, it will start sending ping request.
-        If the ESP device does not receive any ping response within MQTT_PING_TIMEOUT,
-        it will terminate the MQTT connection.
-
-endmenu  # IBM-MQTT(paho)
-
-menu "ESP-MQTT"
-    depends on MQTT_USING_ESP
-
 config MQTT_PROTOCOL_311
     bool "Enable MQTT protocol 3.1.1"
     default y
@@ -254,6 +99,5 @@ config MQTT_CUSTOM_OUTBOX
     help
         Set to true if a specific implementation of message outbox is needed (e.g. persistant outbox in NVM or similar).
 
-endmenu # ESP-MQTT
 
 endmenu

components/mqtt/Makefile.projbuild

@@ -1,19 +1,3 @@
-
-ifdef CONFIG_MQTT_USING_IBM
-COMPONENT_ADD_INCLUDEDIRS += ibm-mqtt/MQTTClient-C/src \
-                             ibm-mqtt/MQTTClient-C/src/FreeRTOS \
-                             ibm-mqtt/MQTTPacket/src
-
-COMPONENT_SRCDIRS += ibm-mqtt/MQTTClient-C/src \
-                     ibm-mqtt/MQTTClient-C/src/FreeRTOS \
-                     ibm-mqtt/MQTTPacket/src
-
-CFLAGS += -DMQTT_TASK
-else
-ifdef CONFIG_MQTT_USING_ESP
 COMPONENT_ADD_INCLUDEDIRS := esp-mqtt/include
 COMPONENT_SRCDIRS :=  esp-mqtt esp-mqtt/lib
 COMPONENT_PRIV_INCLUDEDIRS := esp-mqtt/lib/include
-endif
-endif
-