X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FCommon%2FMinimal%2FTimerDemo.c;h=d79f1c354a06bb0a2dfc3067c38c3c388234a2a8;hb=a5c0757e04456aadb5b96170f91f586608f1ae09;hp=35f8d96780ca6d83e6874c5cd9e21632e274886d;hpb=05208d0454639ac6d880cafbb891560c98e93297;p=freertos diff --git a/FreeRTOS/Demo/Common/Minimal/TimerDemo.c b/FreeRTOS/Demo/Common/Minimal/TimerDemo.c index 35f8d9678..d79f1c354 100644 --- a/FreeRTOS/Demo/Common/Minimal/TimerDemo.c +++ b/FreeRTOS/Demo/Common/Minimal/TimerDemo.c @@ -1,60 +1,64 @@ /* - FreeRTOS V8.0.1 - Copyright (C) 2014 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. - *************************************************************************** - * * - * FreeRTOS provides completely free yet professionally developed, * - * robust, strictly quality controlled, supported, and cross * - * platform software that has become a de facto standard. * - * * - * Help yourself get started quickly and support the FreeRTOS * - * project by purchasing a FreeRTOS tutorial book, reference * - * manual, or both from: http://www.FreeRTOS.org/Documentation * - * * - * Thank you! * - * * - *************************************************************************** - This file is part of the FreeRTOS distribution. 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 - FOR A PARTICULAR PURPOSE. Full license text is available from the following + FOR A PARTICULAR PURPOSE. Full license text is available on the following link: http://www.freertos.org/a00114.html - 1 tab == 4 spaces! - *************************************************************************** * * - * Having a problem? Start by reading the FAQ "My application does * - * not run, what could be wrong?" * + * FreeRTOS provides completely free yet professionally developed, * + * robust, strictly quality controlled, supported, and cross * + * platform software that is more than just the market leader, it * + * is the industry's de facto standard. * * * - * http://www.FreeRTOS.org/FAQHelp.html * + * Help yourself get started quickly while simultaneously helping * + * to support the FreeRTOS project by purchasing a FreeRTOS * + * tutorial book, reference manual, or both: * + * http://www.FreeRTOS.org/Documentation * * * *************************************************************************** - http://www.FreeRTOS.org - Documentation, books, training, latest versions, - license and Real Time Engineers Ltd. contact details. + 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()? + + 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/plus - A selection of FreeRTOS ecosystem products, including FreeRTOS+Trace - an indispensable productivity tool, a DOS compatible FAT file system, and our tiny thread aware UDP/IP stack. - http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High - Integrity Systems to sell under the OpenRTOS brand. Low cost OpenRTOS - licenses offer ticketed support, indemnification and middleware. + http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate. + Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS. + + http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High + Integrity Systems ltd. to sell under the OpenRTOS brand. Low cost OpenRTOS + licenses offer ticketed support, indemnification and commercial middleware. http://www.SafeRTOS.com - High Integrity Systems also provide a safety engineered and independently SIL3 certified version for use in safety and @@ -188,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 ) @@ -210,7 +214,7 @@ static void prvTimerTestTask( void *pvParameters ) /* Check the auto reload timers can be stopped correctly, and correctly report their state. */ prvTest4_CheckAutoReloadTimersCanBeStopped(); - + /* Check the one shot timer only calls its callback once after it has been started, and that it reports its state correctly. */ prvTest5_CheckBasicOneShotTimerBehaviour(); @@ -238,7 +242,7 @@ static TickType_t xIterationsWithoutCounterIncrement = ( TickType_t ) 0, xLastCy elsewhere. Start counting Iterations again. */ xIterationsWithoutCounterIncrement = ( TickType_t ) 0; xLastCycleFrequency = xCycleFrequency; - } + } /* Calculate the maximum number of times that it is permissible for this function to be called without ulLoopCounter being incremented. This is @@ -277,7 +281,7 @@ static TickType_t xIterationsWithoutCounterIncrement = ( TickType_t ) 0, xLastCy static void prvTest1_CreateTimersWithoutSchedulerRunning( void ) { -UBaseType_t xTimer; +TickType_t xTimer; for( xTimer = 0; xTimer < configTIMER_QUEUE_LENGTH; xTimer++ ) { @@ -336,7 +340,7 @@ UBaseType_t xTimer; configASSERT( xTestStatus ); } } - + /* Create the timers that are used from the tick interrupt to test the timer API functions that can be called from an ISR. */ xISRAutoReloadTimer = xTimerCreate( "ISR AR", /* The text name given to the timer. */ @@ -350,7 +354,7 @@ UBaseType_t xTimer; pdFALSE, /* This is a one shot timer. */ ( void * ) NULL, /* The identifier is not required. */ prvISROneShotTimerCallback ); /* The callback that is executed when the timer expires. */ - + if( ( xISRAutoReloadTimer == NULL ) || ( xISROneShotTimer == NULL ) ) { xTestStatus = pdFAIL; @@ -391,16 +395,20 @@ static void prvTest3_CheckAutoReloadExpireRates( void ) { uint8_t ucMaxAllowableValue, ucMinAllowableValue, ucTimer; TickType_t xBlockPeriod, xTimerPeriod, xExpectedNumber; +UBaseType_t uxOriginalPriority; - /* Check the auto reload timers expire at the expected rates. */ - + /* 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; vTaskDelay( xBlockPeriod ); - /* Check that all the auto reload timers have called their callback + /* Check that all the auto reload timers have called their callback function the expected number of times. */ for( ucTimer = 0; ucTimer < ( uint8_t ) configTIMER_QUEUE_LENGTH; ucTimer++ ) { @@ -408,7 +416,7 @@ TickType_t xBlockPeriod, xTimerPeriod, xExpectedNumber; by the timer period. */ xTimerPeriod = ( ( ( TickType_t ) ucTimer + ( TickType_t ) 1 ) * xBasePeriod ); xExpectedNumber = xBlockPeriod / xTimerPeriod; - + ucMaxAllowableValue = ( ( uint8_t ) xExpectedNumber ) ; ucMinAllowableValue = ( uint8_t ) ( ( uint8_t ) xExpectedNumber - ( uint8_t ) 1 ); /* Weird casting to try and please all compilers. */ @@ -421,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 @@ -431,7 +442,7 @@ TickType_t xBlockPeriod, xTimerPeriod, xExpectedNumber; /*-----------------------------------------------------------*/ static void prvTest4_CheckAutoReloadTimersCanBeStopped( void ) -{ +{ uint8_t ucTimer; /* Check the auto reload timers can be stopped correctly, and correctly @@ -739,9 +750,19 @@ static TickType_t uxTick = ( TickType_t ) -1; will expire when the kernel's tick count is (100 + xBasePeriod). For this reason xMargin is used as an allowable margin for premature timer expiries as well as late timer expiries. */ - const TickType_t xMargin = 6; + #ifdef _WINDOWS_ + /* Windows is not real real time. */ + const TickType_t xMargin = 20; + #else + const TickType_t xMargin = 6; + #endif /* _WINDOWS_ */ #else - const TickType_t xMargin = 3; + #ifdef _WINDOWS_ + /* Windows is not real real time. */ + const TickType_t xMargin = 20; + #else + const TickType_t xMargin = 4; + #endif /* _WINDOWS_ */ #endif @@ -749,7 +770,7 @@ static TickType_t uxTick = ( TickType_t ) -1; if( uxTick == 0 ) { - /* The timers will have been created, but not started. Start them now + /* The timers will have been created, but not started. Start them now by setting their period. */ ucISRAutoReloadTimerCounter = 0; ucISROneShotTimerCounter = 0; @@ -765,7 +786,7 @@ static TickType_t uxTick = ( TickType_t ) -1; /* First timer was started, try starting the second timer. */ if( xTimerChangePeriodFromISR( xISROneShotTimer, xBasePeriod, NULL ) == pdPASS ) { - /* Both timers were started, so set the uxTick back to its + /* Both timers were started, so set the uxTick back to its proper value. */ uxTick = 0; } @@ -805,7 +826,7 @@ static TickType_t uxTick = ( TickType_t ) -1; { xTestStatus = pdFAIL; configASSERT( xTestStatus ); - } + } } else if( uxTick == ( ( 2 * xBasePeriod ) + xMargin ) ) { @@ -817,7 +838,7 @@ static TickType_t uxTick = ( TickType_t ) -1; xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - + if( ucISROneShotTimerCounter != 1 ) { xTestStatus = pdFAIL; @@ -834,13 +855,13 @@ static TickType_t uxTick = ( TickType_t ) -1; xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - + if( ucISROneShotTimerCounter != 1 ) { xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - } + } else if( uxTick == ( 3 * xBasePeriod ) ) { /* Start the one shot timer again. */ @@ -856,17 +877,17 @@ static TickType_t uxTick = ( TickType_t ) -1; xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - + if( ucISROneShotTimerCounter != 1 ) { xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - + /* Now stop the auto reload timer. The one shot timer was started a few ticks ago. */ xTimerStopFromISR( xISRAutoReloadTimer, NULL ); - } + } else if( uxTick == ( 4 * ( xBasePeriod - xMargin ) ) ) { /* The auto reload timer is now stopped, and the one shot timer is @@ -877,13 +898,13 @@ static TickType_t uxTick = ( TickType_t ) -1; xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - + if( ucISROneShotTimerCounter != 1 ) { xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - } + } else if( uxTick == ( ( 4 * xBasePeriod ) + xMargin ) ) { /* The auto reload timer is now stopped, and the one shot timer is @@ -894,13 +915,13 @@ static TickType_t uxTick = ( TickType_t ) -1; xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - + if( ucISROneShotTimerCounter != 2 ) { xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - } + } else if( uxTick == ( 8 * xBasePeriod ) ) { /* The auto reload timer is now stopped, and the one shot timer has @@ -911,16 +932,16 @@ static TickType_t uxTick = ( TickType_t ) -1; xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - + if( ucISROneShotTimerCounter != 2 ) { xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - + /* Now reset the one shot timer. */ xTimerResetFromISR( xISROneShotTimer, NULL ); - } + } else if( uxTick == ( ( 9 * xBasePeriod ) - xMargin ) ) { /* Only the one shot timer should be running, but it should not have @@ -931,15 +952,15 @@ static TickType_t uxTick = ( TickType_t ) -1; xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - + if( ucISROneShotTimerCounter != 2 ) { xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - + xTimerResetFromISR( xISROneShotTimer, NULL ); - } + } else if( uxTick == ( ( 10 * xBasePeriod ) - ( 2 * xMargin ) ) ) { /* Only the one shot timer should be running, but it should not have @@ -950,13 +971,13 @@ static TickType_t uxTick = ( TickType_t ) -1; xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - + if( ucISROneShotTimerCounter != 2 ) { xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - + xTimerResetFromISR( xISROneShotTimer, NULL ); } else if( uxTick == ( ( 11 * xBasePeriod ) - ( 3 * xMargin ) ) ) @@ -969,15 +990,15 @@ static TickType_t uxTick = ( TickType_t ) -1; xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - + if( ucISROneShotTimerCounter != 2 ) { xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - + xTimerResetFromISR( xISROneShotTimer, NULL ); - } + } else if( uxTick == ( ( 12 * xBasePeriod ) - ( 2 * xMargin ) ) ) { /* Only the one shot timer should have been running and this time it @@ -990,7 +1011,7 @@ static TickType_t uxTick = ( TickType_t ) -1; xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - + if( ucISROneShotTimerCounter != 3 ) { xTestStatus = pdFAIL; @@ -1007,15 +1028,15 @@ static TickType_t uxTick = ( TickType_t ) -1; xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - + if( ucISROneShotTimerCounter != 3 ) { xTestStatus = pdFAIL; configASSERT( xTestStatus ); } - + uxTick = ( TickType_t ) -1; - } + } } /*-----------------------------------------------------------*/ @@ -1023,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 { @@ -1041,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++; }