From a35a00717e1e82dfc0c03f29032f5b226a3fd41d Mon Sep 17 00:00:00 2001 From: chinglee-iot <61685396+chinglee-iot@users.noreply.github.com> Date: Wed, 5 Jun 2024 17:40:24 +0800 Subject: [PATCH] Update MQTT stream submodule pointer (#44) * Update MQTT stream submodule pointer * Add MQTTFileDownloader_config.h file to every project which make use of MQTT stream. * Onboard manifest check --- .github/workflows/ci.yml | 24 +++++++-- Middleware/AWS/mqtt-stream | 2 +- examples/common/ota/ota_demo.h | 1 + .../include/MQTTFileDownloader_config.h | 27 ++++++++++ .../include/MQTTFileDownloader_config.h | 27 ++++++++++ .../include/MQTTFileDownloader_config.h | 27 ++++++++++ manifest.yml | 54 +++++++++++-------- 7 files changed, 135 insertions(+), 27 deletions(-) create mode 100644 examples/evkbmimxrt1060/defender/include/MQTTFileDownloader_config.h create mode 100644 examples/evkbmimxrt1060/pubsub/include/MQTTFileDownloader_config.h create mode 100644 examples/evkbmimxrt1060/shadow/include/MQTTFileDownloader_config.h diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5e78d1..df81448 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone This Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run spellings check uses: FreeRTOS/CI-CD-Github-Actions/spellings@main with: @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone This Repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Run link verifier uses: FreeRTOS/CI-CD-Github-Actions/link-verifier@main with: @@ -32,7 +32,7 @@ jobs: formatting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install Uncrustify run: sudo apt-get install uncrustify - name: Run Uncrustify @@ -59,9 +59,9 @@ jobs: git-secrets: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Checkout awslabs/git-secrets - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: awslabs/git-secrets ref: master @@ -72,3 +72,17 @@ jobs: run: | git-secrets --register-aws git-secrets --scan + + verify-manifest: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + submodules: true + fetch-depth: 0 + + - name: Run manifest verifier + uses: FreeRTOS/CI-CD-GitHub-Actions/manifest-verifier@main + with: + path: ./ + fail-on-incorrect-version: true \ No newline at end of file diff --git a/Middleware/AWS/mqtt-stream b/Middleware/AWS/mqtt-stream index 2bd5fca..690fb2b 160000 --- a/Middleware/AWS/mqtt-stream +++ b/Middleware/AWS/mqtt-stream @@ -1 +1 @@ -Subproject commit 2bd5fca06751f167061bfb45c841fb2bab924d5d +Subproject commit 690fb2bd10020da916fe54f3e8c59f1e3f925e44 diff --git a/examples/common/ota/ota_demo.h b/examples/common/ota/ota_demo.h index e3b2ad8..80f8438 100644 --- a/examples/common/ota/ota_demo.h +++ b/examples/common/ota/ota_demo.h @@ -14,6 +14,7 @@ #include #include "MQTTFileDownloader.h" +#include "MQTTFileDownloader_defaults.h" #define OTA_DATA_BLOCK_SIZE mqttFileDownloader_CONFIG_BLOCK_SIZE #define JOB_DOC_SIZE 2048U diff --git a/examples/evkbmimxrt1060/defender/include/MQTTFileDownloader_config.h b/examples/evkbmimxrt1060/defender/include/MQTTFileDownloader_config.h new file mode 100644 index 0000000..6d7a256 --- /dev/null +++ b/examples/evkbmimxrt1060/defender/include/MQTTFileDownloader_config.h @@ -0,0 +1,27 @@ +/* + * AWS IoT Core MQTT File Streams Embedded C v1.1.0 + * Copyright (C) 2023 Amazon.com, Inc. and its affiliates. All Rights Reserved. + * SPDX-License-Identifier: MIT + * + * Licensed under the MIT License. See the LICENSE accompanying this file + * for the specific language governing permissions and limitations under + * the License. + */ + +/** + * @file MQTTFileDownloader_config.h + * @brief Configs for MQTT stream. + */ + +#ifndef MQTT_FILE_DOWNLOADER_CONFIG_H +#define MQTT_FILE_DOWNLOADER_CONFIG_H + +/** + * Configure the Maximum size of the data payload. The smallest value is 256 bytes, + * maximum is 128KB. + */ +#ifndef mqttFileDownloader_CONFIG_BLOCK_SIZE +#define mqttFileDownloader_CONFIG_BLOCK_SIZE 512U +#endif + +#endif /* #ifndef MQTT_FILE_DOWNLOADER_DEFAULT_H */ diff --git a/examples/evkbmimxrt1060/pubsub/include/MQTTFileDownloader_config.h b/examples/evkbmimxrt1060/pubsub/include/MQTTFileDownloader_config.h new file mode 100644 index 0000000..6d7a256 --- /dev/null +++ b/examples/evkbmimxrt1060/pubsub/include/MQTTFileDownloader_config.h @@ -0,0 +1,27 @@ +/* + * AWS IoT Core MQTT File Streams Embedded C v1.1.0 + * Copyright (C) 2023 Amazon.com, Inc. and its affiliates. All Rights Reserved. + * SPDX-License-Identifier: MIT + * + * Licensed under the MIT License. See the LICENSE accompanying this file + * for the specific language governing permissions and limitations under + * the License. + */ + +/** + * @file MQTTFileDownloader_config.h + * @brief Configs for MQTT stream. + */ + +#ifndef MQTT_FILE_DOWNLOADER_CONFIG_H +#define MQTT_FILE_DOWNLOADER_CONFIG_H + +/** + * Configure the Maximum size of the data payload. The smallest value is 256 bytes, + * maximum is 128KB. + */ +#ifndef mqttFileDownloader_CONFIG_BLOCK_SIZE +#define mqttFileDownloader_CONFIG_BLOCK_SIZE 512U +#endif + +#endif /* #ifndef MQTT_FILE_DOWNLOADER_DEFAULT_H */ diff --git a/examples/evkbmimxrt1060/shadow/include/MQTTFileDownloader_config.h b/examples/evkbmimxrt1060/shadow/include/MQTTFileDownloader_config.h new file mode 100644 index 0000000..6d7a256 --- /dev/null +++ b/examples/evkbmimxrt1060/shadow/include/MQTTFileDownloader_config.h @@ -0,0 +1,27 @@ +/* + * AWS IoT Core MQTT File Streams Embedded C v1.1.0 + * Copyright (C) 2023 Amazon.com, Inc. and its affiliates. All Rights Reserved. + * SPDX-License-Identifier: MIT + * + * Licensed under the MIT License. See the LICENSE accompanying this file + * for the specific language governing permissions and limitations under + * the License. + */ + +/** + * @file MQTTFileDownloader_config.h + * @brief Configs for MQTT stream. + */ + +#ifndef MQTT_FILE_DOWNLOADER_CONFIG_H +#define MQTT_FILE_DOWNLOADER_CONFIG_H + +/** + * Configure the Maximum size of the data payload. The smallest value is 256 bytes, + * maximum is 128KB. + */ +#ifndef mqttFileDownloader_CONFIG_BLOCK_SIZE +#define mqttFileDownloader_CONFIG_BLOCK_SIZE 512U +#endif + +#endif /* #ifndef MQTT_FILE_DOWNLOADER_DEFAULT_H */ diff --git a/manifest.yml b/manifest.yml index 4566d28..10d49d9 100644 --- a/manifest.yml +++ b/manifest.yml @@ -8,96 +8,108 @@ dependencies: repository: type: "git" url: "https://github.com/FreeRTOS/FreeRTOS-Kernel.git" - path: "/Middleware/FreeRTOS/kernel" + path: "Middleware/FreeRTOS/kernel" - name: "coreJSON" version: "v3.2.0" repository: type: "git" url: "https://github.com/FreeRTOS/coreJSON.git" - path: "/Middleware/FreeRTOS/coreJSON" + path: "Middleware/FreeRTOS/coreJSON" - name: "coreMQTT" version: "v2.1.1" repository: type: "git" url: "https://github.com/FreeRTOS/coreMQTT.git" - path: "/Middleware/FreeRTOS/coreMQTT" + path: "Middleware/FreeRTOS/coreMQTT" - name: "corePKCS11" version: "v3.5.0" repository: type: "git" url: "https://github.com/FreeRTOS/corePKCS11.git" - path: "/Middleware/FreeRTOS/corePKCS11" + path: "Middleware/FreeRTOS/corePKCS11" - name: "backoffAlgorithm" version: "v1.3.0" repository: type: "git" url: "https://github.com/FreeRTOS/backoffAlgorithm" - path: "/Middleware/FreeRTOS/backoffAlgorithm" + path: "Middleware/FreeRTOS/backoffAlgorithm" - name: "coreMQTT-Agent" version: "v1.2.0" repository: type: "git" url: "https://github.com/FreeRTOS/coreMQTT-Agent.git" - path: "/Middleware/FreeRTOS/coreMQTT-Agent" + path: "Middleware/FreeRTOS/coreMQTT-Agent" - name: "device-defender" version: "v1.3.0" repository: type: "git" url: "https://github.com/aws/Device-Defender-for-AWS-IoT-embedded-sdk.git" - path: "/Middleware/AWS/device-defender" - - name: "ota" - version: "v3.4.0" - repository: - type: "git" - url: "https://github.com/aws/ota-for-AWS-IoT-embedded-sdk.git" - path: "/Middleware/AWS/ota" + path: "Middleware/AWS/device-defender" - name: "device-shadow" version: "v1.3.0" repository: type: "git" url: "https://github.com/aws/Device-Shadow-for-AWS-IoT-embedded-sdk.git" - path: "/Middleware/AWS/device-shadow" + path: "Middleware/AWS/device-shadow" - name: "mcux-sdk" version: "MCUX_2.10.0" repository: type: "git" url: "https://github.com/NXPmicro/mcux-sdk.git" - path: "/core" + path: "core" - name: "lwip" version: "STABLE-2_1_2_RELEASE" repository: type: "git" url: "https://github.com/lwip-tcpip/lwip.git" - path: "/Middleware/lwip" + path: "Middleware/lwip" - name: "mbedtls" version: "v2.26.0" repository: type: "git" url: "https://github.com/Mbed-TLS/mbedtls.git" - path: "/Middleware/mbedtls" + path: "Middleware/mbedtls" - name: "mcuboot" version: "v1.7.2" repository: type: "git" url: "https://github.com/mcu-tools/mcuboot.git" - path: "/Middleware/mcuboot" + path: "Middleware/mcuboot" - name: "tinycbor" version: "v0.6.0" repository: type: "git" url: "https://github.com/intel/tinycbor.git" - path: "/Middleware/tinycbor" + path: "Middleware/tinycbor" - name: "unity" version: "db878ccaedaea3d07b3c5443a00d131ecacd30b3" repository: type: "git" url: "https://github.com/ThrowTheSwitch/Unity.git" - path: "/Middleware/unity" + path: "Middleware/unity" - name: "FreeRTOS-Libraries-Integration-Tests" version: "202210.01" repository: type: "git" url: "https://github.com/FreeRTOS/FreeRTOS-Libraries-Integration-Tests" - path: "/Middleware/FreeRTOS/tests" + path: "Middleware/FreeRTOS/tests" + - name: "aws-iot-core-mqtt-file-streams-embedded-c" + version: "690fb2b" + repository: + type: "git" + url: "https://github.com/aws/aws-iot-core-mqtt-file-streams-embedded-c" + path: "Middleware/AWS/mqtt-stream" + - name: "pkcs11" + version: "v2.40_errata01" + repository: + type: "git" + url: "https://github.com/amazon-freertos/pkcs11.git" + path: "Middleware/FreeRTOS/pkcs11" + - name: "Jobs-for-AWS-IoT-embedded-sdk" + version: "05f2afa" + repository: + type: "git" + url: "https://github.com/aws/Jobs-for-AWS-IoT-embedded-sdk.git" + path: "Middleware/AWS/jobs" license: "MIT"