renaming demos

tgsong · Oct 21, 2020 · b693798 · b693798
1 parent 32814d6
commit b693798
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 38 deletions.
diff --git a/demos/ota/ota_demo_http/CMakeLists.txt → demos/ota/ota_demo_core_http/CMakeLists.txt b/demos/ota/ota_demo_http/CMakeLists.txt → demos/ota/ota_demo_core_http/CMakeLists.txt
@@ -1,4 +1,4 @@
-set( DEMO_NAME "ota_demo_http" )
+set( DEMO_NAME "ota_demo_core_http" )
 
 # Include required library's source and header path variables.
 include( ${CMAKE_SOURCE_DIR}/libraries/aws/ota/otaFilePaths.cmake )
@@ -13,7 +13,7 @@ find_library(LIB_RT rt REQUIRED)
 target_sources(
     ${DEMO_NAME}
     PRIVATE
-        "aws_iot_ota_update_demo.c"
+        "ota_demo_core_http.c"
         ${OTA_SOURCES}
         ${OTA_OS_POSIX_SOURCES}
         ${OTA_MQTT_SOURCES}

diff --git a/.../ota/ota_demo_http/aws_ota_agent_config.h → ...ota_demo_core_http/aws_ota_agent_config.h b/.../ota/ota_demo_http/aws_ota_agent_config.h → ...ota_demo_core_http/aws_ota_agent_config.h
diff --git a/...emo_http/aws_ota_codesigner_certificate.h → ...ore_http/aws_ota_codesigner_certificate.h b/...emo_http/aws_ota_codesigner_certificate.h → ...ore_http/aws_ota_codesigner_certificate.h
diff --git a/demos/ota/ota_demo_mqtt/demo_config.h → demos/ota/ota_demo_core_http/demo_config.h b/demos/ota/ota_demo_mqtt/demo_config.h → demos/ota/ota_demo_core_http/demo_config.h
@@ -83,7 +83,7 @@
  * ROOT_CA_CERT_PATH to the absolute path if this demo is executed from elsewhere.
  */
 #ifndef ROOT_CA_CERT_PATH
-    #define ROOT_CA_CERT_PATH    "/home/ubuntu/dev/aws-iot-device-sdk-embedded-C-staging/demos/certificates/AmazonRootCA1.crt"
+    #define ROOT_CA_CERT_PATH    "certificates/AmazonRootCA1.crt"
 #endif
 
 /**

diff --git a/...a/ota_demo_http/aws_iot_ota_update_demo.c → ...a/ota_demo_core_http/ota_demo_core_http.c b/...a/ota_demo_http/aws_iot_ota_update_demo.c → ...a/ota_demo_core_http/ota_demo_core_http.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file aws_iot_ota_update_demo.c
+ * @file ota_demo_core_http.c
  * @brief A simple OTA update example.
  */
 
@@ -788,22 +788,20 @@ void startOTADemo( MQTTContext_t * pMqttContext )
                    OTA_GetPacketsProcessed(),
                    OTA_GetPacketsDropped() ) );
 
-        sleep( OTA_DEMO_TASK_DELAY_SECONDS );
+        if(state == OtaAgentStateWaitingForJob )
+        {
+                mqttStatus = MQTT_ProcessLoop( pMqttContext, 1000 );
 
-    //    if(state == OtaAgentStateWaitingForJob )
-    //    {
-    //         mqttStatus = MQTT_ProcessLoop( pMqttContext, 1000 );
-
-    //         if( mqttStatus != MQTTSuccess )
-    //         {
-    //             LogError( ( "MQTT_ProcessLoop returned with status = %u.",
-    //                     mqttStatus ) );
-    //         }
-    //    }
-    //    else
-    //    {
-    //        sleep( OTA_DEMO_TASK_DELAY_SECONDS );
-    //    }
+                if( mqttStatus != MQTTSuccess )
+                {
+                    LogError( ( "MQTT_ProcessLoop returned with status = %u.",
+                            mqttStatus ) );
+                }
+        }
+        else
+        {
+            sleep( OTA_DEMO_TASK_DELAY_SECONDS );
+        }
 
     }
 

diff --git a/demos/ota/ota_demo_mqtt/CMakeLists.txt → demos/ota/ota_demo_core_mqtt/CMakeLists.txt b/demos/ota/ota_demo_mqtt/CMakeLists.txt → demos/ota/ota_demo_core_mqtt/CMakeLists.txt
@@ -1,4 +1,4 @@
-set( DEMO_NAME "ota_demo_mqtt" )
+set( DEMO_NAME "ota_demo_core_mqtt" )
 
 # Include required library's source and header path variables.
 include( ${CMAKE_SOURCE_DIR}/libraries/aws/ota/otaFilePaths.cmake )
@@ -13,7 +13,7 @@ find_library(LIB_RT rt REQUIRED)
 target_sources(
     ${DEMO_NAME}
     PRIVATE
-        "aws_iot_ota_update_demo.c"
+        "ota_demo_core_mqtt.c"
         ${OTA_SOURCES}
         ${OTA_OS_POSIX_SOURCES}
         ${OTA_MQTT_SOURCES}

diff --git a/.../ota/ota_demo_mqtt/aws_ota_agent_config.h → ...ota_demo_core_mqtt/aws_ota_agent_config.h b/.../ota/ota_demo_mqtt/aws_ota_agent_config.h → ...ota_demo_core_mqtt/aws_ota_agent_config.h
diff --git a/...emo_mqtt/aws_ota_codesigner_certificate.h → ...ore_mqtt/aws_ota_codesigner_certificate.h b/...emo_mqtt/aws_ota_codesigner_certificate.h → ...ore_mqtt/aws_ota_codesigner_certificate.h
diff --git a/demos/ota/ota_demo_http/demo_config.h → demos/ota/ota_demo_core_mqtt/demo_config.h b/demos/ota/ota_demo_http/demo_config.h → demos/ota/ota_demo_core_mqtt/demo_config.h
@@ -83,7 +83,7 @@
  * ROOT_CA_CERT_PATH to the absolute path if this demo is executed from elsewhere.
  */
 #ifndef ROOT_CA_CERT_PATH
-    #define ROOT_CA_CERT_PATH    "/home/ubuntu/dev/aws-iot-device-sdk-embedded-C-staging/demos/certificates/AmazonRootCA1.crt"
+    #define ROOT_CA_CERT_PATH    "certificates/AmazonRootCA1.crt"
 #endif
 
 /**

diff --git a/...a/ota_demo_mqtt/aws_iot_ota_update_demo.c → ...a/ota_demo_core_mqtt/ota_demo_core_mqtt.c b/...a/ota_demo_mqtt/aws_iot_ota_update_demo.c → ...a/ota_demo_core_mqtt/ota_demo_core_mqtt.c
@@ -803,22 +803,20 @@ void startOTADemo( MQTTContext_t * pMqttContext )
                    OTA_GetPacketsProcessed(),
                    OTA_GetPacketsDropped() ) );
 
-        sleep( OTA_DEMO_TASK_DELAY_SECONDS );
-
-    //    if(state == OtaAgentStateWaitingForJob )
-    //    {
-    //         mqttStatus = MQTT_ProcessLoop( pMqttContext, 1000 );
-
-    //         if( mqttStatus != MQTTSuccess )
-    //         {
-    //             LogError( ( "MQTT_ProcessLoop returned with status = %u.",
-    //                     mqttStatus ) );
-    //         }
-    //    }
-    //    else
-    //    {
-    //        sleep( OTA_DEMO_TASK_DELAY_SECONDS );
-    //    }
+        if(state == OtaAgentStateWaitingForJob )
+        {
+                mqttStatus = MQTT_ProcessLoop( pMqttContext, 1000 );
+
+                if( mqttStatus != MQTTSuccess )
+                {
+                    LogError( ( "MQTT_ProcessLoop returned with status = %u.",
+                            mqttStatus ) );
+                }
+        }
+        else
+        {
+            sleep( OTA_DEMO_TASK_DELAY_SECONDS );
+        }
 
     }