From 4bad7a6ba4599e4df63faddd81334db66e3a7f11 Mon Sep 17 00:00:00 2001 From: chinglee-iot <61685396+chinglee-iot@users.noreply.github.com> Date: Sat, 16 Dec 2023 03:35:09 +0800 Subject: [PATCH] Update cellular interface submodule pointer (#1141) --- .../Common/MutualAuthMQTTExample.c | 9 ++++----- FreeRTOS-Plus/Source/FreeRTOS-Cellular-Interface | 2 +- FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/bg96 | 2 +- FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/hl7802 | 2 +- FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/sara-r4 | 2 +- .../FreeRTOS+TCP/plus_tcp_hooks_winsim.c | 6 ++++++ manifest.yml | 8 ++++---- 7 files changed, 18 insertions(+), 13 deletions(-) diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Cellular_Interface_Windows_Simulator/Common/MutualAuthMQTTExample.c b/FreeRTOS-Plus/Demo/FreeRTOS_Cellular_Interface_Windows_Simulator/Common/MutualAuthMQTTExample.c index 9d06bf8995..e79d5bfa70 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_Cellular_Interface_Windows_Simulator/Common/MutualAuthMQTTExample.c +++ b/FreeRTOS-Plus/Demo/FreeRTOS_Cellular_Interface_Windows_Simulator/Common/MutualAuthMQTTExample.c @@ -213,11 +213,6 @@ */ #define mqttexampleTRANSPORT_SEND_RECV_TIMEOUT_MS ( 5000U ) -/** - * @brief Transport timeout in milliseconds for transport send and receive. - */ -#define mqttexampleTRANSPORT_SEND_RECV_TIMEOUT_MS ( 200U ) - /** * @brief The length of the outgoing publish records array used by the coreMQTT * library to track QoS > 0 packet ACKS for outgoing publishes. @@ -404,6 +399,10 @@ static MQTTStatus_t prvProcessLoopWithTimeout( MQTTContext_t * pMqttContext, /*-----------------------------------------------------------*/ +extern UBaseType_t uxRand(); + +/*-----------------------------------------------------------*/ + /** * @brief Static buffer used to hold MQTT messages being sent and received. */ diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Interface b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Interface index e5862bdaf6..4675955e0e 160000 --- a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Interface +++ b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Interface @@ -1 +1 @@ -Subproject commit e5862bdaf6b643840491af8ffeb0a0a366eff665 +Subproject commit 4675955e0eb792b602666bf52a901650768c6d7e diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/bg96 b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/bg96 index c33a3628e0..6761849664 160000 --- a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/bg96 +++ b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/bg96 @@ -1 +1 @@ -Subproject commit c33a3628e015f88df24b21160ba9dbdabc781da1 +Subproject commit 6761849664d2a0c7490c1f226b6f424a1a9c4662 diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/hl7802 b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/hl7802 index 6893670f0f..7d6393a00a 160000 --- a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/hl7802 +++ b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/hl7802 @@ -1 +1 @@ -Subproject commit 6893670f0f4a46c459b2b6e9e4381c53fc92b1b0 +Subproject commit 7d6393a00a0dc64cbaa6cf360c9f01552e34a966 diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/sara-r4 b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/sara-r4 index a2d84ffe95..f536afea36 160000 --- a/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/sara-r4 +++ b/FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/sara-r4 @@ -1 +1 @@ -Subproject commit a2d84ffe95e5eea0f98e53c305b7cef38b3ff6b6 +Subproject commit f536afea36a60b4a159a6646dfff0bb0867c3d03 diff --git a/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/plus_tcp_hooks_winsim.c b/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/plus_tcp_hooks_winsim.c index d3790851ae..9ca4ce30ed 100644 --- a/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/plus_tcp_hooks_winsim.c +++ b/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/plus_tcp_hooks_winsim.c @@ -51,6 +51,10 @@ /*-----------------------------------------------------------*/ +extern UBaseType_t uxRand(); + +/*-----------------------------------------------------------*/ + #if ( ipconfigUSE_LLMNR != 0 ) || ( ipconfigUSE_NBNS != 0 ) || ( ipconfigDHCP_REGISTER_HOSTNAME == 1 ) const char * pcApplicationHostnameHook( void ) @@ -209,6 +213,8 @@ void vPlatformInitIpStack( void ) NetworkInterface_t * pxInterface ); pxLibslirp_FillInterfaceDescriptor( 0, &( xInterfaces[ 0 ] ) ); #else + extern NetworkInterface_t * pxWinPcap_FillInterfaceDescriptor( BaseType_t xEMACIndex, + NetworkInterface_t * pxInterface ); pxWinPcap_FillInterfaceDescriptor( 0, &( xInterfaces[ 0 ] ) ); #endif diff --git a/manifest.yml b/manifest.yml index 95ba2cbf4c..a373d52380 100644 --- a/manifest.yml +++ b/manifest.yml @@ -145,28 +145,28 @@ dependencies: path: "FreeRTOS/Demo/ThirdParty/Partner-Supported-Demos" - name: "FreeRTOS-Cellular-Interface" - version: "e5862bd" + version: "4675955" repository: type: "git" url: "https://github.com/FreeRTOS/FreeRTOS-Cellular-Interface.git" path: "FreeRTOS-Plus/Source/FreeRTOS-Cellular-Interface" - name: "Lab-FreeRTOS-Cellular-Interface-Reference-Quectel-BG96" - version: "c33a362" + version: "6761849" repository: type: "git" url: "https://github.com/FreeRTOS/Lab-FreeRTOS-Cellular-Interface-Reference-Quectel-BG96.git" path: "FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/bg96" - name: "Lab-FreeRTOS-Cellular-Interface-Reference-Sierra-Wireless-HL7802" - version: "6893670" + version: "7d6393a" repository: type: "git" url: "https://github.com/FreeRTOS/Lab-FreeRTOS-Cellular-Interface-Reference-Sierra-Wireless-HL7802.git" path: "FreeRTOS-Plus/Source/FreeRTOS-Cellular-Modules/hl7802" - name: "Lab-FreeRTOS-Cellular-Interface-Reference-ublox-SARA-R4" - version: "a2d84ff" + version: "f536afe" repository: type: "git" url: "https://github.com/FreeRTOS/Lab-FreeRTOS-Cellular-Interface-Reference-ublox-SARA-R4.git"