/*\r
- FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry.\r
+ FreeRTOS.org V5.1.1 - Copyright (C) 2003-2008 Richard Barry.\r
\r
This file is part of the FreeRTOS distribution.\r
\r
of http://www.FreeRTOS.org for full details of how and when the exception\r
can be applied.\r
\r
- ***************************************************************************\r
- See http://www.FreeRTOS.org for documentation, latest information, license\r
- and contact details. Please ensure to read the configuration and relevant\r
- port sections of the online documentation.\r
+ ***************************************************************************\r
+ ***************************************************************************\r
+ * *\r
+ * SAVE TIME AND MONEY! We can port FreeRTOS.org to your own hardware, *\r
+ * and even write all or part of your application on your behalf. *\r
+ * See http://www.OpenRTOS.com for details of the services we provide to *\r
+ * expedite your project. *\r
+ * *\r
+ ***************************************************************************\r
+ ***************************************************************************\r
\r
- Also see http://www.SafeRTOS.com for an IEC 61508 compliant version along\r
- with commercial development and support options.\r
- ***************************************************************************\r
+ Please ensure to read the configuration and relevant port sections of the\r
+ online documentation.\r
+\r
+ http://www.FreeRTOS.org - Documentation, latest information, license and \r
+ contact details.\r
+\r
+ http://www.SafeRTOS.com - A version that is certified for use in safety \r
+ critical systems.\r
+\r
+ http://www.OpenRTOS.com - Commercial support, development, porting, \r
+ licensing and training services.\r
*/\r
\r
/*\r
* documentation provides more details of the demo application tasks.\r
*\r
* A few tasks are created that are not part of the standard demo. These are\r
- * the 'LCD' task, the 'LCD Message' task, a WEB server task and the 'Check' \r
+ * the 'LCD' task, the 'LCD Message' task, a WEB server task and the 'Check'\r
* task.\r
*\r
* The LCD task is the only task that accesses the LCD directly, so mutual\r
* exclusion is ensured. Any task wishing to display text sends the LCD task\r
* a message containing a pointer to the string that should be displayed.\r
- * The LCD task itself just blocks on a queue waiting for such a message to \r
+ * The LCD task itself just blocks on a queue waiting for such a message to\r
* arrive - processing each in turn.\r
*\r
* The LCD Message task does nothing other than periodically send messages to\r
- * the LCD task. The messages originating from the LCD Message task are \r
+ * the LCD task. The messages originating from the LCD Message task are\r
* displayed on the top row of the LCD.\r
*\r
- * The Check task only executes every three seconds but has the highest \r
- * priority so is guaranteed to get processor time. Its main function is to \r
- * check that all the other tasks are still operational. Most tasks maintain \r
- * a unique count that is incremented each time the task successfully completes \r
- * a cycle of its function. Should any error occur within such a task the \r
+ * The Check task only executes every three seconds but has the highest\r
+ * priority so is guaranteed to get processor time. Its main function is to\r
+ * check that all the other tasks are still operational. Most tasks maintain\r
+ * a unique count that is incremented each time the task successfully completes\r
+ * a cycle of its function. Should any error occur within such a task the\r
* count is permanently halted. The check task sets a bit in an error status\r
* flag should it find any counter variable at a value that indicates an\r
- * error has occurred. The error flag value is converted to a string and sent \r
+ * error has occurred. The error flag value is converted to a string and sent\r
* to the LCD task for display on the bottom row on the LCD.\r
*/\r
\r
#include "flop.h"\r
#include "comtest2.h"\r
#include "serial.h"\r
+#include "GenQTest.h"\r
+#include "QPeek.h"\r
+\r
+#ifdef STACK_LWIP\r
+ #include "BasicWEB.h"\r
+ #include "sys.h"\r
+#endif\r
\r
/* Priorities for the demo application tasks. */\r
#define mainLED_TASK_PRIORITY ( tskIDLE_PRIORITY + 1 )\r
#define mainCOM_TEST_PRIORITY ( tskIDLE_PRIORITY + 3 )\r
#define mainLCD_TASK_PRIORITY ( tskIDLE_PRIORITY + 1 )\r
#define mainMSG_TASK_PRIORITY ( tskIDLE_PRIORITY + 1 )\r
+#define mainGENERIC_QUEUE_PRIORITY ( tskIDLE_PRIORITY )\r
\r
/* Delays used by the various tasks defined in this file. */\r
#define mainCHECK_PERIOD ( ( portTickType ) 3000 / portTICK_RATE_MS )\r
*/\r
static void prvCheckOtherTasksAreStillRunning( void );\r
\r
-/*\r
- * The WEB server task prototype. The task is created in this file but defined\r
- * elsewhere. \r
- */\r
-extern void vuIP_Task(void *pvParameters);\r
+#ifdef STACK_UIP\r
+ /*\r
+ * The WEB server task prototype. The task is created in this file but defined\r
+ * elsewhere. STACK_UIP is defined when the uIP stack is used in preference\r
+ * to the lwIP stack.\r
+ */\r
+ extern void vuIP_Task(void *pvParameters);\r
+#endif\r
\r
/*\r
* The task that displays text on the LCD.\r
/* Setup any hardware that has not already been configured by the low\r
level init routines. */\r
prvSetupHardware();\r
-\r
/* Create the queue used to send data to the LCD task. */\r
xLCDQueue = xQueueCreate( mainLCD_QUEUE_LEN, sizeof( xLCDMessage ) );\r
-\r
+ \r
/* Start all the standard demo application tasks. */\r
vStartIntegerMathTasks( tskIDLE_PRIORITY );\r
vStartLEDFlashTasks( mainLED_TASK_PRIORITY );\r
vStartDynamicPriorityTasks();\r
vStartMathTasks( tskIDLE_PRIORITY );\r
vAltStartComTestTasks( mainCOM_TEST_PRIORITY, mainCOM_TEST_BAUD_RATE, mainCOM_TEST_LED );\r
+ vStartGenericQueueTasks( mainGENERIC_QUEUE_PRIORITY );\r
+ vStartQueuePeekTasks(); \r
\r
/* Start the tasks which are defined in this file. */\r
xTaskCreate( vErrorChecks, "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );\r
xTaskCreate( prvLCDTask, "LCD", configMINIMAL_STACK_SIZE, ( void * ) &xLCDQueue, mainLCD_TASK_PRIORITY, NULL );\r
xTaskCreate( prvLCDMessageTask, "MSG", configMINIMAL_STACK_SIZE, ( void * ) &xLCDQueue, mainMSG_TASK_PRIORITY, NULL );\r
\r
- /* Finally, create the WEB server task. */\r
- xTaskCreate( vuIP_Task, "uIP", configMINIMAL_STACK_SIZE * 3, NULL, mainCHECK_TASK_PRIORITY - 1, NULL );\r
- \r
+ /* Start either the uIP TCP/IP stack or the lwIP TCP/IP stack. */\r
+ #ifdef STACK_UIP\r
+ /* Finally, create the WEB server task. */\r
+ xTaskCreate( vuIP_Task, "uIP", configMINIMAL_STACK_SIZE * 3, NULL, mainCHECK_TASK_PRIORITY - 1, NULL );\r
+ #endif\r
+\r
+ #ifdef STACK_LWIP \r
+ /* Create the lwIP task. This uses the lwIP RTOS abstraction layer.*/\r
+ vlwIPInit();\r
+ sys_set_state( ( signed portCHAR * ) "httpd", lwipBASIC_SERVER_STACK_SIZE );\r
+ sys_thread_new( vBasicWEBServer, ( void * ) NULL, basicwebWEBSERVER_PRIORITY );\r
+ sys_set_default_state();\r
+ #endif\r
\r
/* Start the scheduler.\r
\r
/* Configuration taken from the ST code.\r
\r
Set Flash banks size & address */\r
- FMI_BankRemapConfig( 4, 2, 0, 0x80000 ); \r
+ FMI_BankRemapConfig( 4, 2, 0, 0x80000 );\r
\r
/* FMI Waite States */\r
- FMI_Config( FMI_READ_WAIT_STATE_2, FMI_WRITE_WAIT_STATE_0, FMI_PWD_ENABLE, FMI_LVD_ENABLE, FMI_FREQ_HIGH ); \r
+ FMI_Config( FMI_READ_WAIT_STATE_2, FMI_WRITE_WAIT_STATE_0, FMI_PWD_ENABLE, FMI_LVD_ENABLE, FMI_FREQ_HIGH );\r
\r
/* Configure the FPLL = 96MHz, and APB to 48MHz. */\r
SCU_PCLKDivisorConfig( SCU_PCLK_Div2 );\r
- SCU_PLLFactorsConfig( 192, 25, 2 ); \r
+ SCU_PLLFactorsConfig( 192, 25, 2 );\r
SCU_PLLCmd( ENABLE );\r
SCU_MCLKSourceConfig( SCU_MCLK_PLL );\r
\r
\r
/* The parameters are not used in this task. */\r
( void ) pvParameters;\r
+ \r
pcFlagString = &cCheckVal[ 0 ]; \r
\r
-\r
/* Initialise xLastWakeTime to ensure the first call to vTaskDelayUntil()\r
functions correctly. */\r
xLastWakeTime = xTaskGetTickCount();\r
\r
/* Cycle for ever, delaying then checking all the other tasks are still\r
operating without error. */\r
-\r
for( ;; )\r
{\r
/* Delay until it is time to execute again. */\r
{\r
ulErrorFlags |= 0x40;\r
}\r
+ \r
+ if( xAreGenericQueueTasksStillRunning() != pdTRUE )\r
+ {\r
+ ulErrorFlags |= 0x80;\r
+ }\r
+\r
+ if( xAreQueuePeekTasksStillRunning() != pdTRUE )\r
+ {\r
+ ulErrorFlags |= 0x100;\r
+ }\r
+ \r
}\r
/*-----------------------------------------------------------*/\r
\r
\r
LCD_Init();\r
\r
- for( ;; ) \r
+ for( ;; )\r
{\r
/* Wait for a message to arrive. */\r
if( xQueueReceive( *pxLCDQueue, &xReceivedMessage, portMAX_DELAY ) )\r
LCD_DisplayString(xReceivedMessage.xRow, pcString, BlackText);\r
\r
/* The delay here is just to ensure the LCD task does not starve\r
- out lower priority tasks as writhing to the LCD can take a long\r
+ out lower priority tasks as writing to the LCD can take a long\r
time. */\r
vTaskDelay( mainLCD_DELAY );\r
}\r
}\r
}\r
/*-----------------------------------------------------------*/\r
-\r