Merge remote-tracking branch 'origin/release-candidate' into update-t…

…ransport-interface-location

demos/README.md

@@ -8,7 +8,7 @@ There are a variety of demos available for each user to explore the functionalit
 1. Navigate to  ```./vendors/<VENDOR_NAME>/boards/<BOARD>/aws_demos/common/config_files```  
 2. Open ```aws_demo_config.h``` file. 
 3. The defines are used to select which demo will be enabled from the list of available demos
-4. By default, ```#define CONFIG_MQTT_DEMO_ENABLED``` MQTT demos is selected. 
+4. By default, ```#define CONFIG_CORE_MQTT_MUTUAL_AUTH_DEMO_ENABLED``` MQTT demos is selected. 
 5. Replace the ```#define``` with your demo of choice if necessary
 6. Compile your project utilizing IDE or with cmake
 

demos/ble/mqtt_ble/CMakeLists.txt

@@ -22,7 +22,7 @@ afr_module_dependencies(
     INTERFACE
         AFR::core_mqtt
         AFR::ble
-	  # Add dependency on the core_mqtt_demo_dependencies metadata module
+        # Add dependency on the core_mqtt_demo_dependencies metadata module
         # so that FreeRTOS console shows this demo when BOTH the core MQTT
         # (or another library depending on coreMQTT) AND BLE libraries are
         # selected on the console.

demos/include/iot_demo_runner.h

@@ -38,17 +38,7 @@
  */
 
 /* Individual demo task entry definitions */
-#if defined( CONFIG_MQTT_DEMO_ENABLED )
-    #define DEMO_entryFUNCTION              RunMqttDemo
-    #if defined( democonfigMQTT_ECHO_TASK_STACK_SIZE )
-        #undef democonfigDEMO_STACKSIZE
-        #define democonfigDEMO_STACKSIZE    democonfigMQTT_ECHO_TASK_STACK_SIZE
-    #endif
-    #if defined( democonfigMQTT_ECHO_TASK_PRIORITY )
-        #undef democonfigDEMO_PRIORITY
-        #define democonfigDEMO_PRIORITY     democonfigMQTT_ECHO_TASK_PRIORITY
-    #endif
-#elif defined( CONFIG_CORE_MQTT_BASIC_TLS_DEMO_ENABLED )
+#if defined( CONFIG_CORE_MQTT_BASIC_TLS_DEMO_ENABLED )
     #define DEMO_entryFUNCTION              RunCoreMqttBasicTLSDemo
     #if defined( democonfigMQTT_ECHO_TASK_STACK_SIZE )
         #undef democonfigDEMO_STACKSIZE
@@ -108,16 +98,6 @@
         #undef democonfigDEMO_PRIORITY
         #define democonfigDEMO_PRIORITY     democonfigCORE_MQTT_CONNECTION_SHARING_DEMO_TASK_PRIORITY
     #endif
-#elif defined( CONFIG_SHADOW_DEMO_ENABLED )
-    #define DEMO_entryFUNCTION              RunShadowDemo
-    #if defined( democonfigSHADOW_DEMO_TASK_STACK_SIZE )
-        #undef democonfigDEMO_STACKSIZE
-        #define democonfigDEMO_STACKSIZE    democonfigSHADOW_DEMO_TASK_STACK_SIZE
-    #endif
-    #if defined( democonfigSHADOW_DEMO_TASK_PRIORITY )
-        #undef democonfigDEMO_PRIORITY
-        #define democonfigDEMO_PRIORITY     democonfigSHADOW_DEMO_TASK_PRIORITY
-    #endif
 #elif defined( CONFIG_DEVICE_SHADOW_DEMO_ENABLED )
     #define DEMO_entryFUNCTION              RunDeviceShadowDemo
     #if defined( democonfigSHADOW_DEMO_TASK_STACK_SIZE )
@@ -191,10 +171,10 @@
 
 #elif defined( CONFIG_CLI_UART_DEMO_ENABLED )
     #define DEMO_entryFUNCTION             vRunCLIUartDemo
-#else /* if defined( CONFIG_MQTT_DEMO_ENABLED ) */
+#else /* if defined( CONFIG_CORE_MQTT_BASIC_TLS_DEMO_ENABLED ) */
 /* if no demo was defined there will be no entry point defined and we will not be able to run the demo */
     #error "No demo to run. One demo should be enabled"
-#endif /* if defined( CONFIG_MQTT_DEMO_ENABLED ) */
+#endif /* if defined( CONFIG_CORE_MQTT_BASIC_TLS_DEMO_ENABLED ) */
 
 
 #endif /* ifndef _IOT_DEMO_RUNNER_H_ */