Update version number ready for V8.2.1 release.

[freertos] / FreeRTOS / Demo / AVR_ATMega323_WinAVR / main.c

diff --git a/FreeRTOS/Demo/AVR_ATMega323_WinAVR/main.c b/FreeRTOS/Demo/AVR_ATMega323_WinAVR/main.c
index d101306dfa729001948d79dcae2b4515e375074d..cc897d9ef5b54c8047249a5880aeb797e0cb06cb 100644 (file)
--- a/FreeRTOS/Demo/AVR_ATMega323_WinAVR/main.c
+++ b/FreeRTOS/Demo/AVR_ATMega323_WinAVR/main.c
@@ -1,60 +1,64 @@
 /*\r
 /*\r

-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V8.2.1 - Copyright (C) 2015 Real Time Engineers Ltd.\r

     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
 \r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
 \r

-    ***************************************************************************\r
-     *                                                                       *\r
-     *    FreeRTOS provides completely free yet professionally developed,    *\r
-     *    robust, strictly quality controlled, supported, and cross          *\r
-     *    platform software that has become a de facto standard.             *\r
-     *                                                                       *\r
-     *    Help yourself get started quickly and support the FreeRTOS         *\r
-     *    project by purchasing a FreeRTOS tutorial book, reference          *\r
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *\r
-     *                                                                       *\r
-     *    Thank you!                                                         *\r
-     *                                                                       *\r
-    ***************************************************************************\r
-\r

     This file is part of the FreeRTOS distribution.\r
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
     Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
 \r
     This file is part of the FreeRTOS distribution.\r
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
     Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
 \r

-    >>! NOTE: The modification to the GPL is included to allow you to distribute\r
-    >>! a combined work that includes FreeRTOS without being obliged to provide\r
-    >>! the source code for proprietary components outside of the FreeRTOS\r
-    >>! kernel.\r
+    ***************************************************************************\r
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<\r
+    >>!   obliged to provide the source code for proprietary components     !<<\r
+    >>!   outside of the FreeRTOS kernel.                                   !<<\r
+    ***************************************************************************\r

 \r
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
 \r
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r

-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following\r
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following\r

     link: http://www.freertos.org/a00114.html\r
 \r
     link: http://www.freertos.org/a00114.html\r
 \r

-    1 tab == 4 spaces!\r
-\r

     ***************************************************************************\r
      *                                                                       *\r
     ***************************************************************************\r
      *                                                                       *\r

-     *    Having a problem?  Start by reading the FAQ "My application does   *\r
-     *    not run, what could be wrong?"                                     *\r
+     *    FreeRTOS provides completely free yet professionally developed,    *\r
+     *    robust, strictly quality controlled, supported, and cross          *\r
+     *    platform software that is more than just the market leader, it     *\r
+     *    is the industry's de facto standard.                               *\r

      *                                                                       *\r
      *                                                                       *\r

-     *    http://www.FreeRTOS.org/FAQHelp.html                               *\r
+     *    Help yourself get started quickly while simultaneously helping     *\r
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *\r
+     *    tutorial book, reference manual, or both:                          *\r
+     *    http://www.FreeRTOS.org/Documentation                              *\r

      *                                                                       *\r
     ***************************************************************************\r
 \r
      *                                                                       *\r
     ***************************************************************************\r
 \r

-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,\r
-    license and Real Time Engineers Ltd. contact details.\r
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading\r
+    the FAQ page "My application does not run, what could be wrong?".  Have you\r
+    defined configASSERT()?\r
+\r
+    http://www.FreeRTOS.org/support - In return for receiving this top quality\r
+    embedded software for free we request you assist our global community by\r
+    participating in the support forum.\r
+\r
+    http://www.FreeRTOS.org/training - Investing in training allows your team to\r
+    be as productive as possible as early as possible.  Now you can receive\r
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers\r
+    Ltd, and the world's leading authority on the world's leading RTOS.\r

 \r
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS\r
     compatible FAT file system, and our tiny thread aware UDP/IP stack.\r
 \r
 \r
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS\r
     compatible FAT file system, and our tiny thread aware UDP/IP stack.\r
 \r

-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High\r
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS\r
-    licenses offer ticketed support, indemnification and middleware.\r
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.\r
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.\r
+\r
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High\r
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS\r
+    licenses offer ticketed support, indemnification and commercial middleware.\r

 \r
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety\r
     engineered and independently SIL3 certified version for use in safety and\r
 \r
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety\r
     engineered and independently SIL3 certified version for use in safety and\r


@@ -66,15 +70,15 @@
 /*\r
  * Creates all the demo application tasks, then starts the scheduler.  The WEB\r
  * documentation provides more details of the demo application tasks.\r
 /*\r
  * Creates all the demo application tasks, then starts the scheduler.  The WEB\r
  * documentation provides more details of the demo application tasks.\r

- * \r
- * Main. c also creates a task called "Check".  This only executes every three \r
- * seconds but has the highest priority so is guaranteed to get processor time.  \r
- * Its main function is to check that all the other tasks are still operational.  \r
- * Each task that does not flash an LED maintains a unique count that is \r
- * incremented each time the task successfully completes its function.  Should \r
- * any error occur within such a task the count is permanently halted.  The \r
+ *\r
+ * Main. c also creates a task called "Check".  This only executes every three\r
+ * seconds but has the highest priority so is guaranteed to get processor time.\r
+ * Its main function is to check that all the other tasks are still operational.\r
+ * Each task that does not flash an LED maintains a unique count that is\r
+ * incremented each time the task successfully completes its function.  Should\r
+ * any error occur within such a task the count is permanently halted.  The\r

  * check task inspects the count of each task to ensure it has changed since\r
  * check task inspects the count of each task to ensure it has changed since\r

- * the last time the check task executed.  If all the count variables have \r
+ * the last time the check task executed.  If all the count variables have\r

  * changed all the tasks are still executing error free, and the check task\r
  * toggles an LED.  Should any task contain an error at any time the LED toggle\r
  * will stop.\r
  * changed all the tasks are still executing error free, and the check task\r
  * toggles an LED.  Should any task contain an error at any time the LED toggle\r
  * will stop.\r


@@ -84,12 +88,12 @@
 \r
 /*\r
 Changes from V1.2.0\r
 \r
 /*\r
 Changes from V1.2.0\r

-       \r
+\r

        + Changed the baud rate for the serial test from 19200 to 57600.\r
 \r
 Changes from V1.2.3\r
 \r
        + Changed the baud rate for the serial test from 19200 to 57600.\r
 \r
 Changes from V1.2.3\r
 \r

-       + The integer and comtest tasks are now used when the cooperative scheduler \r
+       + The integer and comtest tasks are now used when the cooperative scheduler\r

          is being used.  Previously they were only used with the preemptive\r
          scheduler.\r
 \r
          is being used.  Previously they were only used with the preemptive\r
          scheduler.\r
 \r


@@ -101,7 +105,7 @@ Changes from V1.2.5
 Changes from V2.0.0\r
 \r
        + Delay periods are now specified using variables and constants of\r
 Changes from V2.0.0\r
 \r
        + Delay periods are now specified using variables and constants of\r

-         portTickType rather than unsigned long.\r
+         TickType_t rather than unsigned long.\r

 \r
 Changes from V2.6.1\r
 \r
 \r
 Changes from V2.6.1\r
 \r


@@ -118,7 +122,7 @@ Changes from V4.0.5
 \r
 #ifdef GCC_MEGA_AVR\r
        /* EEPROM routines used only with the WinAVR compiler. */\r
 \r
 #ifdef GCC_MEGA_AVR\r
        /* EEPROM routines used only with the WinAVR compiler. */\r

-       #include <avr/eeprom.h> \r
+       #include <avr/eeprom.h>\r

 #endif\r
 \r
 /* Scheduler include files. */\r
 #endif\r
 \r
 /* Scheduler include files. */\r


@@ -157,7 +161,7 @@ again. */
 #define mainCHECK_TASK_LED                             ( 7 )\r
 \r
 /* The period between executions of the check task. */\r
 #define mainCHECK_TASK_LED                             ( 7 )\r
 \r
 /* The period between executions of the check task. */\r

-#define mainCHECK_PERIOD                               ( ( portTickType ) 3000 / portTICK_RATE_MS  )\r
+#define mainCHECK_PERIOD                               ( ( TickType_t ) 3000 / portTICK_PERIOD_MS  )\r

 \r
 /* An address in the EEPROM used to count resets.  This is used to check that\r
 the demo application is not unexpectedly resetting. */\r
 \r
 /* An address in the EEPROM used to count resets.  This is used to check that\r
 the demo application is not unexpectedly resetting. */\r


@@ -173,12 +177,12 @@ static void vErrorChecks( void *pvParameters );
 \r
 /*\r
  * Checks the unique counts of other tasks to ensure they are still operational.\r
 \r
 /*\r
  * Checks the unique counts of other tasks to ensure they are still operational.\r

- * Flashes an LED if everything is okay. \r
+ * Flashes an LED if everything is okay.\r

  */\r
 static void prvCheckOtherTasksAreStillRunning( void );\r
 \r
 /*\r
  */\r
 static void prvCheckOtherTasksAreStillRunning( void );\r
 \r
 /*\r

- * Called on boot to increment a count stored in the EEPROM.  This is used to \r
+ * Called on boot to increment a count stored in the EEPROM.  This is used to\r

  * ensure the CPU does not reset unexpectedly.\r
  */\r
 static void prvIncrementResetCount( void );\r
  * ensure the CPU does not reset unexpectedly.\r
  */\r
 static void prvIncrementResetCount( void );\r


@@ -202,15 +206,15 @@ short main( void )
        vAltStartComTestTasks( mainCOM_TEST_PRIORITY, mainCOM_TEST_BAUD_RATE, mainCOM_TEST_LED );\r
        vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );\r
        vStartRegTestTasks();\r
        vAltStartComTestTasks( mainCOM_TEST_PRIORITY, mainCOM_TEST_BAUD_RATE, mainCOM_TEST_LED );\r
        vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );\r
        vStartRegTestTasks();\r

-       \r
+\r

        /* Create the tasks defined within this file. */\r
        /* Create the tasks defined within this file. */\r

-       xTaskCreate( vErrorChecks, ( signed char * ) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );\r
+       xTaskCreate( vErrorChecks, "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );\r

 \r
        /* Create the co-routines that flash the LED's. */\r
        vStartFlashCoRoutines( mainNUM_FLASH_COROUTINES );\r
 \r
        /* Create the co-routines that flash the LED's. */\r
        vStartFlashCoRoutines( mainNUM_FLASH_COROUTINES );\r

-       \r
-       /* In this port, to use preemptive scheduler define configUSE_PREEMPTION \r
-       as 1 in portmacro.h.  To use the cooperative scheduler define \r
+\r
+       /* In this port, to use preemptive scheduler define configUSE_PREEMPTION\r
+       as 1 in portmacro.h.  To use the cooperative scheduler define\r

        configUSE_PREEMPTION as 0. */\r
        vTaskStartScheduler();\r
 \r
        configUSE_PREEMPTION as 0. */\r
        vTaskStartScheduler();\r
 \r


@@ -231,11 +235,11 @@ static volatile unsigned long ulDummyVariable = 3UL;
        {\r
                vTaskDelay( mainCHECK_PERIOD );\r
 \r
        {\r
                vTaskDelay( mainCHECK_PERIOD );\r
 \r

-               /* Perform a bit of 32bit maths to ensure the registers used by the \r
-               integer tasks get some exercise. The result here is not important - \r
+               /* Perform a bit of 32bit maths to ensure the registers used by the\r
+               integer tasks get some exercise. The result here is not important -\r

                see the demo application documentation for more info. */\r
                ulDummyVariable *= 3;\r
                see the demo application documentation for more info. */\r
                ulDummyVariable *= 3;\r

-               \r
+\r

                prvCheckOtherTasksAreStillRunning();\r
        }\r
 }\r
                prvCheckOtherTasksAreStillRunning();\r
        }\r
 }\r


@@ -264,7 +268,7 @@ static portBASE_TYPE xErrorHasOccurred = pdFALSE;
        {\r
                xErrorHasOccurred = pdTRUE;\r
        }\r
        {\r
                xErrorHasOccurred = pdTRUE;\r
        }\r

-       \r
+\r

        if( xErrorHasOccurred == pdFALSE )\r
        {\r
                /* Toggle the LED if everything is okay so we know if an error occurs even if not\r
        if( xErrorHasOccurred == pdFALSE )\r
        {\r
                /* Toggle the LED if everything is okay so we know if an error occurs even if not\r