diff --git a/applications/freertos_iot_libraries_tests/configs/freertos_config/FreeRTOSIPConfig.h b/applications/freertos_iot_libraries_tests/configs/freertos_config/FreeRTOSIPConfig.h index 82a436a6..280ef8b3 100644 --- a/applications/freertos_iot_libraries_tests/configs/freertos_config/FreeRTOSIPConfig.h +++ b/applications/freertos_iot_libraries_tests/configs/freertos_config/FreeRTOSIPConfig.h @@ -301,7 +301,7 @@ extern void vLoggingPrintf( const char * pcFormatString, /* Include support for TCP keep-alive messages. */ #define ipconfigTCP_KEEP_ALIVE ( 1 ) -#define ipconfigTCP_KEEP_ALIVE_INTERVAL ( 20 ) /* in seconds */ +#define ipconfigTCP_KEEP_ALIVE_INTERVAL ( 300 ) /* in seconds */ /* Include all API's and code that is needed for the IPv4 protocol. * When defined as zero, the application should uses IPv6. */ diff --git a/applications/helpers/ota_orchestrator/CMakeLists.txt b/applications/helpers/ota_orchestrator/CMakeLists.txt index 5041bb40..d8f77741 100644 --- a/applications/helpers/ota_orchestrator/CMakeLists.txt +++ b/applications/helpers/ota_orchestrator/CMakeLists.txt @@ -18,6 +18,7 @@ else() ) target_link_libraries(ota-update + PUBLIC jobs-for-aws-iot-embedded-sdk aws-iot-core-mqtt-file-streams-embedded-c freertos_kernel @@ -29,5 +30,7 @@ else() helpers-events backoff-algorithm crt-helpers + PRIVATE + helpers-logging ) endif() diff --git a/applications/helpers/ota_orchestrator/src/mqtt_helpers.c b/applications/helpers/ota_orchestrator/src/mqtt_helpers.c index 53fcb08e..bcb90e33 100644 --- a/applications/helpers/ota_orchestrator/src/mqtt_helpers.c +++ b/applications/helpers/ota_orchestrator/src/mqtt_helpers.c @@ -14,6 +14,18 @@ #include "ota_register_callback.h" #include "ota_types_definitions.h" +/* Include header that defines log levels. */ +#include "logging_levels.h" + +/* Configure name and log level for the OTA library. */ +#ifndef LIBRARY_LOG_NAME + #define LIBRARY_LOG_NAME "OTA" +#endif +#ifndef LIBRARY_LOG_LEVEL + #define LIBRARY_LOG_LEVEL LOG_INFO +#endif +#include "logging_stack.h" + /* Provides external linkage only when running unit test */ #ifdef UNIT_TESTING #define STATIC /* as nothing */ diff --git a/applications/helpers/ota_orchestrator/src/ota_orchestrator.c b/applications/helpers/ota_orchestrator/src/ota_orchestrator.c index 51364f7f..274db705 100644 --- a/applications/helpers/ota_orchestrator/src/ota_orchestrator.c +++ b/applications/helpers/ota_orchestrator/src/ota_orchestrator.c @@ -68,6 +68,18 @@ #include "ota_register_callback.h" #include "ota_types_definitions.h" +/* Include header that defines log levels. */ +#include "logging_levels.h" + +/* Configure name and log level for the OTA library. */ +#ifndef LIBRARY_LOG_NAME + #define LIBRARY_LOG_NAME "OTA" +#endif +#ifndef LIBRARY_LOG_LEVEL + #define LIBRARY_LOG_LEVEL LOG_INFO +#endif +#include "logging_stack.h" + #define NUM_OF_BLOCKS_REQUESTED 1U #define START_JOB_MSG_LENGTH 147U #define MAX_JOB_ID_LENGTH 64U diff --git a/applications/helpers/ota_orchestrator/src/ota_os_freertos.c b/applications/helpers/ota_orchestrator/src/ota_os_freertos.c index a07e0bbd..beac49b9 100644 --- a/applications/helpers/ota_orchestrator/src/ota_os_freertos.c +++ b/applications/helpers/ota_orchestrator/src/ota_os_freertos.c @@ -28,6 +28,18 @@ #include "ota_types_definitions.h" +/* Include header that defines log levels. */ +#include "logging_levels.h" + +/* Configure name and log level for the OTA library. */ +#ifndef LIBRARY_LOG_NAME + #define LIBRARY_LOG_NAME "OTA" +#endif +#ifndef LIBRARY_LOG_LEVEL + #define LIBRARY_LOG_LEVEL LOG_INFO +#endif +#include "logging_stack.h" + /* OTA Event queue attributes.*/ #define MAX_MESSAGES 20 #define MAX_MSG_SIZE sizeof( OtaEventMsg_t ) diff --git a/applications/helpers/sntp/CMakeLists.txt b/applications/helpers/sntp/CMakeLists.txt index f85451ea..321f2e73 100644 --- a/applications/helpers/sntp/CMakeLists.txt +++ b/applications/helpers/sntp/CMakeLists.txt @@ -20,11 +20,13 @@ else() ) target_link_libraries(helpers-sntp + PUBLIC backoff-algorithm connectivity-stack corepkcs11 coresntp - helpers-logging mbedtls + PRIVATE + helpers-logging ) endif() diff --git a/applications/keyword_detection/CMakeLists.txt b/applications/keyword_detection/CMakeLists.txt index 11318863..3caba1f7 100644 --- a/applications/keyword_detection/CMakeLists.txt +++ b/applications/keyword_detection/CMakeLists.txt @@ -141,6 +141,7 @@ target_link_libraries(keyword-detection fri-bsp helpers-device-advisor helpers-events + helpers-logging mbedtls ota-update provisioning-lib diff --git a/applications/keyword_detection/configs/aws_configs/CMakeLists.txt b/applications/keyword_detection/configs/aws_configs/CMakeLists.txt index 24bbfa08..6beec89a 100644 --- a/applications/keyword_detection/configs/aws_configs/CMakeLists.txt +++ b/applications/keyword_detection/configs/aws_configs/CMakeLists.txt @@ -7,11 +7,6 @@ target_include_directories(coremqtt-config . ) -target_link_libraries(coremqtt-config - INTERFACE - helpers-logging -) - target_compile_definitions(coremqtt-agent-config INTERFACE MQTT_AGENT_DO_NOT_USE_CUSTOM_CONFIG diff --git a/applications/keyword_detection/configs/aws_configs/core_mqtt_config.h b/applications/keyword_detection/configs/aws_configs/core_mqtt_config.h index 8ea1f7bc..bb533480 100644 --- a/applications/keyword_detection/configs/aws_configs/core_mqtt_config.h +++ b/applications/keyword_detection/configs/aws_configs/core_mqtt_config.h @@ -25,19 +25,6 @@ #ifndef CORE_MQTT_CONFIG_H #define CORE_MQTT_CONFIG_H -#include "logging_levels.h" - -/* Logging configuration for the MQTT library. */ -#ifndef LIBRARY_LOG_NAME - #define LIBRARY_LOG_NAME "MQTT" -#endif - -#ifndef LIBRARY_LOG_LEVEL - #define LIBRARY_LOG_LEVEL LOG_INFO -#endif - -#include "logging_stack.h" - /** * @brief The maximum number of MQTT PUBLISH messages that may be pending * acknowledgment at any time. diff --git a/applications/keyword_detection/configs/aws_configs/ota_config.h b/applications/keyword_detection/configs/aws_configs/ota_config.h index 829b25f7..6351ca4f 100644 --- a/applications/keyword_detection/configs/aws_configs/ota_config.h +++ b/applications/keyword_detection/configs/aws_configs/ota_config.h @@ -28,30 +28,6 @@ #ifndef OTA_CONFIG_H_ #define OTA_CONFIG_H_ -/**************************************************/ -/******* DO NOT CHANGE the following order ********/ -/**************************************************/ - -/* Logging related header files are required to be included in the following order: - * 1. Include the header file "logging_levels.h". - * 2. Define LIBRARY_LOG_NAME and LIBRARY_LOG_LEVEL. - * 3. Include the header file "logging_stack.h". - */ - -/* Include header that defines log levels. */ -#include "logging_levels.h" - -/* Configure name and log level for the OTA library. */ -#ifndef LIBRARY_LOG_NAME - #define LIBRARY_LOG_NAME "OTA" -#endif -#ifndef LIBRARY_LOG_LEVEL - #define LIBRARY_LOG_LEVEL LOG_INFO -#endif -#include "logging_stack.h" - -/************ End of logging configuration ****************/ - /* Include config file used for testing the OTA PAL. This config file defines * the otapalconfigCODE_SIGNING_CERTIFICATE macro. */ #include "ota_demo_config.h" diff --git a/applications/keyword_detection/main.c b/applications/keyword_detection/main.c index 9231355e..b7079eb2 100644 --- a/applications/keyword_detection/main.c +++ b/applications/keyword_detection/main.c @@ -30,6 +30,18 @@ #include "FreeRTOSConfig.h" +/* Include header that defines log levels. */ +#include "logging_levels.h" + +/* Configure name and log level for the OTA library. */ +#ifndef LIBRARY_LOG_NAME + #define LIBRARY_LOG_NAME "main" +#endif +#ifndef LIBRARY_LOG_LEVEL + #define LIBRARY_LOG_LEVEL LOG_INFO +#endif +#include "logging_stack.h" + #ifdef AUDIO_VSI #include "Driver_SAI.h" #endif diff --git a/applications/object_detection/CMakeLists.txt b/applications/object_detection/CMakeLists.txt index 01e1dc52..5bb03ace 100644 --- a/applications/object_detection/CMakeLists.txt +++ b/applications/object_detection/CMakeLists.txt @@ -134,6 +134,7 @@ target_link_libraries(object-detection toolchain-override object_detection_api object_detection_model + helpers-logging ) include(${IOT_REFERENCE_ARM_CORSTONE3XX_SOURCE_DIR}/bsp/cmake/SetLinkerOptions.cmake) diff --git a/applications/object_detection/configs/aws_configs/CMakeLists.txt b/applications/object_detection/configs/aws_configs/CMakeLists.txt index f9c38824..b40abd23 100644 --- a/applications/object_detection/configs/aws_configs/CMakeLists.txt +++ b/applications/object_detection/configs/aws_configs/CMakeLists.txt @@ -7,11 +7,6 @@ target_include_directories(coremqtt-config . ) -target_link_libraries(coremqtt-config - INTERFACE - helpers-logging -) - target_compile_definitions(coremqtt-agent-config INTERFACE MQTT_AGENT_DO_NOT_USE_CUSTOM_CONFIG diff --git a/applications/object_detection/configs/aws_configs/core_mqtt_config.h b/applications/object_detection/configs/aws_configs/core_mqtt_config.h index 8ea1f7bc..bb533480 100644 --- a/applications/object_detection/configs/aws_configs/core_mqtt_config.h +++ b/applications/object_detection/configs/aws_configs/core_mqtt_config.h @@ -25,19 +25,6 @@ #ifndef CORE_MQTT_CONFIG_H #define CORE_MQTT_CONFIG_H -#include "logging_levels.h" - -/* Logging configuration for the MQTT library. */ -#ifndef LIBRARY_LOG_NAME - #define LIBRARY_LOG_NAME "MQTT" -#endif - -#ifndef LIBRARY_LOG_LEVEL - #define LIBRARY_LOG_LEVEL LOG_INFO -#endif - -#include "logging_stack.h" - /** * @brief The maximum number of MQTT PUBLISH messages that may be pending * acknowledgment at any time. diff --git a/applications/object_detection/isp/CMakeLists.txt b/applications/object_detection/isp/CMakeLists.txt index 4188c5f3..709e1391 100644 --- a/applications/object_detection/isp/CMakeLists.txt +++ b/applications/object_detection/isp/CMakeLists.txt @@ -19,5 +19,4 @@ target_sources(isp-config target_link_libraries(isp-config INTERFACE isp_control - helpers-logging ) diff --git a/applications/object_detection/main.c b/applications/object_detection/main.c index 05fd209c..34e3d304 100644 --- a/applications/object_detection/main.c +++ b/applications/object_detection/main.c @@ -28,6 +28,22 @@ #include "FreeRTOSConfig.h" +/* Include header that defines log levels. */ +#include "logging_levels.h" + +/* Configure name and log level for the OTA library. */ +#ifndef LIBRARY_LOG_NAME + #define LIBRARY_LOG_NAME "main" +#endif +#ifndef LIBRARY_LOG_LEVEL + #define LIBRARY_LOG_LEVEL LOG_INFO +#endif +#include "logging_stack.h" + +#ifdef AUDIO_VSI + #include "Driver_SAI.h" +#endif + #ifdef AUDIO_VSI #include "Driver_SAI.h" #endif diff --git a/applications/speech_recognition/CMakeLists.txt b/applications/speech_recognition/CMakeLists.txt index 46ffe5f3..0ab79754 100644 --- a/applications/speech_recognition/CMakeLists.txt +++ b/applications/speech_recognition/CMakeLists.txt @@ -161,6 +161,7 @@ target_link_libraries(speech-recognition toolchain-override asr_api asr_model + helpers-logging ) include(${IOT_REFERENCE_ARM_CORSTONE3XX_SOURCE_DIR}/bsp/cmake/SetLinkerOptions.cmake) diff --git a/applications/speech_recognition/configs/aws_configs/CMakeLists.txt b/applications/speech_recognition/configs/aws_configs/CMakeLists.txt index 24bbfa08..6beec89a 100644 --- a/applications/speech_recognition/configs/aws_configs/CMakeLists.txt +++ b/applications/speech_recognition/configs/aws_configs/CMakeLists.txt @@ -7,11 +7,6 @@ target_include_directories(coremqtt-config . ) -target_link_libraries(coremqtt-config - INTERFACE - helpers-logging -) - target_compile_definitions(coremqtt-agent-config INTERFACE MQTT_AGENT_DO_NOT_USE_CUSTOM_CONFIG diff --git a/applications/speech_recognition/configs/aws_configs/core_mqtt_config.h b/applications/speech_recognition/configs/aws_configs/core_mqtt_config.h index 8ea1f7bc..bb533480 100644 --- a/applications/speech_recognition/configs/aws_configs/core_mqtt_config.h +++ b/applications/speech_recognition/configs/aws_configs/core_mqtt_config.h @@ -25,19 +25,6 @@ #ifndef CORE_MQTT_CONFIG_H #define CORE_MQTT_CONFIG_H -#include "logging_levels.h" - -/* Logging configuration for the MQTT library. */ -#ifndef LIBRARY_LOG_NAME - #define LIBRARY_LOG_NAME "MQTT" -#endif - -#ifndef LIBRARY_LOG_LEVEL - #define LIBRARY_LOG_LEVEL LOG_INFO -#endif - -#include "logging_stack.h" - /** * @brief The maximum number of MQTT PUBLISH messages that may be pending * acknowledgment at any time. diff --git a/applications/speech_recognition/main.c b/applications/speech_recognition/main.c index 2021f8b7..34f1fbf3 100644 --- a/applications/speech_recognition/main.c +++ b/applications/speech_recognition/main.c @@ -32,6 +32,18 @@ #include "FreeRTOSConfig.h" +/* Include header that defines log levels. */ +#include "logging_levels.h" + +/* Configure name and log level for the OTA library. */ +#ifndef LIBRARY_LOG_NAME + #define LIBRARY_LOG_NAME "main" +#endif +#ifndef LIBRARY_LOG_LEVEL + #define LIBRARY_LOG_LEVEL LOG_INFO +#endif +#include "logging_stack.h" + #ifdef AUDIO_VSI #include "Driver_SAI.h" #endif diff --git a/components/aws_iot/corejson/library b/components/aws_iot/corejson/library index 5b31f4c3..e3b7663f 160000 --- a/components/aws_iot/corejson/library +++ b/components/aws_iot/corejson/library @@ -1 +1 @@ -Subproject commit 5b31f4c37a034911a4992fd415f8177a75014946 +Subproject commit e3b7663f6392d8c10e8db57506ec37e4801b145a diff --git a/components/aws_iot/coremqtt/library b/components/aws_iot/coremqtt/library index 6d5641b8..2beef047 160000 --- a/components/aws_iot/coremqtt/library +++ b/components/aws_iot/coremqtt/library @@ -1 +1 @@ -Subproject commit 6d5641b8a2f410470134d9bfe8ee71e3d83a565e +Subproject commit 2beef04725328923e05e576b884212d53ec97af7 diff --git a/components/aws_iot/coresntp/library b/components/aws_iot/coresntp/library index 32d2168d..b492c223 160000 --- a/components/aws_iot/coresntp/library +++ b/components/aws_iot/coresntp/library @@ -1 +1 @@ -Subproject commit 32d2168d504e4a7b135ec890e601cc66efc32bd5 +Subproject commit b492c223cdbebfb9335166d0e6fc47e93a94de75 diff --git a/components/connectivity/backoff_algorithm/library b/components/connectivity/backoff_algorithm/library index 8818bed4..3cc0bf8c 160000 --- a/components/connectivity/backoff_algorithm/library +++ b/components/connectivity/backoff_algorithm/library @@ -1 +1 @@ -Subproject commit 8818bed40e57215fda8efa4b7fd33f7ae2c80d65 +Subproject commit 3cc0bf8c4d41d7cd7aa2f1ded5075c87bf6b2bbb diff --git a/components/connectivity/freertos_plus_tcp/integration/CMakeLists.txt b/components/connectivity/freertos_plus_tcp/integration/CMakeLists.txt index fb42225e..36ae1782 100644 --- a/components/connectivity/freertos_plus_tcp/integration/CMakeLists.txt +++ b/components/connectivity/freertos_plus_tcp/integration/CMakeLists.txt @@ -27,6 +27,7 @@ else () PRIVATE coremqtt helpers-events + helpers-logging iot-tls ) diff --git a/components/connectivity/freertos_plus_tcp/library b/components/connectivity/freertos_plus_tcp/library index ba4e25c3..abcb94c8 160000 --- a/components/connectivity/freertos_plus_tcp/library +++ b/components/connectivity/freertos_plus_tcp/library @@ -1 +1 @@ -Subproject commit ba4e25c350020abcb787a3a319fdf991bef70538 +Subproject commit abcb94c8768532a6cae3c39ffe37602640992a28 diff --git a/components/connectivity/iot_vsocket/integration/CMakeLists.txt b/components/connectivity/iot_vsocket/integration/CMakeLists.txt index b89ab1e4..570f37a0 100644 --- a/components/connectivity/iot_vsocket/integration/CMakeLists.txt +++ b/components/connectivity/iot_vsocket/integration/CMakeLists.txt @@ -22,6 +22,7 @@ else() PRIVATE coremqtt helpers-events + helpers-logging fri-bsp iot-socket-api iot-tls diff --git a/components/tools/freertos_libraries_integration_tests/integration/CMakeLists.txt b/components/tools/freertos_libraries_integration_tests/integration/CMakeLists.txt index 30563ce9..adc38602 100644 --- a/components/tools/freertos_libraries_integration_tests/integration/CMakeLists.txt +++ b/components/tools/freertos_libraries_integration_tests/integration/CMakeLists.txt @@ -28,7 +28,7 @@ target_link_libraries(freertos-libraries-integration-tests-mqtt # reset request when the device is busy. target_compile_definitions(freertos-libraries-integration-tests-mqtt PRIVATE - MQTT_KEEP_ALIVE_INTERVAL_SECONDS=60 + MQTT_KEEP_ALIVE_INTERVAL_SECONDS=300 ) add_library(freertos-libraries-integration-tests-pkcs11 diff --git a/manifest.yml b/manifest.yml index 4b8e6526..203dad4b 100644 --- a/manifest.yml +++ b/manifest.yml @@ -88,7 +88,7 @@ dependencies: license: "MIT" tpip-category: "category-2" security-risk: "low" - version: "v2.1.1" + version: "v2.3.1" repository: type: "git" url: "https://github.com/FreeRTOS/coreMQTT.git" @@ -97,7 +97,7 @@ dependencies: license: "MIT" tpip-category: "category-2" security-risk: "low" - version: "v3.2.0" + version: "v3.3.0" repository: type: "git" url: "https://github.com/FreeRTOS/coreJSON.git" @@ -115,7 +115,7 @@ dependencies: license: "MIT" tpip-category: "category-2" security-risk: "low" - version: "v1.2.0" + version: "v1.3.1" repository: type: "git" url: "https://github.com/FreeRTOS/coreSNTP.git" @@ -124,7 +124,7 @@ dependencies: license: "MIT" tpip-category: "category-2" security-risk: "low" - version: "v1.3.0" + version: "v1.4.1" repository: type: "git" url: "https://github.com/FreeRTOS/backoffAlgorithm.git" @@ -169,7 +169,7 @@ dependencies: license: "MIT" tpip-category: "category-2" security-risk: "low" - version: "ba4e25c350020abcb787a3a319fdf991bef70538" + version: "V4.2.2" repository: type: "git" url: "https://github.com/FreeRTOS/FreeRTOS-Plus-TCP.git" diff --git a/release_changes/202412161811.change.md b/release_changes/202412161811.change.md new file mode 100644 index 00000000..96ca5a59 --- /dev/null +++ b/release_changes/202412161811.change.md @@ -0,0 +1 @@ +Update AWS libraries to `202406.01-LTS`