***IMMINENT RELEASE NOTICE***

[freertos] / FreeRTOS / Demo / CORTEX_A9_Zynq_ZC702 / RTOSDemo / src / Full_Demo / main_full.c

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/Full_Demo/main_full.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/Full_Demo/main_full.c
index fea3fcb378c933d7fa2c0571ea155268cbfedf2f..9045de62656f92204520bb0240c463faca4c3de8 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/Full_Demo/main_full.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/Full_Demo/main_full.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V8.0.0 - Copyright (C) 2014 Real Time Engineers Ltd.\r
+    FreeRTOS V8.1.0 - Copyright (C) 2014 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -24,10 +24,10 @@
     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
+    >>!   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
     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
@@ -64,11 +64,11 @@
 */\r
 \r
 /******************************************************************************\r
- * NOTE 1:  This project provides two demo applications.  A simple blinky style\r
- * project, and a more comprehensive test and demo application.  The\r
- * mainCREATE_SIMPLE_BLINKY_DEMO_ONLY setting in main.c is used to select\r
- * between the two.  See the notes on using mainCREATE_SIMPLE_BLINKY_DEMO_ONLY\r
- * in main.c.  This file implements the comprehensive test and demo version.\r
+ * NOTE 1:  This project provides three demo applications.  A simple blinky\r
+ * style project, a more comprehensive test and demo application, and an\r
+ * lwIP example.  The mainSELECTED_APPLICATION setting in main.c is used to\r
+ * select between the three.  See the notes on using mainSELECTED_APPLICATION\r
+ * in main.c.  This file implements the simply blinky style version.\r
  *\r
  * NOTE 2:  This file only contains the source code that is specific to the\r
  * full demo.  Generic functions, such FreeRTOS hook functions, and functions\r
@@ -184,11 +184,6 @@ purpose of ensuring parameters are passed into tasks correctly. */
 \r
 /*-----------------------------------------------------------*/\r
 \r
-/*\r
- * Called by main() to run the full demo (as opposed to the blinky demo) when\r
- * mainCREATE_SIMPLE_BLINKY_DEMO_ONLY is set to 0.\r
- */\r
-void main_full( void );\r
 \r
 /*\r
  * The check task, as described at the top of this file.\r
@@ -233,6 +228,9 @@ then the register check tasks has not discovered any errors.  If a variable
 stops incrementing, then an error has been found. */\r
 volatile unsigned long ulRegTest1LoopCounter = 0UL, ulRegTest2LoopCounter = 0UL;\r
 \r
+/* String for display in the web server.  It is set to an error message if the\r
+check task detects an error.  */\r
+char *pcStatusMessage = "All tasks running without error";\r
 /*-----------------------------------------------------------*/\r
 \r
 void main_full( void )\r
@@ -409,11 +407,18 @@ unsigned long ulErrorFound = pdFALSE;
                        gone wrong (it might just be that the loop back connector required\r
                        by the comtest tasks has not been fitted). */\r
                        xDelayPeriod = mainERROR_CHECK_TASK_PERIOD;\r
+                       pcStatusMessage = "Error found in at least one task.";\r
                }\r
        }\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
+char *pcMainGetTaskStatusMessage( void )\r
+{\r
+       return pcStatusMessage;\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
 static void prvRegTestTaskEntry1( void *pvParameters )\r
 {\r
        /* Although the regtest task is written in assembler, its entry point is\r