Index: webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzs
===================================================================
--- webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzs (revision 19)
+++ webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzs (revision 22)
@@ -45,47 +45,29 @@
  </Watch1>
  <Watch2>
-  <Watches active="0" update="Never" >
-   <Watchpoint linenumber="57" radix="10" name="s" expression="s" filename="d:/freertosexample/source/energymeters/meters.c" />
-   <Watchpoint linenumber="55" radix="10" name="h" expression="h" filename="d:/freertosexample/source/energymeters/meters.c" />
-   <Watchpoint linenumber="56" radix="10" name="m" expression="m" filename="d:/freertosexample/source/energymeters/meters.c" />
-  </Watches>
+  <Watches active="0" update="Never" />
  </Watch2>
  <Watch3>
-  <Watches active="1" update="Never" />
+  <Watches active="1" update="Never" >
+   <Watchpoint evalMode="2" linenumber="0" numelements="10" evalType="0" radix="-1" name="meterItems" expression="meterItems" filename="" />
+  </Watches>
  </Watch3>
  <Watch4>
   <Watches active="0" update="Never" >
-   <Watchpoint linenumber="54" radix="10" name="s" expression="s" filename="d:/freertosexample/source/energymeters/meters.c" />
-   <Watchpoint linenumber="139" radix="16" name="partstNUM_LEDS" expression="partstNUM_LEDS" filename="c:/dokumente und einstellungen/birdy/desktop/freertos/demo/arm7_lpc2368_rowley/partest/partest.c" />
-   <Watchpoint linenumber="53" radix="16" name="xLastMeterTaskRunTime" expression="xLastMeterTaskRunTime" filename="d:/freertosexample/source/energymeters/meters.c" />
-   <Watchpoint linenumber="131" radix="-1" name="xFlashRate" expression="xFlashRate" filename="c:/dokumente und einstellungen/birdy/desktop/freertos/demo/common/minimal/flash.c" />
-   <Watchpoint linenumber="54" radix="10" name="h" expression="h" filename="d:/freertosexample/source/energymeters/meters.c" />
-   <Watchpoint linenumber="54" radix="10" name="s" expression="s" filename="d:/freertosexample/source/energymeters/meters.c" />
-   <Watchpoint linenumber="53" radix="16" name="xLastMeterTaskRunTime" expression="xLastMeterTaskRunTime" filename="d:/freertosexample/source/energymeters/meters.c" />
-   <Watchpoint linenumber="42" radix="16" name="EXTINT" expression="EXTINT" filename="d:/freertosexample/source/energymeters/meters_isrs.c" />
-   <Watchpoint linenumber="55" radix="10" name="m" expression="m" filename="d:/freertosexample/source/energymeters/meters.c" />
-   <Watchpoint linenumber="131" radix="-1" name="xLastFlashTime" expression="xLastFlashTime" filename="c:/dokumente und einstellungen/birdy/desktop/freertos/demo/common/minimal/flash.c" />
-   <Watchpoint linenumber="139" radix="-1" name="uxLED" expression="uxLED" filename="c:/dokumente und einstellungen/birdy/desktop/freertos/demo/arm7_lpc2368_rowley/partest/partest.c" />
-   <Watchpoint linenumber="0" radix="-1" name="xStart" expression="xStart" filename="" />
-   <Watchpoint linenumber="125" radix="-1" name="led_1_state" expression="led_1_state" filename="c:/dokumente und einstellungen/birdy/desktop/freertos/demo/arm7_lpc2368_rowley/partest/partest.c" />
-   <Watchpoint linenumber="37" radix="10" name="xLastMeterTaskRunTime" expression="xLastMeterTaskRunTime" filename="d:/freertosexample/source/energymeters/meters.c" />
+   <Watchpoint evalMode="2" linenumber="66" numelements="10" evalType="0" radix="-1" name="meterItems" expression="meterItems" filename="d:/freertosexample/source/energymeters/meters_isrs.c" />
   </Watches>
  </Watch4>
  <Files>
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freertosexample\source\tasks.c" y="1327" path="D:\freertosexample\source\tasks.c" left="0" selected="0" name="unnamed" top="1316" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freeRTOSexample\Source\EnergyMeters\Meters.c" y="25" path="D:\freeRTOSexample\Source\EnergyMeters\Meters.c" left="0" selected="0" name="unnamed" top="21" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freeRTOSexample\Source\EnergyMeters\Meters_ISRs.c" y="18" path="D:\freeRTOSexample\Source\EnergyMeters\Meters_ISRs.c" left="0" selected="0" name="unnamed" top="0" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freeRTOSexample\Demo\Common\Minimal\flash.c" y="132" path="D:\freeRTOSexample\Demo\Common\Minimal\flash.c" left="0" selected="0" name="unnamed" top="120" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freeRTOSexample\Demo\ARM7_LPC2368_Rowley\webserver\emac.c" y="25" path="D:\freeRTOSexample\Demo\ARM7_LPC2368_Rowley\webserver\emac.c" left="0" selected="0" name="unnamed" top="14" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freeRTOSexample\Demo\ARM7_LPC2368_Rowley\webserver\uIP_Task.c" y="227" path="D:\freeRTOSexample\Demo\ARM7_LPC2368_Rowley\webserver\uIP_Task.c" left="0" selected="0" name="unnamed" top="210" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freertosexample\demo\arm7_lpc2368_rowley\webserver\EMAC_ISR.c" y="23" path="D:\freertosexample\demo\arm7_lpc2368_rowley\webserver\EMAC_ISR.c" left="0" selected="0" name="unnamed" top="15" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freeRTOSexample\Demo\ARM7_LPC2368_Rowley\main.c" y="121" path="D:\freeRTOSexample\Demo\ARM7_LPC2368_Rowley\main.c" left="0" selected="0" name="unnamed" top="108" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freeRTOSexample\Demo\Common\Minimal\semtest.c" y="215" path="D:\freeRTOSexample\Demo\Common\Minimal\semtest.c" left="0" selected="0" name="unnamed" top="203" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freeRTOSexample\Source\queue.c" y="467" path="D:\freeRTOSexample\Source\queue.c" left="0" selected="0" name="unnamed" top="454" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freeRTOSexample\Source\include\targets\LPC23xx.h" y="771" path="D:\freeRTOSexample\Source\include\targets\LPC23xx.h" left="0" selected="0" name="unnamed" top="756" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freeRTOSexample\Source\portable\GCC\ARM7_LPC23xx\portISR.c" y="82" path="D:\freeRTOSexample\Source\portable\GCC\ARM7_LPC23xx\portISR.c" left="0" selected="0" name="unnamed" top="69" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="2" debugPath="D:\freeRTOSexample\Demo\ARM7_LPC2368_Rowley\webserver\httpd-cgi.c" y="219" path="D:\freeRTOSexample\Demo\ARM7_LPC2368_Rowley\webserver\httpd-cgi.c" left="0" selected="1" name="unnamed" top="207" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\birdy\Lokale Einstellungen\Anwendungsdaten\Rowley Associates Limited\CrossWorks for ARM\packages\targets\Philips_LPC210X\Philips_LPC230X_Startup.s" y="18" path="C:\Dokumente und Einstellungen\birdy\Lokale Einstellungen\Anwendungsdaten\Rowley Associates Limited\CrossWorks for ARM\packages\targets\Philips_LPC210X\Philips_LPC230X_Startup.s" left="0" selected="0" name="unnamed" top="6" />
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freeRTOSexample\Source\include\FreeRTOS.h" y="0" path="D:\freeRTOSexample\Source\include\FreeRTOS.h" left="0" selected="0" name="unnamed" top="0" />
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freeRTOSexample\Source\tasks.c" y="1897" path="D:\freeRTOSexample\Source\tasks.c" left="0" selected="1" name="unnamed" top="1885" />
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="63" debugPath="D:\freeRTOSexample\Source\EnergyMeters\Meters_ISRs.c" y="65" path="D:\freeRTOSexample\Source\EnergyMeters\Meters_ISRs.c" left="0" selected="0" name="unnamed" top="47" />
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freeRTOSexample\Demo\ARM7_LPC2368_Rowley\main.c" y="113" path="D:\freeRTOSexample\Demo\ARM7_LPC2368_Rowley\main.c" left="0" selected="0" name="unnamed" top="149" />
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freeRTOSexample\Source\list.c" y="0" path="D:\freeRTOSexample\Source\list.c" left="0" selected="0" name="unnamed" top="0" />
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freeRTOSexample\Demo\ARM7_LPC2368_Rowley\ParTest\ParTest.c" y="0" path="D:\freeRTOSexample\Demo\ARM7_LPC2368_Rowley\ParTest\ParTest.c" left="0" selected="0" name="unnamed" top="0" />
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freertosexample\source\energymeters\MetersIncludes.h" y="2" path="D:\freertosexample\source\energymeters\MetersIncludes.h" left="0" selected="0" name="unnamed" top="0" />
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="45" debugPath="D:\freeRTOSexample\Source\EnergyMeters\Meters.c" y="120" path="D:\freeRTOSexample\Source\EnergyMeters\Meters.c" left="0" selected="0" name="unnamed" top="107" />
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="17" debugPath="D:\freeRTOSexample\Source\EnergyMeters\timeConversion.c" y="49" path="D:\freeRTOSexample\Source\EnergyMeters\timeConversion.c" left="0" selected="0" name="unnamed" top="66" />
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\freeRTOSexample\Source\portable\GCC\ARM7_LPC23xx\portISR.c" y="142" path="D:\freeRTOSexample\Source\portable\GCC\ARM7_LPC23xx\portISR.c" left="0" selected="0" name="unnamed" top="127" />
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\birdy\Lokale Einstellungen\Anwendungsdaten\Rowley Associates Limited\CrossWorks for ARM\packages\targets\Philips_LPC210X\Philips_LPC230X_Startup.s" y="276" path="C:\Dokumente und Einstellungen\birdy\Lokale Einstellungen\Anwendungsdaten\Rowley Associates Limited\CrossWorks for ARM\packages\targets\Philips_LPC210X\Philips_LPC230X_Startup.s" left="0" selected="0" name="unnamed" top="261" />
  </Files>
- <ARMCrossStudioWindow activeProject="RTOSDemo" autoConnectTarget="Macraigor Wiggler (20 Pin)" debugSearchFileMap="" fileDialogInitialDirectory="D:\freeRTOSexample\Source\EnergyMeters" fileDialogDefaultFilter="*.c" autoConnectCapabilities="388479" debugSearchPath="" buildConfiguration="ARM Flash Release" />
+ <ARMCrossStudioWindow activeProject="RTOSDemo" autoConnectTarget="Macraigor Wiggler (20 Pin)" debugSearchFileMap="" fileDialogInitialDirectory="D:\freeRTOSexample\Source\EnergyMeters" fileDialogDefaultFilter="*.c" autoConnectCapabilities="388479" debugSearchPath="" buildConfiguration="ARM Flash Debug" />
 </session>
Index: webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/main.c
===================================================================
--- webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/main.c (revision 19)
+++ webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/main.c (revision 22)
@@ -56,13 +56,8 @@
 
 /* Demo app includes. */
-#include "BlockQ.h"
-#include "death.h"
-#include "integer.h"
-#include "blocktim.h"
+
 #include "portlcd.h"
 #include "flash.h"
-#include "partest.h"
-#include "semtest.h"
-#include "PollQ.h"
+
 
 /* Demo application definitions. */
@@ -74,9 +69,6 @@
 #define mainQUEUE_POLL_PRIORITY				( tskIDLE_PRIORITY + 2 )
 #define mainCHECK_TASK_PRIORITY				( tskIDLE_PRIORITY + 3 )
-#define mainSEM_TEST_PRIORITY				( tskIDLE_PRIORITY + 1 )
-#define mainBLOCK_Q_PRIORITY				( tskIDLE_PRIORITY + 2 )
 #define mainFLASH_PRIORITY                  ( tskIDLE_PRIORITY + 2 )
-#define mainCREATOR_TASK_PRIORITY           ( tskIDLE_PRIORITY + 3 )
-#define mainINTEGER_TASK_PRIORITY           ( tskIDLE_PRIORITY )
+
 
 
@@ -134,5 +126,5 @@
 
 //  vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
-  vStartMetersTask( mainBLOCK_Q_PRIORITY );
+  vStartMetersTask( mainFLASH_PRIORITY );
 	/* Start the standard demo tasks. */
 //  vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
@@ -181,33 +173,5 @@
 		/* Has an error been found in any task? */
 
-        if( xAreBlockingQueuesStillRunning() != pdTRUE )
-		{
-			xErrorOccurred = pdTRUE;
-		}
-
-		if( xAreBlockTimeTestTasksStillRunning() != pdTRUE )
-		{
-			xErrorOccurred = pdTRUE;
-		}
-
-        if( xAreSemaphoreTasksStillRunning() != pdTRUE )
-        {
-            xErrorOccurred = pdTRUE;
-        }
-
-        if( xArePollingQueuesStillRunning() != pdTRUE )
-        {
-            xErrorOccurred = pdTRUE;
-        }
-
-        if( xIsCreateTaskStillRunning() != pdTRUE )
-        {
-            xErrorOccurred = pdTRUE;
-        }
-
-        if( xAreIntegerMathsTaskStillRunning() != pdTRUE )
-        {
-            xErrorOccurred = pdTRUE;
-        }
+
 
         LCD_cls();
Index: webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp
===================================================================
--- webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp (revision 19)
+++ webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp (revision 22)
@@ -11,13 +11,4 @@
       </file>
       <file Name="portlcd.c" file_name="LCD/portlcd.c">
-        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
-      </file>
-      <file Name="blocktim.c" file_name="../Common/Minimal/blocktim.c">
-        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
-      </file>
-      <file Name="integer.c" file_name="../Common/Minimal/integer.c">
-        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
-      </file>
-      <file Name="BlockQ.c" file_name="../Common/Minimal/BlockQ.c">
         <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
       </file>
@@ -36,9 +27,4 @@
         <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
         <configuration Name="Common" asm_additional_options=""/>
-      </file>
-      <file Name="death.c" file_name="../Common/Minimal/death.c"/>
-      <file Name="PollQ.c" file_name="../Common/Minimal/PollQ.c"/>
-      <file Name="semtest.c" file_name="../Common/Minimal/semtest.c">
-        <configuration Name="Common" c_enforce_ansi_checking="No"/>
       </file>
     </folder>
@@ -105,4 +91,6 @@
       <file file_name="../../Source/EnergyMeters/Meters_ISRs.c"/>
       <file file_name="../../Source/EnergyMeters/Meters.c"/>
+      <file file_name="../../Source/EnergyMeters/MetersIncludes.h"/>
+      <file file_name="../../Source/EnergyMeters/timeConversion.c"/>
     </folder>
   </project>