Update TimerDemo.c to test the new vTimerSetTimerID() function.

[freertos] / FreeRTOS / Demo / Common / Minimal / TimerDemo.c

diff --git a/FreeRTOS/Demo/Common/Minimal/TimerDemo.c b/FreeRTOS/Demo/Common/Minimal/TimerDemo.c
index de37052b20ed6c2ac8fd147e2f051663cb61e1b5..1a7ec746e3116e15421e32c4b5ba043b033d8bca 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/TimerDemo.c
+++ b/FreeRTOS/Demo/Common/Minimal/TimerDemo.c
@@ -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. */\r
                                                                        tmrdemoONE_SHOT_TIMER_PERIOD,   /* The period for the timer. */\r
                                                                        pdFALSE,                                                /* Don't auto-reload - hence a one shot timer. */\r
-                                                                       ( void * ) 0,                                   /* The timer identifier.  In this case this is not used as the timer has its own callback. */\r
+                                                                       ( void * ) 0,                                   /* The timer identifier.  Initialise to 0, then increment each time it is called. */\r
                                                                        prvOneShotTimerCallback );              /* The callback to be called when the timer expires. */\r
 \r
        if( xOneShotTimer == NULL )\r
@@ -1062,9 +1062,22 @@ uint32_t ulTimerID;
 \r
 static void prvOneShotTimerCallback( TimerHandle_t pxExpiredTimer )\r
 {\r
-       /* The parameter is not used in this case as only one timer uses this\r
-       callback function. */\r
-       ( void ) pxExpiredTimer;\r
+/* A count is kept of the number of times this callback function is executed.\r
+The count is stored as the timer's ID.  This is only done to test the\r
+vTimerSetTimerID() function. */\r
+static uint32_t ulCallCount = 0;\r
+uint32_t ulLastCallCount;\r
+\r
+       /* Obtain the timer's ID, which should be a count of the number of times\r
+       this callback function has been executed. */\r
+       ulLastCallCount = ( uint32_t ) pvTimerGetTimerID( pxExpiredTimer );\r
+       configASSERT( ulLastCallCount == ulCallCount );\r
+\r
+       /* Increment the call count, then save it back as the timer's ID.  This is\r
+       only done to test the vTimerSetTimerID() API function. */\r
+       ulLastCallCount++;\r
+       vTimerSetTimerID( pxExpiredTimer, ( void * ) ulLastCallCount );\r
+       ulCallCount++;  \r
 \r
        ucOneShotTimerCounter++;\r
 }\r