Merge branch 'main' into add-smp-OTT-task-delete

chinglee-iot · Jul 31, 2024 · 0fd2b24 · 0fd2b24
2 parents f063a40 + 36b803e
commit 0fd2b24
Show file tree

Hide file tree

Showing 65 changed files with 433 additions and 547 deletions.
diff --git a/.github/workflows/freertos_plus_demos.yml b/.github/workflows/freertos_plus_demos.yml
@@ -956,7 +956,7 @@ jobs:
       - env:
           stepName: Build AWS IoT Fleet Provisioning Demo
         name: ${{ env.stepName }}
-        working-directory: FreeRTOS-Plus/Demo/AWS/Fleet_Provisioning_Windows_Simulator/Fleet_Provisioning_With_CSR_Demo
+        working-directory: FreeRTOS-Plus/Demo/AWS/Fleet_Provisioning_Windows_Simulator/CSR_Demo
         run: |
           # ${{ env.stepName }}
           echo "::group::${{ env.stepName }}"

diff --git a/...mo/DemoSetup/cloudformation_template.json → ...mo/DemoSetup/cloudformation_template.json b/...mo/DemoSetup/cloudformation_template.json → ...mo/DemoSetup/cloudformation_template.json
diff --git a/...o/DemoSetup/convert_credentials_to_der.py → ...o/DemoSetup/convert_credentials_to_der.py b/...o/DemoSetup/convert_credentials_to_der.py → ...o/DemoSetup/convert_credentials_to_der.py
diff --git a/...g_With_CSR_Demo/DemoSetup/demo_cleanup.py → ...ulator/CSR_Demo/DemoSetup/demo_cleanup.py b/...g_With_CSR_Demo/DemoSetup/demo_cleanup.py → ...ulator/CSR_Demo/DemoSetup/demo_cleanup.py
diff --git a/...With_CSR_Demo/DemoSetup/demo_config.templ → ...ator/CSR_Demo/DemoSetup/demo_config.templ b/...With_CSR_Demo/DemoSetup/demo_config.templ → ...ator/CSR_Demo/DemoSetup/demo_config.templ
diff --git a/...SR_Demo/DemoSetup/demo_config_empty.templ → ...SR_Demo/DemoSetup/demo_config_empty.templ b/...SR_Demo/DemoSetup/demo_config_empty.templ → ...SR_Demo/DemoSetup/demo_config_empty.templ
diff --git a/...ing_With_CSR_Demo/DemoSetup/demo_setup.py → ...imulator/CSR_Demo/DemoSetup/demo_setup.py b/...ing_With_CSR_Demo/DemoSetup/demo_setup.py → ...imulator/CSR_Demo/DemoSetup/demo_setup.py
diff --git a/..._Demo/DemoSetup/example_claim_policy.json → ..._Demo/DemoSetup/example_claim_policy.json b/..._Demo/DemoSetup/example_claim_policy.json → ..._Demo/DemoSetup/example_claim_policy.json
diff --git a/.../example_fleet_provisioning_template.json → .../example_fleet_provisioning_template.json b/.../example_fleet_provisioning_template.json → .../example_fleet_provisioning_template.json
diff --git a/...o/DemoSetup/example_iot_thing_policy.json → ...o/DemoSetup/example_iot_thing_policy.json b/...o/DemoSetup/example_iot_thing_policy.json → ...o/DemoSetup/example_iot_thing_policy.json
diff --git a/...SR_Demo/DemoSetup/generate_credentials.py → ...SR_Demo/DemoSetup/generate_credentials.py b/...SR_Demo/DemoSetup/generate_credentials.py → ...SR_Demo/DemoSetup/generate_credentials.py
diff --git a/...h_CSR_Demo/FleetProvisioningDemoExample.c → ...r/CSR_Demo/FleetProvisioningDemoExample.c b/...h_CSR_Demo/FleetProvisioningDemoExample.c → ...r/CSR_Demo/FleetProvisioningDemoExample.c
@@ -291,6 +291,10 @@ static bool prvUnsubscribeFromRegisterThingResponseTopics( void );
 static int prvFleetProvisioningTask( void * pvParameters );
 
 
+/*-----------------------------------------------------------*/
+
+BaseType_t xPlatformIsNetworkUp( void );
+
 /*-----------------------------------------------------------*/
 
 static void prvProvisioningPublishCallback( MQTTContext_t * pxMqttContext,

diff --git a/...isioning_With_CSR_Demo/core_mqtt_config.h → ...ows_Simulator/CSR_Demo/core_mqtt_config.h b/...isioning_With_CSR_Demo/core_mqtt_config.h → ...ows_Simulator/CSR_Demo/core_mqtt_config.h
diff --git a/..._Provisioning_With_CSR_Demo/demo_config.h → ..._Windows_Simulator/CSR_Demo/demo_config.h b/..._Provisioning_With_CSR_Demo/demo_config.h → ..._Windows_Simulator/CSR_Demo/demo_config.h
diff --git a/...With_CSR_Demo/fleet_provisioning_config.h → ...ator/CSR_Demo/fleet_provisioning_config.h b/...With_CSR_Demo/fleet_provisioning_config.h → ...ator/CSR_Demo/fleet_provisioning_config.h
diff --git a/...With_CSR_Demo/fleet_provisioning_demo.sln → ...ator/CSR_Demo/fleet_provisioning_demo.sln b/...With_CSR_Demo/fleet_provisioning_demo.sln → ...ator/CSR_Demo/fleet_provisioning_demo.sln
diff --git a/..._CSR_Demo/fleet_provisioning_demo.vcxproj → .../CSR_Demo/fleet_provisioning_demo.vcxproj b/..._CSR_Demo/fleet_provisioning_demo.vcxproj → .../CSR_Demo/fleet_provisioning_demo.vcxproj
diff --git a/...o/fleet_provisioning_demo.vcxproj.filters → ...o/fleet_provisioning_demo.vcxproj.filters b/...o/fleet_provisioning_demo.vcxproj.filters → ...o/fleet_provisioning_demo.vcxproj.filters
diff --git a/...r/Fleet_Provisioning_With_CSR_Demo/main.c → ...sioning_Windows_Simulator/CSR_Demo/main.c b/...r/Fleet_Provisioning_With_CSR_Demo/main.c → ...sioning_Windows_Simulator/CSR_Demo/main.c
@@ -54,6 +54,7 @@
 /*-----------------------------------------------------------*/
 
 extern void vStartFleetProvisioningDemo( void );
+extern void vPlatformInitIpStack( void );
 
 /*-----------------------------------------------------------*/
 

diff --git a/...sioning_With_CSR_Demo/pkcs11_operations.c → ...ws_Simulator/CSR_Demo/pkcs11_operations.c b/...sioning_With_CSR_Demo/pkcs11_operations.c → ...ws_Simulator/CSR_Demo/pkcs11_operations.c
@@ -214,7 +214,6 @@ bool xGenerateKeyAndCsr( CK_SESSION_HANDLE xP11Session,
     CK_OBJECT_HANDLE xPubKeyHandle;
     CK_RV xPkcs11Ret = CKR_OK;
     mbedtls_pk_context xPrivKey;
-    mbedtls_ecdsa_context xEcdsaContext;
     mbedtls_x509write_csr xReq;
     int32_t ulMbedtlsRet = -1;
     const mbedtls_pk_info_t * pxHeader = mbedtls_pk_info_from_type( MBEDTLS_PK_ECKEY );

diff --git a/...sioning_With_CSR_Demo/pkcs11_operations.h → ...ws_Simulator/CSR_Demo/pkcs11_operations.h b/...sioning_With_CSR_Demo/pkcs11_operations.h → ...ws_Simulator/CSR_Demo/pkcs11_operations.h
diff --git a/...oning_With_CSR_Demo/tinycbor_serializer.c → ..._Simulator/CSR_Demo/tinycbor_serializer.c b/...oning_With_CSR_Demo/tinycbor_serializer.c → ..._Simulator/CSR_Demo/tinycbor_serializer.c
diff --git a/...oning_With_CSR_Demo/tinycbor_serializer.h → ..._Simulator/CSR_Demo/tinycbor_serializer.h b/...oning_With_CSR_Demo/tinycbor_serializer.h → ..._Simulator/CSR_Demo/tinycbor_serializer.h
diff --git a/FreeRTOS-Plus/Demo/AWS/Mqtt_Demo_Helpers/mqtt_demo_helpers.c b/FreeRTOS-Plus/Demo/AWS/Mqtt_Demo_Helpers/mqtt_demo_helpers.c
@@ -801,7 +801,7 @@ BaseType_t xEstablishMqttSession( MQTTContext_t * pxMqttContext,
             }
         }
 
-        if( xReturnStatus == pdFAIL )
+        if( xReturnStatus != pdFAIL )
         {
             /* Keep a flag for indicating if MQTT session is established. This
              * flag will mark that an MQTT DISCONNECT has to be sent at the end

diff --git a/FreeRTOS-Plus/Demo/AWS/Mqtt_Demo_Helpers/mqtt_pkcs11_demo_helpers.c b/FreeRTOS-Plus/Demo/AWS/Mqtt_Demo_Helpers/mqtt_pkcs11_demo_helpers.c
@@ -359,6 +359,10 @@ static MQTTStatus_t prvProcessLoopWithTimeout( MQTTContext_t * pMqttContext,
 
 /*-----------------------------------------------------------*/
 
+extern UBaseType_t uxRand( void );
+
+/*-----------------------------------------------------------*/
+
 static int32_t prvGenerateRandomNumber()
 {
     return( uxRand() & INT32_MAX );
@@ -794,7 +798,7 @@ BaseType_t xEstablishMqttSession( MQTTContext_t * pxMqttContext,
                 }
             }
 
-            if( xReturnStatus == pdFAIL )
+            if( xReturnStatus != pdFAIL )
             {
                 /* Keep a flag for indicating if MQTT session is established. This
                  * flag will mark that an MQTT DISCONNECT has to be sent at the end

diff --git a/FreeRTOS-Plus/Demo/Common/Logging/windows/Logging_WinSim.c b/FreeRTOS-Plus/Demo/Common/Logging/windows/Logging_WinSim.c
@@ -397,7 +397,7 @@ void vLoggingPrintf( const char * pcFormat,
                     pcTarget--;
                 }
 
-                sscanf( pcTarget, "%8X", &ulIPAddress );
+                ( void ) sscanf( pcTarget, "%8X", &ulIPAddress );
                 rc = sprintf( pcTarget, "%lu.%lu.%lu.%lu",
                               ( unsigned long ) ( ulIPAddress >> 24UL ),
                               ( unsigned long ) ( ( ulIPAddress >> 16UL ) & 0xffUL ),
@@ -601,7 +601,7 @@ static void prvLogToFile( const char * pcMessage,
                 remove( pcFullLogFileName );
             }
 
-            rename( pcLogFileName, pcFullLogFileName );
+            ( void ) rename( pcLogFileName, pcFullLogFileName );
             ulSizeOfLoggingFile = 0;
         }
     }

diff --git a/FreeRTOS-Plus/Demo/Common/coreMQTT_Agent_Interface/freertos_command_pool.c b/FreeRTOS-Plus/Demo/Common/coreMQTT_Agent_Interface/freertos_command_pool.c
@@ -41,6 +41,9 @@
 #include "freertos_command_pool.h"
 #include "freertos_agent_message.h"
 
+/* Demo config include. */
+#include "demo_config.h"
+
 /*-----------------------------------------------------------*/
 
 #define QUEUE_NOT_INITIALIZED    ( 0U )