From fda472bbd69f54bb230533ae7b0e36e3b0692b78 Mon Sep 17 00:00:00 2001 From: Dakshit Babbar <100972343+DakshitBabbar@users.noreply.github.com> Date: Thu, 6 Mar 2025 11:08:38 +0530 Subject: [PATCH] Update the coreMQTT submodule pointer (#1331) * Update the coreMQTT submodule pointer * [coreMQTT Version Update] Include core_mqtt_config.h in mqtt helper files * Update the coreMQTT-Agent Submodule pointer to the updated fork branch * Update manifest.yml file * Add readme for OTA demos transitioning * Update the pointer to coreMQTT-Agent to the upstream main and update manifest file * Update manifest file --------- Co-authored-by: Rahul Kar <118818625+kar-rahul-aws@users.noreply.github.com> --- .../Demo/AWS/Mqtt_Demo_Helpers/mqtt_pkcs11_demo_helpers.c | 1 + FreeRTOS-Plus/Demo/AWS/Ota_Windows_Simulator/README.md | 5 +++++ FreeRTOS-Plus/Source/Application-Protocols/coreMQTT | 2 +- FreeRTOS-Plus/Source/Application-Protocols/coreMQTT-Agent | 2 +- FreeRTOS-Plus/Source/corePKCS11 | 2 +- manifest.yml | 6 +++--- 6 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 FreeRTOS-Plus/Demo/AWS/Ota_Windows_Simulator/README.md 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 index e284a5df02..9458b3dabc 100644 --- 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 @@ -49,6 +49,7 @@ /* MQTT library includes. */ #include "core_mqtt.h" +#include "core_mqtt_config.h" /* Exponential backoff retry include. */ #include "backoff_algorithm.h" diff --git a/FreeRTOS-Plus/Demo/AWS/Ota_Windows_Simulator/README.md b/FreeRTOS-Plus/Demo/AWS/Ota_Windows_Simulator/README.md new file mode 100644 index 0000000000..eced4ae024 --- /dev/null +++ b/FreeRTOS-Plus/Demo/AWS/Ota_Windows_Simulator/README.md @@ -0,0 +1,5 @@ +## Over The Air Updates Demo + +These demos demonstrate how to use the [AWS IoT Over the Air update library](https://github.com/aws/ota-for-aws-iot-embedded-sdk/tree/main) for carrying out over the air updates using MQTT and HTTP protocols for file transfer. + +**Note:** We recommend transitioning to the [new modular and composable OTA approach](https://freertos.org/Documentation/03-Libraries/07-Modular-over-the-air-updates/01-Over-the-air-updates) instead. To get started, see the new [OTA reference demo](https://github.com/FreeRTOS/Lab-Project-ota-example-for-AWS-IoT-Core?tab=readme-ov-file). diff --git a/FreeRTOS-Plus/Source/Application-Protocols/coreMQTT b/FreeRTOS-Plus/Source/Application-Protocols/coreMQTT index 238350a844..86a5750bb3 160000 --- a/FreeRTOS-Plus/Source/Application-Protocols/coreMQTT +++ b/FreeRTOS-Plus/Source/Application-Protocols/coreMQTT @@ -1 +1 @@ -Subproject commit 238350a844336c6dea7e3aa50ecab729bf27e288 +Subproject commit 86a5750bb31e05fa69ef3f4e2f5e69d9317fae44 diff --git a/FreeRTOS-Plus/Source/Application-Protocols/coreMQTT-Agent b/FreeRTOS-Plus/Source/Application-Protocols/coreMQTT-Agent index d3668a69bf..a74d35a522 160000 --- a/FreeRTOS-Plus/Source/Application-Protocols/coreMQTT-Agent +++ b/FreeRTOS-Plus/Source/Application-Protocols/coreMQTT-Agent @@ -1 +1 @@ -Subproject commit d3668a69bff0487f8964ad1de0fea0799ffe407c +Subproject commit a74d35a522ae55127ef345fde79368e249144626 diff --git a/FreeRTOS-Plus/Source/corePKCS11 b/FreeRTOS-Plus/Source/corePKCS11 index 59875a9aa3..44fee0545d 160000 --- a/FreeRTOS-Plus/Source/corePKCS11 +++ b/FreeRTOS-Plus/Source/corePKCS11 @@ -1 +1 @@ -Subproject commit 59875a9aa3f08a95eb8cdc0ba345b38dc49134ab +Subproject commit 44fee0545d5bcaf6b4a106b8d17a69b9830e04f8 diff --git a/manifest.yml b/manifest.yml index 5df3878105..182126d147 100644 --- a/manifest.yml +++ b/manifest.yml @@ -40,21 +40,21 @@ dependencies: path: "FreeRTOS-Plus/Source/Application-Protocols/coreHTTP" - name: "coreMQTT" - version: "238350a" + version: "86a5750" repository: type: "git" url: "https://github.com/FreeRTOS/coreMQTT.git" path: "FreeRTOS-Plus/Source/Application-Protocols/coreMQTT" - name: "coreMQTT Agent" - version: "d3668a6" + version: "a74d35a" repository: type: "git" url: "https://github.com/FreeRTOS/coreMQTT-Agent.git" path: "FreeRTOS-Plus/Source/Application-Protocols/coreMQTT-Agent" - name: "corePKCS11" - version: "59875a9" + version: "44fee05" repository: type: "git" url: "https://github.com/FreeRTOS/corePKCS11.git"