Styling changes and removing esp_driver_tsens dependency to fix the failing demo builds

Author: rauthsuj

main/CMakeLists.txt

@@ -15,8 +15,9 @@ endif()
 
 # QuickConnect V2 demo
 if(CONFIG_GRI_ENABLE_QUICKCONNECT_V2_DEMO)
-    list(APPEND MAIN_SRCS 
+    list(APPEND MAIN_SRCS
         "demo_tasks/quickconnect_v2_demo/quickconnect_v2_demo.c"
+        "demo_tasks/temp_sub_pub_and_led_control_demo/hardware_drivers/app_driver.c"
     )
 endif()
 
@@ -64,7 +65,6 @@ set(MAIN_REQUIRES
     FreeRTOS-Libraries-Integration-Tests
     unity
     driver
-    esp_driver_tsens
 )
 
 idf_component_register(

main/demo_tasks/quickconnect_v2_demo/GettingStarted.md

@@ -28,10 +28,12 @@ To get credentials for your device (Thing), visit [Quick Connect Credentials](ht
 
 ### 2.2 Configure the project with the AWS IoT Thing Name and AWS device Endpoint
 
-The **AWS device Endpoint** is provided on the [Quick Connect Examples](https://quickconnect.freertos.aws.com/examples) page.
+The **AWS device Endpoint** is provided on the [Quick Connect Examples](https://quickconnect.freertos.aws.com/examples) page in the sample program code under the ENDPOINT variable.
 
 Follow the [2.2 Configure the project](../../../GettingStartedGuide.md#22-configure-the-project-with-the-aws-iot-thing-name-and-aws-device-endpoint) section in the [Getting Started Guide](../../../GettingStartedGuide.md) to configure your project.
 
+Select `Enable QuickConnect V2 demo` in the `Featured FreeRTOS IoT Integration` to activate the demo.
+
 
 ### 2.3 Provision the ESP32-C3 with the private key, device certificate and CA certificate in Development Mode
 

main/demo_tasks/quickconnect_v2_demo/quickconnect_v2_demo.c

@@ -75,18 +75,17 @@
 
 /* Hardware drivers include. */
 #include "app_driver.h"
-#include "driver/temperature_sensor.h"
 
 /* coreMQTT-Agent manager configurations include. */
 #include "core_mqtt_agent_manager_config.h"
 
 /* Preprocessor definitions ***************************************************/
 
 /* coreMQTT-Agent event group bit definitions */
-#define CORE_MQTT_AGENT_CONNECTED_BIT              ( 1 << 0 )
+#define CORE_MQTT_AGENT_CONNECTED_BIT         ( 1 << 0 )
 
 /* MQTT event group bit definitions. */
-#define MQTT_PUBLISH_COMMAND_COMPLETED_BIT         ( 1 << 1 )
+#define MQTT_PUBLISH_COMMAND_COMPLETED_BIT    ( 1 << 1 )
 
 /* Struct definitions *********************************************************/
 
@@ -115,10 +114,10 @@ extern MQTTAgentContext_t xGlobalMqttAgentContext;
 
 /**
  * @brief The buffer to hold the topic filter. 
- Topic filter value will be the Thing-Name. 
+ * Topic filter value will be the Thing-Name. 
  *
  */
-static char topicBuf[ quickconnectv2configSTRING_BUFFER_LENGTH ];
+static char topicBuf[ quickconnectconfigSTRING_BUFFER_LENGTH ];
 
 /**
  * @brief The event group used to manage coreMQTT-Agent events.
@@ -130,11 +129,6 @@ static EventGroupHandle_t xNetworkEventGroup;
  */
 static uint32_t ulMessageId = 0;
 
-/**
- * @brief Temperature sensor handle.
- */
-static temperature_sensor_handle_t temp_sensor = NULL;
-
 /* Static function declarations ***********************************************/
 
 /**
@@ -177,7 +171,7 @@ static void prvPublishCommandCallback( MQTTAgentCommandContext_t * pxCommandCont
  */
 static EventBits_t prvWaitForEvent( EventGroupHandle_t xMqttEventGroup,
                                     EventBits_t uxBitsToWaitFor );
-                                    
+
 /**
  * @brief The function that implements the task demonstrated by this file.
  */
@@ -278,7 +272,7 @@ static void prvPublishToTopic( MQTTQoS_t xQoS,
      * until the callback executes. */
     xCommandContext.xMqttEventGroup = xMqttEventGroup;
 
-    xCommandParams.blockTimeMs = quickconnectv2configMAX_COMMAND_SEND_BLOCK_TIME_MS;
+    xCommandParams.blockTimeMs = quickconnectconfigMAX_COMMAND_SEND_BLOCK_TIME_MS;
     xCommandParams.cmdCompleteCallback = prvPublishCommandCallback;
     xCommandParams.pCmdCompleteCallbackContext = &xCommandContext;
 
@@ -346,7 +340,7 @@ static void prvQuickConnectV2Task( void * pvParameters )
     EventGroupHandle_t xMqttEventGroup;
 
     MQTTQoS_t xQoS;
-    char pcPayload[ quickconnectv2configSTRING_BUFFER_LENGTH ];
+    char pcPayload[ quickconnectconfigSTRING_BUFFER_LENGTH ];
     float temperatureValue;
 
     xMqttEventGroup = xEventGroupCreate();
@@ -356,26 +350,21 @@ static void prvQuickConnectV2Task( void * pvParameters )
 
     /* Take the topic name from thing name. */
     snprintf( topicBuf,
-              quickconnectv2configSTRING_BUFFER_LENGTH,
+              quickconnectconfigSTRING_BUFFER_LENGTH,
               "%s",
               configCLIENT_IDENTIFIER );
 
-    /* Initialize temperature sensor */
-    temperature_sensor_config_t temp_sensor_config = TEMPERATURE_SENSOR_CONFIG_DEFAULT(-10, 80);
-    ESP_ERROR_CHECK(temperature_sensor_install(&temp_sensor_config, &temp_sensor));
-    ESP_ERROR_CHECK(temperature_sensor_enable(temp_sensor));
+    /* Initialize hardware drivers */
+    app_driver_init();
 
     while( 1 )
     {
-        esp_err_t ret = temperature_sensor_get_celsius(temp_sensor, &temperatureValue);
-        if (ret != ESP_OK) {
-            ESP_LOGE(TAG, "Failed to read temperature: %s", esp_err_to_name(ret));
-            temperatureValue = 25.0; /* Default fallback value */ 
-        }
+        /* Read temperature from sensor */
+        temperatureValue = app_driver_temp_sensor_read_celsius();
 
         /* Create Payload in an Array format */
         snprintf( pcPayload,
-                  quickconnectv2configSTRING_BUFFER_LENGTH,
+                  quickconnectconfigSTRING_BUFFER_LENGTH,
                   "[{\"label\":\"ESP32 MCU Temperature\",\"display_type\":\"line_graph\",\"unit\":\"C\",\"values\":[{\"value\":%.1f,\"label\":\"temp\"}]}]",
                   temperatureValue );
 
@@ -393,7 +382,7 @@ static void prvQuickConnectV2Task( void * pvParameters )
                   "Task \"%s\" completed a loop. Delaying before next loop.",
                   pcTaskGetName( NULL ) );
 
-        vTaskDelay( pdMS_TO_TICKS( quickconnectv2configDELAY_BETWEEN_LOOPS_MS ) );
+        vTaskDelay( pdMS_TO_TICKS( quickconnectconfigDELAY_BETWEEN_LOOPS_MS ) );
     }
 
     vEventGroupDelete( xMqttEventGroup );
@@ -403,7 +392,7 @@ static void prvQuickConnectV2Task( void * pvParameters )
 /* Public function definitions ************************************************/
 
 void vStartQuickConnectV2Demo( void )
-{   /* This is a single task demo*/
+{ /* This is a single task demo*/
     char pcTaskNameBuf[ 15 ];
     uint32_t ulTaskNumber;
 
@@ -419,11 +408,11 @@ void vStartQuickConnectV2Demo( void )
 
         snprintf( pcTaskNameBuf,
                   10,
-                  "DemoTask");
+                  "DemoTask" );
 
         xTaskCreate( prvQuickConnectV2Task,
                      pcTaskNameBuf,
-                     quickconnectv2configTASK_STACK_SIZE,
+                     quickconnectconfigTASK_STACK_SIZE,
                      NULL,
                      1, /* Task Priority */
                      NULL );

main/demo_tasks/quickconnect_v2_demo/quickconnect_v2_demo.h

@@ -35,4 +35,4 @@
  */
 void vStartQuickConnectV2Demo( void );
 
-#endif /* QUICKCONNECT_V2_DEMO_H */
+#endif /* QUICKCONNECT_V2_DEMO_H */

main/demo_tasks/quickconnect_v2_demo/quickconnect_v2_demo_config.h

@@ -40,24 +40,24 @@
  * @brief Size of statically allocated buffers for holding topic names and
  * payloads.
  */
-#define quickconnectv2configSTRING_BUFFER_LENGTH                    ( ( unsigned int ) ( CONFIG_GRI_QUICKCONNECT_V2_DEMO_STRING_BUFFER_LENGTH ) )
+#define quickconnectconfigSTRING_BUFFER_LENGTH              ( ( unsigned int ) ( CONFIG_GRI_QUICKCONNECT_V2_DEMO_STRING_BUFFER_LENGTH ) )
 
 /**
  * @brief Delay for each task between each publish.
  */
-#define quickconnectv2configDELAY_BETWEEN_LOOPS_MS    ( ( unsigned int ) ( CONFIG_GRI_QUICKCONNECT_V2_DEMO_DELAY_BETWEEN_PUB_LOOPS_MS ) )
+#define quickconnectconfigDELAY_BETWEEN_LOOPS_MS            ( ( unsigned int ) ( CONFIG_GRI_QUICKCONNECT_V2_DEMO_DELAY_BETWEEN_PUB_LOOPS_MS ) )
 
 /**
  * @brief The maximum amount of time in milliseconds to wait for the commands
  * to be posted to the MQTT agent should the MQTT agent's command queue be full.
  * Tasks wait in the Blocked state, so don't use any CPU time.
  */
-#define quickconnectv2configMAX_COMMAND_SEND_BLOCK_TIME_MS          ( ( unsigned int ) ( CONFIG_GRI_QUICKCONNECT_V2_DEMO_MAX_COMMAND_SEND_BLOCK_TIME_MS ) )
+#define quickconnectconfigMAX_COMMAND_SEND_BLOCK_TIME_MS    ( ( unsigned int ) ( CONFIG_GRI_QUICKCONNECT_V2_DEMO_MAX_COMMAND_SEND_BLOCK_TIME_MS ) )
 
 /**
  * @brief The task stack size for each of the Quick Connect Demo tasks.
  */
-#define quickconnectv2configTASK_STACK_SIZE                         ( ( unsigned int ) ( CONFIG_GRI_QUICKCONNECT_V2_DEMO_TASK_STACK_SIZE ) )
+#define quickconnectconfigTASK_STACK_SIZE                   ( ( unsigned int ) ( CONFIG_GRI_QUICKCONNECT_V2_DEMO_TASK_STACK_SIZE ) )
 
 /* *INDENT-OFF* */
     #ifdef __cplusplus

main/main.c

@@ -257,10 +257,10 @@ static void prvStartEnabledDemos( void )
     BaseType_t xResult;
 
     #if ( CONFIG_GRI_RUN_QUALIFICATION_TEST == 0 )
-         #if CONFIG_GRI_ENABLE_QUICKCONNECT_V2_DEMO
+        #if CONFIG_GRI_ENABLE_QUICKCONNECT_V2_DEMO
             vStartQuickConnectV2Demo();
         #endif /* CONFIG_GRI_ENABLE_QUICKCONNECT_V2_DEMO */
-        
+
         #if CONFIG_GRI_ENABLE_SUB_PUB_UNSUB_DEMO
             vStartSubscribePublishUnsubscribeDemo();
         #endif /* CONFIG_GRI_ENABLE_SIMPLE_PUB_SUB_DEMO */