X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FCommon%2FMinimal%2FTimerDemo.c;h=d79f1c354a06bb0a2dfc3067c38c3c388234a2a8;hb=a5c0757e04456aadb5b96170f91f586608f1ae09;hp=e8f44fe888c4c0333eb6a248f2533c8c5cbffe23;hpb=48e98aaea6c09bdfdf2c260f1d54069df69cccaa;p=freertos

diff --git a/FreeRTOS/Demo/Common/Minimal/TimerDemo.c b/FreeRTOS/Demo/Common/Minimal/TimerDemo.c
index e8f44fe88..d79f1c354 100644
--- a/FreeRTOS/Demo/Common/Minimal/TimerDemo.c
+++ b/FreeRTOS/Demo/Common/Minimal/TimerDemo.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V8.2.0 - Copyright (C) 2015 Real Time Engineers Ltd.
+    FreeRTOS V8.2.3 - Copyright (C) 2015 Real Time Engineers Ltd.
     All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
@@ -8,14 +8,14 @@
 
     FreeRTOS is free software; you can redistribute it and/or modify it under
     the terms of the GNU General Public License (version 2) as published by the
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.
 
-	***************************************************************************
+    ***************************************************************************
     >>!   NOTE: The modification to the GPL is included to allow you to     !<<
     >>!   distribute a combined work that includes FreeRTOS without being   !<<
     >>!   obliged to provide the source code for proprietary components     !<<
     >>!   outside of the FreeRTOS kernel.                                   !<<
-	***************************************************************************
+    ***************************************************************************
 
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -37,17 +37,17 @@
     ***************************************************************************
 
     http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
-	the FAQ page "My application does not run, what could be wrong?".  Have you
-	defined configASSERT()?
+    the FAQ page "My application does not run, what could be wrong?".  Have you
+    defined configASSERT()?
 
-	http://www.FreeRTOS.org/support - In return for receiving this top quality
-	embedded software for free we request you assist our global community by
-	participating in the support forum.
+    http://www.FreeRTOS.org/support - In return for receiving this top quality
+    embedded software for free we request you assist our global community by
+    participating in the support forum.
 
-	http://www.FreeRTOS.org/training - Investing in training allows your team to
-	be as productive as possible as early as possible.  Now you can receive
-	FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
-	Ltd, and the world's leading authority on the world's leading RTOS.
+    http://www.FreeRTOS.org/training - Investing in training allows your team to
+    be as productive as possible as early as possible.  Now you can receive
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+    Ltd, and the world's leading authority on the world's leading RTOS.
 
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS
@@ -192,7 +192,7 @@ static void prvTimerTestTask( void *pvParameters )
 	xOneShotTimer = xTimerCreate(	"Oneshot Timer",				/* Text name to facilitate debugging.  The kernel does not use this itself. */
 									tmrdemoONE_SHOT_TIMER_PERIOD,	/* The period for the timer. */
 									pdFALSE,						/* Don't auto-reload - hence a one shot timer. */
-									( void * ) 0,					/* The timer identifier.  In this case this is not used as the timer has its own callback. */
+									( void * ) 0,					/* The timer identifier.  Initialise to 0, then increment each time it is called. */
 									prvOneShotTimerCallback );		/* The callback to be called when the timer expires. */
 
 	if( xOneShotTimer == NULL )
@@ -395,10 +395,14 @@ static void	prvTest3_CheckAutoReloadExpireRates( void )
 {
 uint8_t ucMaxAllowableValue, ucMinAllowableValue, ucTimer;
 TickType_t xBlockPeriod, xTimerPeriod, xExpectedNumber;
-
-	/* Check the auto reload timers expire at the expected rates. */
-
-
+UBaseType_t uxOriginalPriority;
+
+	/* Check the auto reload timers expire at the expected rates.  Do this at a
+	high priority for maximum accuracy.  This is ok as most of the time is spent
+	in the Blocked state. */
+	uxOriginalPriority = uxTaskPriorityGet( NULL );
+	vTaskPrioritySet( NULL, ( configMAX_PRIORITIES - 1 ) );
+	
 	/* Delaying for configTIMER_QUEUE_LENGTH * xBasePeriod ticks should allow
 	all the auto reload timers to expire at least once. */
 	xBlockPeriod = ( ( TickType_t ) configTIMER_QUEUE_LENGTH ) * xBasePeriod;
@@ -425,6 +429,9 @@ TickType_t xBlockPeriod, xTimerPeriod, xExpectedNumber;
 		}
 	}
 
+	/* Return to the original priority. */
+	vTaskPrioritySet( NULL, uxOriginalPriority );
+
 	if( xTestStatus == pdPASS )
 	{
 		/* No errors have been reported so increment the loop counter so the
@@ -1037,12 +1044,12 @@ static TickType_t uxTick = ( TickType_t ) -1;
 
 static void prvAutoReloadTimerCallback( TimerHandle_t pxExpiredTimer )
 {
-uint32_t ulTimerID;
+size_t uxTimerID;
 
-	ulTimerID = ( uint32_t ) pvTimerGetTimerID( pxExpiredTimer );
-	if( ulTimerID <= ( configTIMER_QUEUE_LENGTH + 1 ) )
+	uxTimerID = ( size_t ) pvTimerGetTimerID( pxExpiredTimer );
+	if( uxTimerID <= ( configTIMER_QUEUE_LENGTH + 1 ) )
 	{
-		( ucAutoReloadTimerCounters[ ulTimerID ] )++;
+		( ucAutoReloadTimerCounters[ uxTimerID ] )++;
 	}
 	else
 	{
@@ -1055,9 +1062,22 @@ uint32_t ulTimerID;
 
 static void prvOneShotTimerCallback( TimerHandle_t pxExpiredTimer )
 {
-	/* The parameter is not used in this case as only one timer uses this
-	callback function. */
-	( void ) pxExpiredTimer;
+/* A count is kept of the number of times this callback function is executed.
+The count is stored as the timer's ID.  This is only done to test the
+vTimerSetTimerID() function. */
+static size_t uxCallCount = 0;
+size_t uxLastCallCount;
+
+	/* Obtain the timer's ID, which should be a count of the number of times
+	this callback function has been executed. */
+	uxLastCallCount = ( size_t ) pvTimerGetTimerID( pxExpiredTimer );
+	configASSERT( uxLastCallCount == uxCallCount );
+
+	/* Increment the call count, then save it back as the timer's ID.  This is
+	only done to test the vTimerSetTimerID() API function. */
+	uxLastCallCount++;
+	vTimerSetTimerID( pxExpiredTimer, ( void * ) uxLastCallCount );
+	uxCallCount++;
 
 	ucOneShotTimerCounter++;
 }