diff options
author | Archit Aggarwal <architag@amazon.com> | 2020-12-10 12:05:02 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-10 12:05:02 -0800 |
commit | d93a3d63a0107d7cd7e997a9c63d9d79f5c69305 (patch) | |
tree | 39f02aa0c6d0f8e3e90fe49adc01488eca467019 | |
parent | c0d4c7c67c2ba2ebc2c2737aabd2572ee1a0084b (diff) | |
download | freertos-git-d93a3d63a0107d7cd7e997a9c63d9d79f5c69305.tar.gz |
Update demos to use version macro from coreMQTT (#460)
Update demos to use the MQTT_LIBRARY_VERSION macro for the coreMQTT version they report in their metrics
7 files changed, 30 insertions, 24 deletions
diff --git a/FreeRTOS-Plus/Demo/AWS/Device_Defender_Windows_Simulator/Device_Defender_Demo/demo_config.h b/FreeRTOS-Plus/Demo/AWS/Device_Defender_Windows_Simulator/Device_Defender_Demo/demo_config.h index 6b7acd0f6..f85a443c7 100644 --- a/FreeRTOS-Plus/Demo/AWS/Device_Defender_Windows_Simulator/Device_Defender_Demo/demo_config.h +++ b/FreeRTOS-Plus/Demo/AWS/Device_Defender_Windows_Simulator/Device_Defender_Demo/demo_config.h @@ -201,27 +201,28 @@ extern void vLoggingPrintf( const char * pcFormatString, * The current value is given as an example. Please update for your specific * operating system. */ -#define democonfigOS_NAME "FreeRTOS" +#define democonfigOS_NAME "FreeRTOS" /** * @brief The version of the operating system that the application is running * on. The current value is given as an example. Please update for your specific * operating system version. */ -#define democonfigOS_VERSION tskKERNEL_VERSION_NUMBER +#define democonfigOS_VERSION tskKERNEL_VERSION_NUMBER /** * @brief The name of the hardware platform the application is running on. The * current value is given as an example. Please update for your specific * hardware platform. */ -#define democonfigHARDWARE_PLATFORM_NAME "WinSim" +#define democonfigHARDWARE_PLATFORM_NAME "WinSim" /** * @brief The name of the MQTT library used and its version, following an "@" * symbol. */ -#define democonfigMQTT_LIB "core-mqtt@1.0.1" +#include "core_mqtt.h" /* Include coreMQTT header for MQTT_LIBRARY_VERSION macro. */ +#define democonfigMQTT_LIB "core-mqtt@"MQTT_LIBRARY_VERSION /** * @brief Set the stack size of the main demo task. diff --git a/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/demo_config.h b/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/demo_config.h index 190b0aa9e..23dadb332 100644 --- a/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/demo_config.h +++ b/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/demo_config.h @@ -220,7 +220,8 @@ extern void vLoggingPrintf( const char * pcFormatString, * @brief The name of the MQTT library used and its version, following an "@" * symbol. */ -#define democonfigMQTT_LIB "core-mqtt@1.0.0" +#include "core_mqtt.h" /* Include coreMQTT header for MQTT_LIBRARY_VERSION macro. */ +#define democonfigMQTT_LIB "core-mqtt@"MQTT_LIBRARY_VERSION /** * @brief Set the stack size of the main demo task. @@ -228,11 +229,11 @@ extern void vLoggingPrintf( const char * pcFormatString, * In the Windows port, this stack only holds a structure. The actual * stack is created by an operating system thread. */ -#define democonfigDEMO_STACKSIZE configMINIMAL_STACK_SIZE +#define democonfigDEMO_STACKSIZE configMINIMAL_STACK_SIZE /** * @brief Size of the network buffer for MQTT packets. */ -#define democonfigNETWORK_BUFFER_SIZE ( 1024U ) +#define democonfigNETWORK_BUFFER_SIZE ( 1024U ) #endif /* DEMO_CONFIG_H */ diff --git a/FreeRTOS-Plus/Demo/AWS/Jobs_Windows_Simulator/Jobs_Demo/demo_config.h b/FreeRTOS-Plus/Demo/AWS/Jobs_Windows_Simulator/Jobs_Demo/demo_config.h index be265ed9f..32cdba514 100644 --- a/FreeRTOS-Plus/Demo/AWS/Jobs_Windows_Simulator/Jobs_Demo/demo_config.h +++ b/FreeRTOS-Plus/Demo/AWS/Jobs_Windows_Simulator/Jobs_Demo/demo_config.h @@ -213,7 +213,8 @@ extern void vLoggingPrintf( const char * pcFormatString, * @brief The name of the MQTT library used and its version, following an "@" * symbol. */ -#define democonfigMQTT_LIB "core-mqtt@1.0.0" +#include "core_mqtt.h" /* Include coreMQTT header for MQTT_LIBRARY_VERSION macro. */ +#define democonfigMQTT_LIB "core-mqtt@"MQTT_LIBRARY_VERSION /** * @brief Set the stack size of the main demo task. @@ -221,11 +222,11 @@ extern void vLoggingPrintf( const char * pcFormatString, * In the Windows port, this stack only holds a structure. The actual * stack is created by an operating system thread. */ -#define democonfigDEMO_STACKSIZE configMINIMAL_STACK_SIZE +#define democonfigDEMO_STACKSIZE configMINIMAL_STACK_SIZE /** * @brief Size of the network buffer for MQTT packets. */ -#define democonfigNETWORK_BUFFER_SIZE ( 1024U ) +#define democonfigNETWORK_BUFFER_SIZE ( 1024U ) #endif /* DEMO_CONFIG_H */ diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/demo_config.h b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/demo_config.h index 5db0ce6f9..4dbdf20e2 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/demo_config.h +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/demo_config.h @@ -1,5 +1,5 @@ /* - * FreeRTOS Kernel V10.3.0 + * FreeRTOS V202011.00 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -19,8 +19,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - * http://www.FreeRTOS.org - * http://aws.amazon.com/freertos + * https://www.FreeRTOS.org + * https://github.com/FreeRTOS * */ @@ -245,13 +245,14 @@ extern void vLoggingPrintf( const char * pcFormatString, * @brief The name of the MQTT library used and its version, following an "@" * symbol. */ -#define democonfigMQTT_LIB "core-mqtt@1.0.0" +#include "core_mqtt.h" /* Include coreMQTT header for MQTT_LIBRARY_VERSION macro. */ +#define democonfigMQTT_LIB "core-mqtt@"MQTT_LIBRARY_VERSION /** * @brief Whether to use mutual authentication. If this macro is not set to 1 * or not defined, then plaintext TCP will be used instead of TLS over TCP. */ -#define democonfigUSE_TLS 1 +#define democonfigUSE_TLS 1 /** * @brief Set the stack size of the main demo task. @@ -259,7 +260,7 @@ extern void vLoggingPrintf( const char * pcFormatString, * In the Windows port, this stack only holds a structure. The actual * stack is created by an operating system thread. */ -#define democonfigDEMO_STACKSIZE configMINIMAL_STACK_SIZE +#define democonfigDEMO_STACKSIZE configMINIMAL_STACK_SIZE @@ -363,7 +364,8 @@ extern void vLoggingPrintf( const char * pcFormatString, #endif #ifndef democonfigMQTT_LIB - #define democonfigMQTT_LIB "core-mqtt@1.0.0" + #include "core_mqtt.h" /* Include coreMQTT header for MQTT_LIBRARY_VERSION macro. */ + #define democonfigMQTT_LIB "core-mqtt@"MQTT_LIBRARY_VERSION #endif /** diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/DemoTasks/MutualAuthMQTTExample.c b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/DemoTasks/MutualAuthMQTTExample.c index a87ecef57..da9f55db8 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/DemoTasks/MutualAuthMQTTExample.c +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/DemoTasks/MutualAuthMQTTExample.c @@ -236,7 +236,7 @@ #endif #ifndef democonfigMQTT_LIB - #define democonfigMQTT_LIB "core-mqtt@1.0.0" + #define democonfigMQTT_LIB "core-mqtt@"MQTT_LIBRARY_VERSION #endif /** diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/demo_config.h b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/demo_config.h index 21fba9133..db8f7906b 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/demo_config.h +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/demo_config.h @@ -1,5 +1,5 @@ /* - * FreeRTOS Kernel V10.3.0 + * FreeRTOS V202011.00 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -19,8 +19,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - * http://www.FreeRTOS.org - * http://aws.amazon.com/freertos + * https://www.FreeRTOS.org + * https://github.com/FreeRTOS * */ @@ -244,7 +244,8 @@ extern void vLoggingPrintf( const char * pcFormatString, * @brief The name of the MQTT library used and its version, following an "@" * symbol. */ -#define democonfigMQTT_LIB "core-mqtt@1.0.0" +#include "core_mqtt.h" /* Include coreMQTT header for MQTT_LIBRARY_VERSION macro. */ +#define democonfigMQTT_LIB "core-mqtt@"MQTT_LIBRARY_VERSION /** * @brief Set the stack size of the main demo task. @@ -252,11 +253,11 @@ extern void vLoggingPrintf( const char * pcFormatString, * In the Windows port, this stack only holds a structure. The actual * stack is created by an operating system thread. */ -#define democonfigDEMO_STACKSIZE configMINIMAL_STACK_SIZE +#define democonfigDEMO_STACKSIZE configMINIMAL_STACK_SIZE /** * @brief Size of the network buffer for MQTT packets. */ -#define democonfigNETWORK_BUFFER_SIZE ( 1024U ) +#define democonfigNETWORK_BUFFER_SIZE ( 1024U ) #endif /* DEMO_CONFIG_H */ diff --git a/FreeRTOS-Plus/Source/Application-Protocols/coreMQTT b/FreeRTOS-Plus/Source/Application-Protocols/coreMQTT -Subproject 510a3f6ecac041859114b41462c1829a29f026c +Subproject cf7406a98c00d27b519797df6932dc3b7f74cc5 |