# # ChangeLog for /webserver/example/EnergyMeters/Source # # Generated by Trac 0.10.5 # 04/11/25 09:58:20 # 09/04/10 17:14:00 phil [67] * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/MetersIncludes.h (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (modified) made 2 byte rx checksum check general (now used for wattage, voltage and time rx packets) now reads and outputs the time stored in the SolarCount via http. 09/04/10 15:30:17 phil [66] * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/MetersIncludes.h (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (modified) introduced 2 byte checksum check for rx momentary power packets, including CRC err counter on web interface. also implemented one byte checksum (incomplete, untested!) 09/04/10 12:33:34 phil [65] * webserver/example/EnergyMeters/Source/portable/GCC/ARM7_LPC23xx/portmacro.h (modified) fixed compilation issue in portmacro.h for new CrossWorks assembler/compiler 04/06/10 20:20:57 phil [61] * webserver/example/EnergyMeters/Source/EnergyMeters/MetersIncludes.h (modified) solar power history size now 20 (3 second increments) 04/04/10 10:49:44 phil [60] * webserver/example/EnergyMeters/Source/EnergyMeters/Meters.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/MetersIncludes.h (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c (modified) meter value calculation now not in ISR anymore, introduced METERS_INT_CHECK_INTERVAL_MS define and meterIntStatus . Check of meterIntStatus and calculation now in vMeters_Task every METERS_INT_CHECK_INTERVAL_MS ms. 03/20/10 13:24:05 phil [59] * webserver/example/EnergyMeters/Source/EnergyMeters/Meters.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c (modified) adaptation to new ETT 4 channel opto I/O board 03/07/10 13:35:12 phil [58] * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (modified) - solar history now in reverse direction - do not invalidate whole history on read error, only recent data item 03/07/10 11:21:08 phil [57] * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (modified) completed solar history entries 03/07/10 10:45:29 phil [56] * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/MetersIncludes.h (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (modified) - added watt history, SOLAR_WATT_HISTORY_STEPSIZE, SOLAR_WATT_HISTORYSIZE - added SOLAR_FSM_INVALID_VALUE 0x4000 for wattages (after stuck) - changed "solar FSM stuck" check in solarFSM() - increased cCountBuf[] buffer size (to prevent overflow/mem corruption) 02/21/10 13:21:41 phil [53] * Examples_CP-JR_ARM7_LPC2368/NXPDataSheet/UM10161_2_LPC2101.pdf (moved) * Examples_CP-JR_ARM7_LPC2368/NXPDataSheet/UM10211_1_LPC23xx.pdf (moved) * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs (modified) * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/main.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters.c (modified) added watchdog 02/20/10 11:31:33 phil [52] * webserver/example/EnergyMeters/EnergyMeters/Common/ethernet/uIP/uip-1.0/uip/uipopt.h (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c (modified) changed UIP_ARPTAB_SIZE (from 20 to 30), removed P0.2 (not connected) 02/18/10 22:55:34 phil [51] * webserver/example/EnergyMeters/EnergyMeters/Common/ethernet/uIP/uip-1.0/uip/uipopt.h (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c (modified) changed UIP_ARPTAB_SIZE (from 8 to 20), changed UIP_UDP_CONNS (10 to 8), changed Meters_ISRs.c if conditions 02/14/10 16:25:17 phil [50] * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/MetersIncludes.h (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c (modified) added meters AU1 and AU2 (Auxiliary 1 and Auxiliary 2), interrupt handler now uses macros for meters numbers. 02/14/10 13:59:45 phil [47] * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/MetersIncludes.h (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c (modified) - now three meter entries: TST, GAS, EL1, EL2 - added CurrentTime to web page 02/07/10 11:36:21 phil [46] * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs (modified) * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/MetersIncludes.h (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c (modified) have now got METER_INDEX_BUTTON and METER_INDEX_GAS with display on page 02/07/10 11:28:03 phil [45] * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/main.c (modified) * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (modified) * webserver/example/EnergyMeters/EnergyMeters/Common/Minimal/flash.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/MetersIncludes.h (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c (modified) example meter (button SPI LOAD) now on web page, removed LCD writing in flash.c (crashes). 02/04/10 20:29:58 phil [44] * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (modified) serial init now only once at startup (not at every solar read error), added solar read counter 02/01/10 22:24:48 phil [43] * webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c (modified) merge with other version (from laptop): changed handleGasMeterTick() changed to generic handleMeterTick() 02/01/10 22:01:35 phil [42] * webserver/example/EnergyMeters/EnergyMeters/Common/Minimal/flash.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c (modified) merge with other version (from laptop) - now interrupts for more channels, LCD display used 01/31/10 18:53:49 phil [39] * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs (modified) * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/http-strings.c (modified) * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (modified) - added output function for Voltages and Wattages to generate_rtos_stats , - added detection of read error in SolarFSM() with restart. 01/31/10 12:44:23 phil [37] * webserver/example/Crossworks_taskinglib/CrossWorks_TaskingLib_Test.hzs (modified) * webserver/example/EasyWEB/ARM Flash Release/EMAC.d (deleted) * webserver/example/EasyWEB/ARM Flash Release/EasyWeb.elf (deleted) * webserver/example/EasyWEB/ARM Flash Release/EasyWeb.ld (modified) * webserver/example/EasyWEB/ARM Flash Release/EasyWeb.map (deleted) * webserver/example/EasyWEB/ARM Flash Release/LPC230x.d (deleted) * webserver/example/EasyWEB/ARM Flash Release/Philips_LPC230X_Startup.d (deleted) * webserver/example/EasyWEB/ARM Flash Release/Retarget.d (deleted) * webserver/example/EasyWEB/ARM Flash Release/VIC_PL192.d (deleted) * webserver/example/EasyWEB/ARM Flash Release/VIC_PL192_irq_handler.d (deleted) * webserver/example/EasyWEB/ARM Flash Release/crt0.d (deleted) * webserver/example/EasyWEB/ARM Flash Release/easyweb.d (deleted) * webserver/example/EasyWEB/ARM Flash Release/tcpip.d (deleted) * webserver/example/EasyWEB/EasyWeb.hzs (modified) * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzp (modified) * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs (modified) * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/main.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (modified) * webserver/example/EnergyMeters/Source/serial.c (added) - SolarCount data reading now working. Still hangs sometimes on Rx Data loss. Data not yet visible on web page. - Deleted some unnecessary temp files from the compiler. 01/03/10 11:19:00 phil [35] * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (modified) first round now works 01/02/10 15:33:13 phil [34] * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzp (modified) * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs (modified) * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/FreeRTOSConfig.h (modified) * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/main.c (modified) * webserver/example/EnergyMeters/EnergyMeters/Common/Minimal/flash.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (added) added Code for SolarCount, works sometimes already! :-) 08/14/09 23:28:59 phil [32] * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c (modified) completed the gas meter calculation algorithm 08/14/09 14:29:20 phil [30] * webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters.c (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/MetersIncludes.h (modified) * webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c (modified) Gas Meter counting finished, with accumulation timer and debounce timer. Todo: output and locking 08/14/09 13:42:29 phil [29] * webserver/example/EnergyMeters (moved) Renamed Directpry freeRTOSexample to EnergyMeters 08/14/09 11:24:55 phil [22] * webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp (modified) * webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzs (modified) * webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/main.c (modified) * webserver/example/freeRTOSexample/Demo/Common/Minimal/BlockQ.c (deleted) * webserver/example/freeRTOSexample/Demo/Common/Minimal/PollQ.c (deleted) * webserver/example/freeRTOSexample/Demo/Common/Minimal/blocktim.c (deleted) * webserver/example/freeRTOSexample/Demo/Common/Minimal/death.c (deleted) * webserver/example/freeRTOSexample/Demo/Common/Minimal/integer.c (deleted) * webserver/example/freeRTOSexample/Demo/Common/Minimal/semtest.c (deleted) * webserver/example/freeRTOSexample/Source/EnergyMeters/Meters.c (modified) * webserver/example/freeRTOSexample/Source/EnergyMeters/MetersIncludes.h (added) * webserver/example/freeRTOSexample/Source/EnergyMeters/Meters_ISRs.c (modified) * webserver/example/freeRTOSexample/Source/EnergyMeters/timeConversion.c (added) deleted some test files, gas meter values (unsigned long long) now updated. added epoch time handling