From 5ee5e2a95d39f397b3a6f501b607cfdb1b5f9bfd Mon Sep 17 00:00:00 2001 From: leegeth <51681119+leegeth@users.noreply.github.com> Date: Tue, 14 Jul 2020 16:33:10 -0700 Subject: [PATCH] Update main.c logs to use logging stack (#146) --- .../mqtt/common/main.c | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta2/mqtt/common/main.c b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta2/mqtt/common/main.c index af7ebd4e8a..24eabee0e4 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta2/mqtt/common/main.c +++ b/FreeRTOS-Plus/Demo/FreeRTOS-IoT-Libraries-LTS-Beta2/mqtt/common/main.c @@ -45,9 +45,13 @@ #include "FreeRTOS_IP.h" #include "FreeRTOS_Sockets.h" -/* Demo app includes. */ +/* Demo logging includes. */ #include "demo_logging.h" +/* Demo Specific configs. */ +#include "demo_config.h" + + /* * Prototypes for the demos that can be started from this project. Note the * MQTT demo is not actually started until the network is already, which is @@ -152,7 +156,7 @@ void vApplicationIPNetworkEventHook( eIPCallbackEvent_t eNetworkEvent ) { /* Demos that use the network are created after the network is * up. */ - configPRINTF( ( "---------STARTING DEMO---------\r\n" ) ); + LogInfo( ( "---------STARTING DEMO---------\r\n" ) ); vStartSimpleMQTTDemo(); xTasksAlreadyCreated = pdTRUE; } @@ -161,16 +165,16 @@ void vApplicationIPNetworkEventHook( eIPCallbackEvent_t eNetworkEvent ) * server. */ FreeRTOS_GetAddressConfiguration( &ulIPAddress, &ulNetMask, &ulGatewayAddress, &ulDNSServerAddress ); FreeRTOS_inet_ntoa( ulIPAddress, cBuffer ); - FreeRTOS_printf( ( "\r\n\r\nIP Address: %s\r\n", cBuffer ) ); + LogInfo( ( "\r\n\r\nIP Address: %s\r\n", cBuffer ) ); FreeRTOS_inet_ntoa( ulNetMask, cBuffer ); - FreeRTOS_printf( ( "Subnet Mask: %s\r\n", cBuffer ) ); + LogInfo( ( "Subnet Mask: %s\r\n", cBuffer ) ); FreeRTOS_inet_ntoa( ulGatewayAddress, cBuffer ); - FreeRTOS_printf( ( "Gateway Address: %s\r\n", cBuffer ) ); + LogInfo( ( "Gateway Address: %s\r\n", cBuffer ) ); FreeRTOS_inet_ntoa( ulDNSServerAddress, cBuffer ); - FreeRTOS_printf( ( "DNS Server Address: %s\r\n\r\n\r\n", cBuffer ) ); + LogInfo( ( "DNS Server Address: %s\r\n\r\n\r\n", cBuffer ) ); } } /*-----------------------------------------------------------*/ @@ -239,9 +243,9 @@ static void prvMiscInitialisation( void ) * devices should use a True Random Number Generator (TRNG). */ time( &xTimeNow ); - FreeRTOS_debug_printf( ( "Seed for randomizer: %lu\n", xTimeNow ) ); + LogDebug( ( "Seed for randomizer: %lu\n", xTimeNow ) ); prvSRand( ( uint32_t ) xTimeNow ); - FreeRTOS_debug_printf( ( "Random numbers: %08X %08X %08X %08X\n", ipconfigRAND32(), ipconfigRAND32(), ipconfigRAND32(), ipconfigRAND32() ) ); + LogDebug( ( "Random numbers: %08X %08X %08X %08X\n", ipconfigRAND32(), ipconfigRAND32(), ipconfigRAND32(), ipconfigRAND32() ) ); } /*-----------------------------------------------------------*/