Show
Ignore:
Timestamp:
08/14/09 11:24:55 (15 years ago)
Author:
phil
Message:

deleted some test files,
gas meter values (unsigned long long) now updated.
added epoch time handling

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/main.c

    r19 r22  
    5656 
    5757/* Demo app includes. */ 
    58 #include "BlockQ.h" 
    59 #include "death.h" 
    60 #include "integer.h" 
    61 #include "blocktim.h" 
     58 
    6259#include "portlcd.h" 
    6360#include "flash.h" 
    64 #include "partest.h" 
    65 #include "semtest.h" 
    66 #include "PollQ.h" 
     61 
    6762 
    6863/* Demo application definitions. */ 
    …… 
    7469#define mainQUEUE_POLL_PRIORITY                         ( tskIDLE_PRIORITY + 2 ) 
    7570#define mainCHECK_TASK_PRIORITY                         ( tskIDLE_PRIORITY + 3 ) 
    76 #define mainSEM_TEST_PRIORITY                           ( tskIDLE_PRIORITY + 1 ) 
    77 #define mainBLOCK_Q_PRIORITY                            ( tskIDLE_PRIORITY + 2 ) 
    7871#define mainFLASH_PRIORITY                  ( tskIDLE_PRIORITY + 2 ) 
    79 #define mainCREATOR_TASK_PRIORITY           ( tskIDLE_PRIORITY + 3 ) 
    80 #define mainINTEGER_TASK_PRIORITY           ( tskIDLE_PRIORITY ) 
     72 
    8173 
    8274 
    …… 
    134126 
    135127//  vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY ); 
    136   vStartMetersTask( mainBLOCK_Q_PRIORITY ); 
     128  vStartMetersTask( mainFLASH_PRIORITY ); 
    137129        /* Start the standard demo tasks. */ 
    138130//  vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY ); 
    …… 
    181173                /* Has an error been found in any task? */ 
    182174 
    183         if( xAreBlockingQueuesStillRunning() != pdTRUE ) 
    184                 { 
    185                         xErrorOccurred = pdTRUE; 
    186                 } 
    187  
    188                 if( xAreBlockTimeTestTasksStillRunning() != pdTRUE ) 
    189                 { 
    190                         xErrorOccurred = pdTRUE; 
    191                 } 
    192  
    193         if( xAreSemaphoreTasksStillRunning() != pdTRUE ) 
    194         { 
    195             xErrorOccurred = pdTRUE; 
    196         } 
    197  
    198         if( xArePollingQueuesStillRunning() != pdTRUE ) 
    199         { 
    200             xErrorOccurred = pdTRUE; 
    201         } 
    202  
    203         if( xIsCreateTaskStillRunning() != pdTRUE ) 
    204         { 
    205             xErrorOccurred = pdTRUE; 
    206         } 
    207  
    208         if( xAreIntegerMathsTaskStillRunning() != pdTRUE ) 
    209         { 
    210             xErrorOccurred = pdTRUE; 
    211         } 
     175 
    212176 
    213177        LCD_cls();