diff --git a/Middleware/AWS/device-defender b/Middleware/AWS/device-defender index 9896700..7059e19 160000 --- a/Middleware/AWS/device-defender +++ b/Middleware/AWS/device-defender @@ -1 +1 @@ -Subproject commit 989670043d46dc104477957cdc0ce263218dae0a +Subproject commit 7059e199149a540471b484b710a51fc665636f22 diff --git a/Middleware/AWS/device-shadow b/Middleware/AWS/device-shadow index 250821f..268a5a2 160000 --- a/Middleware/AWS/device-shadow +++ b/Middleware/AWS/device-shadow @@ -1 +1 @@ -Subproject commit 250821f043d2d080547270b43f01d53c7d52640a +Subproject commit 268a5a276d3c3f451575b5a042b4e8ad53f134b6 diff --git a/Middleware/AWS/jobs b/Middleware/AWS/jobs index 05f2afa..3ce91f5 160000 --- a/Middleware/AWS/jobs +++ b/Middleware/AWS/jobs @@ -1 +1 @@ -Subproject commit 05f2afaa83f92b82321206ba0f2a71d98b6ea47b +Subproject commit 3ce91f56427653705891a8668568cb247b97905f diff --git a/Middleware/AWS/mqtt-stream b/Middleware/AWS/mqtt-stream index 690fb2b..05ff5dc 160000 --- a/Middleware/AWS/mqtt-stream +++ b/Middleware/AWS/mqtt-stream @@ -1 +1 @@ -Subproject commit 690fb2bd10020da916fe54f3e8c59f1e3f925e44 +Subproject commit 05ff5dc55a8591360664557f78ae1d71d696d201 diff --git a/Middleware/FreeRTOS/backoffAlgorithm b/Middleware/FreeRTOS/backoffAlgorithm index 8818bed..3cc0bf8 160000 --- a/Middleware/FreeRTOS/backoffAlgorithm +++ b/Middleware/FreeRTOS/backoffAlgorithm @@ -1 +1 @@ -Subproject commit 8818bed40e57215fda8efa4b7fd33f7ae2c80d65 +Subproject commit 3cc0bf8c4d41d7cd7aa2f1ded5075c87bf6b2bbb diff --git a/Middleware/FreeRTOS/coreJSON b/Middleware/FreeRTOS/coreJSON index 5b31f4c..e3b7663 160000 --- a/Middleware/FreeRTOS/coreJSON +++ b/Middleware/FreeRTOS/coreJSON @@ -1 +1 @@ -Subproject commit 5b31f4c37a034911a4992fd415f8177a75014946 +Subproject commit e3b7663f6392d8c10e8db57506ec37e4801b145a diff --git a/Middleware/FreeRTOS/coreMQTT b/Middleware/FreeRTOS/coreMQTT index 6d5641b..3f4cedc 160000 --- a/Middleware/FreeRTOS/coreMQTT +++ b/Middleware/FreeRTOS/coreMQTT @@ -1 +1 @@ -Subproject commit 6d5641b8a2f410470134d9bfe8ee71e3d83a565e +Subproject commit 3f4cedc1ad027d76b2f00c2f83481b212b7a8632 diff --git a/Middleware/FreeRTOS/corePKCS11 b/Middleware/FreeRTOS/corePKCS11 index 781f577..a923b21 160000 --- a/Middleware/FreeRTOS/corePKCS11 +++ b/Middleware/FreeRTOS/corePKCS11 @@ -1 +1 @@ -Subproject commit 781f5774948fa8e6427be544b1bf1ad512ae9e90 +Subproject commit a923b213d33c6538e92ba3c7971b2d859f881afb diff --git a/Middleware/FreeRTOS/kernel b/Middleware/FreeRTOS/kernel index def7d2d..dbf7055 160000 --- a/Middleware/FreeRTOS/kernel +++ b/Middleware/FreeRTOS/kernel @@ -1 +1 @@ -Subproject commit def7d2df2b0506d3d249334974f51e427c17a41c +Subproject commit dbf70559b27d39c1fdb68dfb9a32140b6a6777a0 diff --git a/Middleware/FreeRTOS/mqtt-agent-interface/freertos_command_pool.c b/Middleware/FreeRTOS/mqtt-agent-interface/freertos_command_pool.c index 584b508..7e97cf3 100644 --- a/Middleware/FreeRTOS/mqtt-agent-interface/freertos_command_pool.c +++ b/Middleware/FreeRTOS/mqtt-agent-interface/freertos_command_pool.c @@ -37,6 +37,9 @@ #include "FreeRTOS.h" #include "semphr.h" +/* Demo Specific configs. */ +#include "core_mqtt_config.h" + /* Header include. */ #include "freertos_command_pool.h" #include "freertos_agent_message.h" diff --git a/Middleware/FreeRTOS/tests b/Middleware/FreeRTOS/tests index 4ec8241..692d509 160000 --- a/Middleware/FreeRTOS/tests +++ b/Middleware/FreeRTOS/tests @@ -1 +1 @@ -Subproject commit 4ec8241acf2beede601d230f9bd51636df60e240 +Subproject commit 692d509221b7f71d42551ed6c7b8a524b039a44f diff --git a/examples/common/mqtt_agent/mqtt_agent_task.c b/examples/common/mqtt_agent/mqtt_agent_task.c index d03bbd8..999c7e3 100644 --- a/examples/common/mqtt_agent/mqtt_agent_task.c +++ b/examples/common/mqtt_agent/mqtt_agent_task.c @@ -66,6 +66,8 @@ #include "core_pkcs11_config.h" +#include "core_mqtt_config.h" + /* MQTT library includes. */ #include "core_mqtt.h" diff --git a/examples/evkbmimxrt1060/bootloader/signing_key.pem b/examples/evkbmimxrt1060/bootloader/signing_key.pem deleted file mode 100644 index 5bcfb0a..0000000 --- a/examples/evkbmimxrt1060/bootloader/signing_key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDHhtP0f/G6/aRj -TzMTNZqh3DeHaZaNtSuCpjdsIG1zKDY9joGWheW4ki3Ys3uMNnTfQloryXGi0sXV -fWgCipHUNyhiFhDM8NyUGErHdKRijTJLsia9FH9QygPyjBt1RTa2F705BS6g3auq -rY+b5mpKvM7EI+lkvvsqmTJ35IMuocWJ230r0SvfzO6v7mC+qOsI5NAkVrPmfdnw -7JSJtgGuZufH06Gg0ZbXhhqRDPXae9LafdsjQtphwb8uviZHzsrX6LbCjm+o/O5T -KB6fMm+VqSeKPLTMynCnTcK+JCtSoeAkIO1SYKtq/p+PPPL5V+14xFOdwYhKVqiu -1Cs6JYlpAgMBAAECggEAPvlGd3JUTLTWSAPMtoDiI7j6C7KfMm2eZHdqoaVgdgqY -h/gs3WG4XfdBIhaP5XKgk4CBLjW/uGi2yQlyJO8wVJ7uD3swZUaWD+XU4Dvn0DUJ -TUvWnzHTdx+zfD+NQQeN244FinQgweQE1PM/krB4FsudpNlCxini4xCEFcQZRUN5 -lBtd1RFBh+ftub/hltR5v6JywQVHih53+aqhLF6Dh8mBN5hS7GemA9/Ktb0SmT6n -OArqdKjo6oOMGyTCbbLSagCsZVJToaMglP29SdE5zpAwXzqV9HciPmN3rgLJPnir -gBcVgtoOedzM4x8nJINrDGDj64caFQVily4inPEpcwKBgQD0ukM+FYdY+IPHrnoo -jWs8kMVZkwKVkfY81hsqL0RMzt9Adqsb0Pewtgl/TO3av4zdi0qSy3FKb7kQZoh7 -mhvczczX0YUUP/MmU1f3sK1T3sd9mPmaqBCPTvUFFbJTKM5GuQQfiHr/tuUEEXNR -vNnFzFm/QqhJ9ZMPjIe13U/wWwKBgQDQt5Kg18+mGUyie6UgfSg2sfFuMgeefT+A -Vx1YxDRbne2inN1EhgM39qEtgvvozB4GtUxDsEZG80WilsR7xbyuWkUUU8kE00lb -LzE17mVhORNE8hkZuNb7Fnh19Jp5FztoJp7RHmPedc/yMGp7nCSndmgJ5Uyyc4nW -CAVPGZiYiwKBgQDnpY+UqqgszT9fuYWj8Qi6kYZcXU0q6ribqUaZTZhm48JqsGkS -sWBjAkxHFThnwLzDz99MyAl6nfoczhEOfjc1cBAfkRFYs5eihW1U5QWLx+ootq49 -eCwEmoZOw9TB5nQqeWKvvm4+so5gpWv0yL+R/PZOlffZ2fvT0f97Y/sQ1QKBgAka -6QehQorBcclo0XRQYW+5ZYnkHtb4KcwEgOA9dvdENXixlSmHGx7W4IMmwqyOMwUh -5ZjSWM6BkFkecKXho3CLuZXAbfWK7hlPPrtWkg+iuMd6NEQd/yrm+QxURmTf8ZSC -ks0WoU60HwU2vX50+lhf3vwHh8gFKE8w/GJOAI0vAoGAX5xjZVoogGpsoWB/aGyB -cD4Sb9QT3c1w4UFahJnS3wlLvlag/0K5CT+hWJTZBM3r/H2UPMJOdvlzD4/cxJKP -0sqE/HKqnnPa+xeDx+yor3GnwRPClw03LkNzx1Tsc8RqoZ84K0HsX/o44mlWCmji -1/GPqY9vrOm4uchZOsPcYJU= ------END PRIVATE KEY----- diff --git a/examples/evkbmimxrt1060/bootloader/signing_pub_key.c b/examples/evkbmimxrt1060/bootloader/signing_pub_key.c deleted file mode 100644 index c4ceef3..0000000 --- a/examples/evkbmimxrt1060/bootloader/signing_pub_key.c +++ /dev/null @@ -1,39 +0,0 @@ -/* Autogenerated by imgtool.py, do not edit. */ -const unsigned char rsa_pub_key[] = -{ - 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, - 0x00, 0xc7, 0x86, 0xd3, 0xf4, 0x7f, 0xf1, 0xba, - 0xfd, 0xa4, 0x63, 0x4f, 0x33, 0x13, 0x35, 0x9a, - 0xa1, 0xdc, 0x37, 0x87, 0x69, 0x96, 0x8d, 0xb5, - 0x2b, 0x82, 0xa6, 0x37, 0x6c, 0x20, 0x6d, 0x73, - 0x28, 0x36, 0x3d, 0x8e, 0x81, 0x96, 0x85, 0xe5, - 0xb8, 0x92, 0x2d, 0xd8, 0xb3, 0x7b, 0x8c, 0x36, - 0x74, 0xdf, 0x42, 0x5a, 0x2b, 0xc9, 0x71, 0xa2, - 0xd2, 0xc5, 0xd5, 0x7d, 0x68, 0x02, 0x8a, 0x91, - 0xd4, 0x37, 0x28, 0x62, 0x16, 0x10, 0xcc, 0xf0, - 0xdc, 0x94, 0x18, 0x4a, 0xc7, 0x74, 0xa4, 0x62, - 0x8d, 0x32, 0x4b, 0xb2, 0x26, 0xbd, 0x14, 0x7f, - 0x50, 0xca, 0x03, 0xf2, 0x8c, 0x1b, 0x75, 0x45, - 0x36, 0xb6, 0x17, 0xbd, 0x39, 0x05, 0x2e, 0xa0, - 0xdd, 0xab, 0xaa, 0xad, 0x8f, 0x9b, 0xe6, 0x6a, - 0x4a, 0xbc, 0xce, 0xc4, 0x23, 0xe9, 0x64, 0xbe, - 0xfb, 0x2a, 0x99, 0x32, 0x77, 0xe4, 0x83, 0x2e, - 0xa1, 0xc5, 0x89, 0xdb, 0x7d, 0x2b, 0xd1, 0x2b, - 0xdf, 0xcc, 0xee, 0xaf, 0xee, 0x60, 0xbe, 0xa8, - 0xeb, 0x08, 0xe4, 0xd0, 0x24, 0x56, 0xb3, 0xe6, - 0x7d, 0xd9, 0xf0, 0xec, 0x94, 0x89, 0xb6, 0x01, - 0xae, 0x66, 0xe7, 0xc7, 0xd3, 0xa1, 0xa0, 0xd1, - 0x96, 0xd7, 0x86, 0x1a, 0x91, 0x0c, 0xf5, 0xda, - 0x7b, 0xd2, 0xda, 0x7d, 0xdb, 0x23, 0x42, 0xda, - 0x61, 0xc1, 0xbf, 0x2e, 0xbe, 0x26, 0x47, 0xce, - 0xca, 0xd7, 0xe8, 0xb6, 0xc2, 0x8e, 0x6f, 0xa8, - 0xfc, 0xee, 0x53, 0x28, 0x1e, 0x9f, 0x32, 0x6f, - 0x95, 0xa9, 0x27, 0x8a, 0x3c, 0xb4, 0xcc, 0xca, - 0x70, 0xa7, 0x4d, 0xc2, 0xbe, 0x24, 0x2b, 0x52, - 0xa1, 0xe0, 0x24, 0x20, 0xed, 0x52, 0x60, 0xab, - 0x6a, 0xfe, 0x9f, 0x8f, 0x3c, 0xf2, 0xf9, 0x57, - 0xed, 0x78, 0xc4, 0x53, 0x9d, 0xc1, 0x88, 0x4a, - 0x56, 0xa8, 0xae, 0xd4, 0x2b, 0x3a, 0x25, 0x89, - 0x69, 0x02, 0x03, 0x01, 0x00, 0x01, -}; -const unsigned int rsa_pub_key_len = 270; diff --git a/examples/evkbmimxrt1060/defender/include/FreeRTOSConfig.h b/examples/evkbmimxrt1060/defender/include/FreeRTOSConfig.h index 2629dd3..1fee882 100644 --- a/examples/evkbmimxrt1060/defender/include/FreeRTOSConfig.h +++ b/examples/evkbmimxrt1060/defender/include/FreeRTOSConfig.h @@ -76,6 +76,9 @@ extern void vLoggingPrintf( const char * pcFormat, #define configOVERRIDE_DEFAULT_TICK_CONFIGURATION 0 #define configRECORD_STACK_HIGH_ADDRESS 1 +/* Task notification settings. */ +#define configTASK_NOTIFICATION_ARRAY_ENTRIES ( 4 ) + /* Co-routine definitions. */ #define configUSE_CO_ROUTINES 0 #define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) diff --git a/examples/evkbmimxrt1060/shadow/include/FreeRTOSConfig.h b/examples/evkbmimxrt1060/shadow/include/FreeRTOSConfig.h index 2629dd3..1fee882 100644 --- a/examples/evkbmimxrt1060/shadow/include/FreeRTOSConfig.h +++ b/examples/evkbmimxrt1060/shadow/include/FreeRTOSConfig.h @@ -76,6 +76,9 @@ extern void vLoggingPrintf( const char * pcFormat, #define configOVERRIDE_DEFAULT_TICK_CONFIGURATION 0 #define configRECORD_STACK_HIGH_ADDRESS 1 +/* Task notification settings. */ +#define configTASK_NOTIFICATION_ARRAY_ENTRIES ( 4 ) + /* Co-routine definitions. */ #define configUSE_CO_ROUTINES 0 #define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) diff --git a/examples/evkbmimxrt1060/test/include/FreeRTOSConfig.h b/examples/evkbmimxrt1060/test/include/FreeRTOSConfig.h index 2629dd3..1fee882 100644 --- a/examples/evkbmimxrt1060/test/include/FreeRTOSConfig.h +++ b/examples/evkbmimxrt1060/test/include/FreeRTOSConfig.h @@ -76,6 +76,9 @@ extern void vLoggingPrintf( const char * pcFormat, #define configOVERRIDE_DEFAULT_TICK_CONFIGURATION 0 #define configRECORD_STACK_HIGH_ADDRESS 1 +/* Task notification settings. */ +#define configTASK_NOTIFICATION_ARRAY_ENTRIES ( 4 ) + /* Co-routine definitions. */ #define configUSE_CO_ROUTINES 0 #define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) diff --git a/examples/evkbmimxrt1060/test/include/MQTTFileDownloader_config.h b/examples/evkbmimxrt1060/test/include/MQTTFileDownloader_config.h new file mode 100644 index 0000000..6d7a256 --- /dev/null +++ b/examples/evkbmimxrt1060/test/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 10d49d9..958f3eb 100644 --- a/manifest.yml +++ b/manifest.yml @@ -4,31 +4,31 @@ description: |- "Reference IoT integration project using NXP i.MX RT1060 with EdgeLock® SE050 secure element and FreeRTOS LTS libraries" dependencies: - name: "FreeRTOS-Kernel" - version: "V10.5.1" + version: "V11.1.0" repository: type: "git" url: "https://github.com/FreeRTOS/FreeRTOS-Kernel.git" path: "Middleware/FreeRTOS/kernel" - name: "coreJSON" - version: "v3.2.0" + version: "v3.3.0" repository: type: "git" url: "https://github.com/FreeRTOS/coreJSON.git" path: "Middleware/FreeRTOS/coreJSON" - name: "coreMQTT" - version: "v2.1.1" + version: "v2.3.0" repository: type: "git" url: "https://github.com/FreeRTOS/coreMQTT.git" path: "Middleware/FreeRTOS/coreMQTT" - name: "corePKCS11" - version: "v3.5.0" + version: "v3.6.1" repository: type: "git" url: "https://github.com/FreeRTOS/corePKCS11.git" path: "Middleware/FreeRTOS/corePKCS11" - name: "backoffAlgorithm" - version: "v1.3.0" + version: "v1.4.1" repository: type: "git" url: "https://github.com/FreeRTOS/backoffAlgorithm" @@ -40,13 +40,13 @@ dependencies: url: "https://github.com/FreeRTOS/coreMQTT-Agent.git" path: "Middleware/FreeRTOS/coreMQTT-Agent" - name: "device-defender" - version: "v1.3.0" + version: "v1.4.0" repository: type: "git" url: "https://github.com/aws/Device-Defender-for-AWS-IoT-embedded-sdk.git" path: "Middleware/AWS/device-defender" - name: "device-shadow" - version: "v1.3.0" + version: "v1.4.1" repository: type: "git" url: "https://github.com/aws/Device-Shadow-for-AWS-IoT-embedded-sdk.git" @@ -88,13 +88,13 @@ dependencies: url: "https://github.com/ThrowTheSwitch/Unity.git" path: "Middleware/unity" - name: "FreeRTOS-Libraries-Integration-Tests" - version: "202210.01" + version: "692d509" repository: type: "git" url: "https://github.com/FreeRTOS/FreeRTOS-Libraries-Integration-Tests" path: "Middleware/FreeRTOS/tests" - name: "aws-iot-core-mqtt-file-streams-embedded-c" - version: "690fb2b" + version: "v1.1.0" repository: type: "git" url: "https://github.com/aws/aws-iot-core-mqtt-file-streams-embedded-c" @@ -106,7 +106,7 @@ dependencies: url: "https://github.com/amazon-freertos/pkcs11.git" path: "Middleware/FreeRTOS/pkcs11" - name: "Jobs-for-AWS-IoT-embedded-sdk" - version: "05f2afa" + version: "v1.5.1" repository: type: "git" url: "https://github.com/aws/Jobs-for-AWS-IoT-embedded-sdk.git" diff --git a/projects/evkmimxrt1060/defender/.cproject b/projects/evkmimxrt1060/defender/.cproject index 02304a3..e2bfb4c 100644 --- a/projects/evkmimxrt1060/defender/.cproject +++ b/projects/evkmimxrt1060/defender/.cproject @@ -293,7 +293,7 @@ - + @@ -370,7 +370,7 @@ - + diff --git a/projects/evkmimxrt1060/pubsub/.cproject b/projects/evkmimxrt1060/pubsub/.cproject index 859d7ed..fb5ca2c 100644 --- a/projects/evkmimxrt1060/pubsub/.cproject +++ b/projects/evkmimxrt1060/pubsub/.cproject @@ -196,7 +196,7 @@ - + @@ -276,7 +276,7 @@ - + diff --git a/projects/evkmimxrt1060/shadow/.cproject b/projects/evkmimxrt1060/shadow/.cproject index a8a8195..a76063c 100644 --- a/projects/evkmimxrt1060/shadow/.cproject +++ b/projects/evkmimxrt1060/shadow/.cproject @@ -289,7 +289,7 @@ - + @@ -366,7 +366,7 @@ - + diff --git a/projects/evkmimxrt1060/test/.cproject b/projects/evkmimxrt1060/test/.cproject index 7a13c90..7d039c2 100644 --- a/projects/evkmimxrt1060/test/.cproject +++ b/projects/evkmimxrt1060/test/.cproject @@ -209,7 +209,7 @@ - + @@ -286,7 +286,7 @@ - +