Skip to content

Commit

Permalink
Update MQTT stream submodule pointer (#44)
Browse files Browse the repository at this point in the history
* Update MQTT stream submodule pointer
* Add MQTTFileDownloader_config.h file to every project which make use of MQTT stream.
* Onboard manifest check
  • Loading branch information
chinglee-iot authored Jun 5, 2024
1 parent 2ae6e12 commit a35a007
Show file tree
Hide file tree
Showing 7 changed files with 135 additions and 27 deletions.
24 changes: 19 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
1 change: 1 addition & 0 deletions examples/common/ota/ota_demo.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <stdbool.h>

#include "MQTTFileDownloader.h"
#include "MQTTFileDownloader_defaults.h"

#define OTA_DATA_BLOCK_SIZE mqttFileDownloader_CONFIG_BLOCK_SIZE
#define JOB_DOC_SIZE 2048U
Expand Down
Original file line number Diff line number Diff line change
@@ -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 */
27 changes: 27 additions & 0 deletions examples/evkbmimxrt1060/pubsub/include/MQTTFileDownloader_config.h
Original file line number Diff line number Diff line change
@@ -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 */
27 changes: 27 additions & 0 deletions examples/evkbmimxrt1060/shadow/include/MQTTFileDownloader_config.h
Original file line number Diff line number Diff line change
@@ -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 */
54 changes: 33 additions & 21 deletions manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit a35a007

Please sign in to comment.