Merge branch 'chore/modify_default_mqtt' into 'master'

donghengqaz · donghengqaz · commit a99e52871e45 · 2019-12-30T14:00:36.000+08:00
mqtt: modify default mqtt

See merge request sdk/ESP8266_RTOS_SDK!1253
diff --git a/components/mqtt/Kconfig b/components/mqtt/Kconfig
@@ -2,7 +2,7 @@ menu "MQTT"
 
 choice MQTT_LIBRARY_CHOOSE
     prompt "Choose MQTT library"
-    default MQTT_USING_IBM
+    default MQTT_USING_ESP
     help
         Choose the MQTT library which you want to use.
 
@@ -11,7 +11,7 @@ choice MQTT_LIBRARY_CHOOSE
 config MQTT_USING_ESP
     bool "ESP-MQTT(Recommended)"
 config MQTT_USING_IBM
-    bool "IBM-MQTT(not recommended and will be removed at v4.0)"
+    bool "IBM-MQTT(not recommended and will be removed at v3.4)"
 endchoice
 
 menu "IBM-MQTT(paho)"
diff --git a/examples/protocols/ibm-mqtt/sdkconfig.defaults b/examples/protocols/ibm-mqtt/sdkconfig.defaults
@@ -6,6 +6,7 @@ CONFIG_MQTT_PUBLISH_INTERVAL=0
 #
 # ECLIPSE-MQTT
 #
+CONFIG_MQTT_USING_IBM=y
 CONFIG_MQTT_KEEP_ALIVE=30
 CONFIG_CLEAN_SESSION=y
 CONFIG_KEEP_SESSION=

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ CONFIG_MQTT_PUBLISH_INTERVAL=0`
`6`	`6`	`#`
`7`	`7`	`# ECLIPSE-MQTT`
`8`	`8`	`#`
	`9`	`+CONFIG_MQTT_USING_IBM=y`
`9`	`10`	`CONFIG_MQTT_KEEP_ALIVE=30`
`10`	`11`	`CONFIG_CLEAN_SESSION=y`
`11`	`12`	`CONFIG_KEEP_SESSION=`