|
|
|
@ -1,5 +1,5 @@
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
FreeRTOS V7.0.1 - Copyright (C) 2011 Real Time Engineers Ltd.
|
|
|
|
FreeRTOS V7.0.2 - Copyright (C) 2011 Real Time Engineers Ltd.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
***************************************************************************
|
|
|
|
***************************************************************************
|
|
|
|
@ -164,7 +164,7 @@ by at least one task. See the description of the check timer in the comments at
|
|
|
|
the top of this file. */
|
|
|
|
the top of this file. */
|
|
|
|
#define mainERROR_CHECK_TIMER_PERIOD ( 200 / portTICK_RATE_MS )
|
|
|
|
#define mainERROR_CHECK_TIMER_PERIOD ( 200 / portTICK_RATE_MS )
|
|
|
|
|
|
|
|
|
|
|
|
/* A block time of zero simply means "don't block". */
|
|
|
|
/* A block time of zero simply means "don't block". */
|
|
|
|
#define mainDONT_BLOCK ( ( portTickType ) 0 )
|
|
|
|
#define mainDONT_BLOCK ( ( portTickType ) 0 )
|
|
|
|
|
|
|
|
|
|
|
|
/* The LED used by the comtest tasks. See the comtest_strings.c file for more
|
|
|
|
/* The LED used by the comtest tasks. See the comtest_strings.c file for more
|
|
|
|
@ -391,7 +391,7 @@ portTickType xExecutionRate = mainNO_ERROR_CHECK_TIMER_PERIOD;
|
|
|
|
a faster rate - giving the user visual feedback that something is not
|
|
|
|
a faster rate - giving the user visual feedback that something is not
|
|
|
|
as it should be. This function is called from the context of the
|
|
|
|
as it should be. This function is called from the context of the
|
|
|
|
timer service task so must ***not*** attempt to block while calling
|
|
|
|
timer service task so must ***not*** attempt to block while calling
|
|
|
|
this function. */
|
|
|
|
this function. */
|
|
|
|
if( xTimerChangePeriod( xTimer, mainERROR_CHECK_TIMER_PERIOD, mainDONT_BLOCK ) == pdPASS )
|
|
|
|
if( xTimerChangePeriod( xTimer, mainERROR_CHECK_TIMER_PERIOD, mainDONT_BLOCK ) == pdPASS )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
/* If the command to change the timer period was sent to the
|
|
|
|
/* If the command to change the timer period was sent to the
|
|
|
|
@ -619,7 +619,7 @@ unsigned long ulTimerCounts1, ulTimerCounts2, ulTickCount, ulReturn;
|
|
|
|
|
|
|
|
|
|
|
|
/* If this is being called from a yield, has the counter overflowed since
|
|
|
|
/* If this is being called from a yield, has the counter overflowed since
|
|
|
|
it was read? If that is the case then ulTickCounts will need incrementing
|
|
|
|
it was read? If that is the case then ulTickCounts will need incrementing
|
|
|
|
again as it will not yet have been incremented from the tick interrupt. */
|
|
|
|
again as it will not yet have been incremented from the tick interrupt. */
|
|
|
|
ulTimerCounts2 = ulCounterReloadValue - XTmrCtr_GetValue( &xTimer0Instance, ucTimerCounterNumber );
|
|
|
|
ulTimerCounts2 = ulCounterReloadValue - XTmrCtr_GetValue( &xTimer0Instance, ucTimerCounterNumber );
|
|
|
|
if( ulTimerCounts2 < ulTimerCounts1 )
|
|
|
|
if( ulTimerCounts2 < ulTimerCounts1 )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
Richard Barry
14 years ago