From 99afe796d246a17dcc9fe43a5e8944a8de6e5abd Mon Sep 17 00:00:00 2001 From: richardbarry Date: Tue, 29 Oct 2013 11:14:54 +0000 Subject: [PATCH] Update the main Win32 MSVC demo to account for the changes to the Win32 port layer (more accurate timing). git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2077 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- FreeRTOS/Demo/WIN32-MSVC/main.c | 11 +++++------ FreeRTOS/Demo/WIN32-MSVC/main_blinky.c | 9 ++++----- FreeRTOS/Demo/WIN32-MSVC/main_full.c | 11 +++++------ 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/FreeRTOS/Demo/WIN32-MSVC/main.c b/FreeRTOS/Demo/WIN32-MSVC/main.c index 29a6e1192..360e84a31 100644 --- a/FreeRTOS/Demo/WIN32-MSVC/main.c +++ b/FreeRTOS/Demo/WIN32-MSVC/main.c @@ -80,11 +80,10 @@ * application. It is provided as a convenient development and demonstration * test bed only. This was tested using Windows XP on a dual core laptop. * - * In this example, one simulated millisecond will take approximately 40ms to - * execute, and Windows will not be running the FreeRTOS simulator threads - * continuously, so the timing information in the FreeRTOS+Trace logs have no - * meaningful units. See the documentation page for the Windows simulator for - * an explanation of the slow timing: + * Windows will not be running the FreeRTOS simulator threads continuously, so + * the timing information in the FreeRTOS+Trace logs have no meaningful units. + * See the documentation page for the Windows simulator for an explanation of + * the slow timing: * http://www.freertos.org/FreeRTOS-Windows-Simulator-Emulator-for-Visual-Studio-and-Eclipse-MingW.html * - READ THE WEB DOCUMENTATION FOR THIS PORT FOR MORE INFORMATION ON USING IT - ******************************************************************************* @@ -106,7 +105,7 @@ mainCREATE_SIMPLE_BLINKY_DEMO_ONLY setting is used to select between the two. The simply blinky demo is implemented and described in main_blinky.c. The more comprehensive test and demo application is implemented and described in main_full.c. */ -#define mainCREATE_SIMPLE_BLINKY_DEMO_ONLY 1 +#define mainCREATE_SIMPLE_BLINKY_DEMO_ONLY 0 /* * main_blinky() is used when mainCREATE_SIMPLE_BLINKY_DEMO_ONLY is set to 1. diff --git a/FreeRTOS/Demo/WIN32-MSVC/main_blinky.c b/FreeRTOS/Demo/WIN32-MSVC/main_blinky.c index 4d014ea4c..8e63dc0c8 100644 --- a/FreeRTOS/Demo/WIN32-MSVC/main_blinky.c +++ b/FreeRTOS/Demo/WIN32-MSVC/main_blinky.c @@ -69,11 +69,10 @@ * application. It is provided as a convenient development and demonstration * test bed only. This was tested using Windows XP on a dual core laptop. * - * In this example, one simulated millisecond will take approximately 40ms to - * execute, and Windows will not be running the FreeRTOS simulator threads - * continuously, so the timing information in the FreeRTOS+Trace logs have no - * meaningful units. See the documentation page for the Windows simulator for - * an explanation of the slow timing: + * Windows will not be running the FreeRTOS simulator threads continuously, so + * the timing information in the FreeRTOS+Trace logs have no meaningful units. + * See the documentation page for the Windows simulator for an explanation of + * the slow timing: * http://www.freertos.org/FreeRTOS-Windows-Simulator-Emulator-for-Visual-Studio-and-Eclipse-MingW.html * - READ THE WEB DOCUMENTATION FOR THIS PORT FOR MORE INFORMATION ON USING IT - * diff --git a/FreeRTOS/Demo/WIN32-MSVC/main_full.c b/FreeRTOS/Demo/WIN32-MSVC/main_full.c index 7cd0d3b1b..91bf1e8f8 100644 --- a/FreeRTOS/Demo/WIN32-MSVC/main_full.c +++ b/FreeRTOS/Demo/WIN32-MSVC/main_full.c @@ -70,11 +70,10 @@ * application. It is provided as a convenient development and demonstration * test bed only. This was tested using Windows XP on a dual core laptop. * - * In this example, one simulated millisecond will take approximately 40ms to - * execute, and Windows will not be running the FreeRTOS simulator threads - * continuously, so the timing information in the FreeRTOS+Trace logs have no - * meaningful units. See the documentation page for the Windows simulator for - * an explanation of the slow timing: + * Windows will not be running the FreeRTOS simulator threads continuously, so + * the timing information in the FreeRTOS+Trace logs have no meaningful units. + * See the documentation page for the Windows simulator for an explanation of + * the slow timing: * http://www.freertos.org/FreeRTOS-Windows-Simulator-Emulator-for-Visual-Studio-and-Eclipse-MingW.html * - READ THE WEB DOCUMENTATION FOR THIS PORT FOR MORE INFORMATION ON USING IT - * @@ -221,7 +220,7 @@ int main_full( void ) static void prvCheckTask( void *pvParameters ) { portTickType xNextWakeTime; -const portTickType xCycleFrequency = 1000 / portTICK_RATE_MS; +const portTickType xCycleFrequency = 2500 / portTICK_RATE_MS; /* Just to remove compiler warning. */ ( void ) pvParameters; -- 2.39.5