Index: /webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c =================================================================== --- /webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (revision 39) +++ /webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (revision 41) @@ -51,4 +51,10 @@ #include "httpd-cgi.h" #include "httpd-fs.h" + + +#include "FreeRTOS.h" +#include "semphr.h" +#include "task.h" +#include "..\EnergyMeters\MetersIncludes.h" #include @@ -223,14 +229,30 @@ solarReadErrors ); - strcat( uip_appdata, cCountBuf ); + //strcat( uip_appdata, cCountBuf ); //vTaskList( uip_appdata ); (( char *)uip_appdata)[ 0 ] = (char) 0x00; - strcat( ( char * ) uip_appdata, ( char * ) "\r\n" ); - - - - strcat( uip_appdata, cCountBuf ); + + strcat( uip_appdata, cCountBuf ); + //strcat( ( char * ) uip_appdata, ( char * ) "\r\n" ); + + sprintf( cCountBuf, "


GASmeter %d %d %d %d %d %d\r\n", + meterItems[METER_INDEX_GAS].meterEnabled, + meterItems[METER_INDEX_GAS].timeLastTick, + meterItems[METER_INDEX_GAS].timeBeforeLastTick, + meterItems[METER_INDEX_GAS].valueLastTick, + meterItems[METER_INDEX_GAS].currentValue, + meterItems[METER_INDEX_GAS].valueBeforeLastTick + ); + + + strcat( uip_appdata, cCountBuf ); + + //strcat( ( char * ) uip_appdata, ( char * ) "1234test" ); + //strcat( ( char * ) uip_appdata, ( char * ) "56789" ); + + + //strcat( uip_appdata, cCountBuf ); return strlen( uip_appdata );