Merge branch 'master' into feature/esp32s2beta_update

examples/protocols/mqtt/tcp/README.md

@@ -2,6 +2,8 @@
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
 
 This example connects to the broker URI selected using `make menuconfig` (using mqtt tcp transport) and as a demonstration subscribes/unsubscribes and send a message on certain topic.
+(Please note that the public broker is maintained by the community so may not be always available, for details please see this [disclaimer](https://iot.eclipse.org/getting-started/#sandboxes))
+
 Note: If the URI equals `FROM_STDIN` then the broker address is read from stdin upon application startup (used for testing)
 
 It uses ESP-MQTT library which implements mqtt client to connect to mqtt broker.
@@ -14,7 +16,7 @@ This example can be executed on any ESP32 board, the only required interface is
 
 ### Configure the project
 
-* Run `make menuconfig` (or `idf.py menuconfig` if using CMake build system)
+* Open the project configuration menu (`idf.py menuconfig`)
 * Configure Wi-Fi or Ethernet under "Example Connection Configuration" menu. See "Establishing Wi-Fi or Ethernet Connection" section in [examples/protocols/README.md](../../README.md) for more details.
 * When using Make build system, set `Default serial port` under `Serial flasher config`.
 

examples/protocols/mqtt/tcp/main/CMakeLists.txt

@@ -1,4 +1,2 @@
-set(COMPONENT_SRCS "app_main.c")
-set(COMPONENT_ADD_INCLUDEDIRS ".")
-
-register_component()
+idf_component_register(SRCS "app_main.c"
+                    INCLUDE_DIRS ".")