espressif/FreeRTOS
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS.git synced 2025-06-29 05:17:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update demos to use version macro from coreMQTT (#460)

Browse Source 
Update demos to use the MQTT_LIBRARY_VERSION macro for the coreMQTT version they report in their metrics
This commit is contained in:
Archit Aggarwal
2020-12-10 12:05:02 -08:00
committed by GitHub
parent c0d4c7c67c
commit d93a3d63a0
7 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
FreeRTOS-Plus/Demo/AWS/Device_Defender_Windows_Simulator/Device_Defender_Demo/demo_config.h
View File

@ -201,27 +201,28 @@ extern void vLoggingPrintf( const char * pcFormatString,
* The current value is given as an example. Please update for your specific * The current value is given as an example. Please update for your specific
* operating system. * operating system.
*/ */
#define democonfigOS_NAME "FreeRTOS" #define democonfigOS_NAME "FreeRTOS"
/** /**
* @brief The version of the operating system that the application is running * @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 * on. The current value is given as an example. Please update for your specific
* operating system version. * 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 * @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 * current value is given as an example. Please update for your specific
* hardware platform. * 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 "@" * @brief The name of the MQTT library used and its version, following an "@"
* symbol. * 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. * @brief Set the stack size of the main demo task.

7
FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/demo_config.h
View File

@ -220,7 +220,8 @@ extern void vLoggingPrintf( const char * pcFormatString,
* @brief The name of the MQTT library used and its version, following an "@" * @brief The name of the MQTT library used and its version, following an "@"
* symbol. * 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. * @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 * In the Windows port, this stack only holds a structure. The actual
* stack is created by an operating system thread. * 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. * @brief Size of the network buffer for MQTT packets.
*/ */
#define democonfigNETWORK_BUFFER_SIZE ( 1024U ) #define democonfigNETWORK_BUFFER_SIZE ( 1024U )
#endif /* DEMO_CONFIG_H */ #endif /* DEMO_CONFIG_H */

7
FreeRTOS-Plus/Demo/AWS/Jobs_Windows_Simulator/Jobs_Demo/demo_config.h
View File

@ -213,7 +213,8 @@ extern void vLoggingPrintf( const char * pcFormatString,
* @brief The name of the MQTT library used and its version, following an "@" * @brief The name of the MQTT library used and its version, following an "@"
* symbol. * 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. * @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 * In the Windows port, this stack only holds a structure. The actual
* stack is created by an operating system thread. * 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. * @brief Size of the network buffer for MQTT packets.
*/ */
#define democonfigNETWORK_BUFFER_SIZE ( 1024U ) #define democonfigNETWORK_BUFFER_SIZE ( 1024U )
#endif /* DEMO_CONFIG_H */ #endif /* DEMO_CONFIG_H */

16
FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/demo_config.h
View File

@ -1,5 +1,5 @@
/* /*
* FreeRTOS Kernel V10.3.0 * FreeRTOS V202011.00
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * 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 * 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 * 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. * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* *
* http://www.FreeRTOS.org * https://www.FreeRTOS.org
* http://aws.amazon.com/freertos * 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 "@" * @brief The name of the MQTT library used and its version, following an "@"
* symbol. * 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 * @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. * 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. * @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 * In the Windows port, this stack only holds a structure. The actual
* stack is created by an operating system thread. * 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 #endif
#ifndef democonfigMQTT_LIB #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 #endif
/** /**

2
FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/DemoTasks/MutualAuthMQTTExample.c
View File

@ -236,7 +236,7 @@
#endif #endif
#ifndef democonfigMQTT_LIB #ifndef democonfigMQTT_LIB
#define democonfigMQTT_LIB "core-mqtt@1.0.0" #define democonfigMQTT_LIB "core-mqtt@"MQTT_LIBRARY_VERSION
#endif #endif
/** /**

13
FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/demo_config.h
View File

@ -1,5 +1,5 @@
/* /*
* FreeRTOS Kernel V10.3.0 * FreeRTOS V202011.00
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * 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 * 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 * 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. * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* *
* http://www.FreeRTOS.org * https://www.FreeRTOS.org
* http://aws.amazon.com/freertos * 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 "@" * @brief The name of the MQTT library used and its version, following an "@"
* symbol. * 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. * @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 * In the Windows port, this stack only holds a structure. The actual
* stack is created by an operating system thread. * 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. * @brief Size of the network buffer for MQTT packets.
*/ */
#define democonfigNETWORK_BUFFER_SIZE ( 1024U ) #define democonfigNETWORK_BUFFER_SIZE ( 1024U )
#endif /* DEMO_CONFIG_H */ #endif /* DEMO_CONFIG_H */

2
FreeRTOS-Plus/Source/Application-Protocols/coreMQTT

Submodule FreeRTOS-Plus/Source/Application-Protocols/coreMQTT updated: 510a3f6eca...cf7406a98c