Changeset 39
- Timestamp:
- 01/31/10 18:53:49 (15 years ago)
- Files:
-
- webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs (modified) (5 diffs)
- webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/http-strings.c (modified) (1 diff)
- webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (modified) (2 diffs)
- webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs
r37 r39 14 14 </Memory3> 15 15 <Memory4> 16 <MemoryWindow autoEvaluate="0" addressText=" " numColumns="16" sizeText="0" dataSize="1" radix="16" addressSpace="" />16 <MemoryWindow autoEvaluate="0" addressText="0x0000008e" numColumns="16" sizeText="20" dataSize="1" radix="16" addressSpace="" /> 17 17 </Memory4> 18 18 <Project> … … 20 20 <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded" name="unnamed" /> 21 21 <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;Demo Source" name="unnamed" /> 22 <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;EnergyMeters" name="unnamed" /> 23 <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;FreeRTOS.org Source" name="unnamed" /> 24 <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;uIP Source" name="unnamed" /> 22 25 </Project> 23 26 <Register1> … … 39 42 <Watch1> 40 43 <Watches active="0" update="Three Seconds" > 41 <Watchpoint evalMode="2" linenumber="302" numelements="10" evalType="0" radix="16" name="rxUART3" expression="rxUART3" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" /> 44 <Watchpoint linenumber="542" radix="16" name="PINSEL0" expression="PINSEL0" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" /> 45 <Watchpoint linenumber="64" radix="-1" name="currentTime" expression="currentTime" filename="d:/energymetersproject/source/energymeters/meters_isrs.c" /> 42 46 <Watchpoint evalMode="2" linenumber="72" numelements="10" evalType="0" radix="16" name="meterItems" expression="meterItems" filename="d:/energymetersproject/source/energymeters/meters_isrs.c" /> 43 <Watchpoint linenumber="64" radix="-1" name="currentTime" expression="currentTime" filename="d:/energymetersproject/source/energymeters/meters_isrs.c" /> 44 <Watchpoint linenumber="520" radix="16" name="PINSEL0" expression="PINSEL0" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" /> 47 <Watchpoint evalMode="2" linenumber="308" numelements="10" evalType="0" radix="16" name="rxUART3" expression="rxUART3" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" /> 45 48 </Watches> 46 49 </Watch1> … … 55 58 <Watch4> 56 59 <Watches active="1" update="Twice a Second" > 57 <Watchpoint evalMode="2" linenumber="213" numelements="32" evalType="0" radix="1" name="cCountBuf" expression="cCountBuf" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/energymeters/arm7_lpc2368_rowley/webserver/httpd-cgi.c" /> 58 <Watchpoint evalMode="1" linenumber="225" evalType="1" radix="-1" name="uip_appdata" expression="uip_appdata" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/energymeters/arm7_lpc2368_rowley/webserver/httpd-cgi.c" /> 60 <Watchpoint linenumber="109" radix="16" name="solarReadErrors" expression="solarReadErrors" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" /> 61 <Watchpoint linenumber="223" radix="16" name="filename" expression="filename" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/energymeters/arm7_lpc2368_rowley/webserver/httpd.c" /> 62 <Watchpoint evalMode="2" linenumber="534" numelements="100" evalType="0" radix="-1" name="rxUART3" expression="rxUART3" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" /> 59 63 <Watchpoint linenumber="53" radix="16" name="currentChannel" expression="currentChannel" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" /> 60 <Watchpoint evalMode="2" linenumber="4 61" numelements="6" evalType="0" radix="-1" name="chanWatt" expression="chanWatt" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />61 <Watchpoint evalMode="2" linenumber="4 61" numelements="6" evalType="0" radix="11" name="chanVolt" expression="chanVolt" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />62 <Watchpoint evalMode=" 2" linenumber="512" numelements="100" evalType="0" radix="-1" name="rxUART3" expression="rxUART3" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />64 <Watchpoint evalMode="2" linenumber="483" numelements="6" evalType="0" radix="-1" name="chanWatt" expression="chanWatt" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" /> 65 <Watchpoint evalMode="2" linenumber="483" numelements="6" evalType="0" radix="11" name="chanVolt" expression="chanVolt" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" /> 66 <Watchpoint evalMode="1" linenumber="283" evalType="1" radix="16" name="uip_appdata" expression="uip_appdata" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/energymeters/arm7_lpc2368_rowley/webserver/httpd-cgi.c" /> 63 67 <Watchpoint linenumber="55" radix="16" name="solarState" expression="solarState" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" /> 64 <Watchpoint linenumber="195" radix="-1" name="byteReceived" expression="byteReceived" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" /> 65 <Watchpoint linenumber="610" radix="-1" name="ch" expression="ch" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" /> 66 <Watchpoint linenumber="206" radix="16" name="RxBuf" expression="RxBuf" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" /> 67 <Watchpoint evalMode="1" linenumber="580" evalType="1" radix="-1" name="data" expression="data" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" /> 68 <Watchpoint evalMode="1" linenumber="238" evalType="1" radix="16" name="uip_appdata" expression="uip_appdata" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/energymeters/arm7_lpc2368_rowley/webserver/httpd-cgi.c" /> 68 <Watchpoint evalMode="2" linenumber="206" numelements="32" evalType="0" radix="1" name="cCountBuf" expression="cCountBuf" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/energymeters/arm7_lpc2368_rowley/webserver/httpd-cgi.c" /> 69 <Watchpoint evalMode="1" linenumber="223" evalType="1" radix="-1" name="s" expression="s" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/energymeters/arm7_lpc2368_rowley/webserver/httpd.c" /> 70 <Watchpoint linenumber="632" radix="-1" name="ch" expression="ch" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" /> 71 <Watchpoint linenumber="201" radix="-1" name="byteReceived" expression="byteReceived" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" /> 72 <Watchpoint evalMode="1" linenumber="602" evalType="1" radix="-1" name="data" expression="data" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" /> 73 <Watchpoint linenumber="212" radix="16" name="RxBuf" expression="RxBuf" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" /> 74 <Watchpoint evalMode="1" linenumber="250" evalType="1" radix="-1" name="uip_appdata" expression="uip_appdata" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/energymeters/arm7_lpc2368_rowley/webserver/httpd-cgi.c" /> 69 75 <Watchpoint linenumber="235" radix="-1" name="cRxedChar" expression="cRxedChar" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/energymeters/common/full/comtest.c" /> 70 76 </Watches> … … 72 78 <Files> 73 79 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\serial.c" y="192" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\serial.c" left="0" selected="0" name="unnamed" top="177" /> 74 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\EnergyMeters\SolarCountUART.c" y="10 3" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\EnergyMeters\SolarCountUART.c" left="0" selected="0" name="unnamed" top="98" />80 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\EnergyMeters\SolarCountUART.c" y="108" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\EnergyMeters\SolarCountUART.c" left="0" selected="0" name="unnamed" top="95" /> 75 81 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\dokumente und einstellungen\phil\desktop\repo\webserver\example\energymeters\energymeters\common\full\comtest.c" y="234" path="C:\dokumente und einstellungen\phil\desktop\repo\webserver\example\energymeters\energymeters\common\full\comtest.c" left="0" selected="0" name="unnamed" top="217" /> 76 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\main.c" y="113" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\main.c" left="0" selected=" 1" name="unnamed" top="113" />82 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\main.c" y="113" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\main.c" left="0" selected="0" name="unnamed" top="96" /> 77 83 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\phil\Lokale Einstellungen\Anwendungsdaten\Rowley Associates Limited\CrossWorks for ARM\packages\targets\Philips_LPC210X\Philips_LPC230X_Startup.s" y="277" path="C:\Dokumente und Einstellungen\phil\Lokale Einstellungen\Anwendungsdaten\Rowley Associates Limited\CrossWorks for ARM\packages\targets\Philips_LPC210X\Philips_LPC230X_Startup.s" left="0" selected="0" name="unnamed" top="260" /> 78 84 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\portable\GCC\ARM7_LPC23xx\portISR.c" y="209" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\portable\GCC\ARM7_LPC23xx\portISR.c" left="0" selected="0" name="unnamed" top="203" /> 79 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x=" 0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\tasks.c" y="558" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\tasks.c" left="0" selected="0" name="unnamed" top="541" />85 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="17" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\tasks.c" y="72" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\tasks.c" left="0" selected="0" name="unnamed" top="57" /> 80 86 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\EnergyMeters\Meters_ISRs.c" y="0" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\EnergyMeters\Meters_ISRs.c" left="0" selected="0" name="unnamed" top="67" /> 81 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\queue.c" y=" 946" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\queue.c" left="0" selected="0" name="unnamed" top="929" />82 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x=" 0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\webserver\httpd-cgi.c" y="246" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\webserver\httpd-cgi.c" left="0" selected="0" name="unnamed" top="210" />83 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x=" 0" debugPath="C:\dokumente und einstellungen\phil\desktop\repo\webserver\example\energymeters\energymeters\common\ethernet\uip\uip-1.0\uip\uip.c" y="1643" path="C:\dokumente und einstellungen\phil\desktop\repo\webserver\example\energymeters\energymeters\common\ethernet\uip\uip-1.0\uip\uip.c" left="0" selected="0" name="unnamed" top="1626" />84 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x=" 0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\webserver\httpd.c" y="99" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\webserver\httpd.c" left="0" selected="0" name="unnamed" top="85" />85 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x=" 0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\Common\ethernet\uIP\uip-1.0\uip\uip_arp.c" y="420" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\Common\ethernet\uIP\uip-1.0\uip\uip_arp.c" left="0" selected="0" name="unnamed" top="403" />86 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\Common\ethernet\uIP\uip-1.0\uip\psock.c" y="2 27" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\Common\ethernet\uIP\uip-1.0\uip\psock.c" left="0" selected="0" name="unnamed" top="209" />87 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\queue.c" y="881" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\queue.c" left="0" selected="0" name="unnamed" top="865" /> 88 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="75" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\webserver\httpd-cgi.c" y="218" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\webserver\httpd-cgi.c" left="0" selected="1" name="unnamed" top="201" /> 89 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="1" debugPath="C:\dokumente und einstellungen\phil\desktop\repo\webserver\example\energymeters\energymeters\common\ethernet\uip\uip-1.0\uip\uip.c" y="75" path="C:\dokumente und einstellungen\phil\desktop\repo\webserver\example\energymeters\energymeters\common\ethernet\uip\uip-1.0\uip\uip.c" left="0" selected="0" name="unnamed" top="60" /> 90 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="4" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\webserver\httpd.c" y="99" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\webserver\httpd.c" left="0" selected="0" name="unnamed" top="82" /> 91 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="6" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\Common\ethernet\uIP\uip-1.0\uip\uip_arp.c" y="420" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\Common\ethernet\uIP\uip-1.0\uip\uip_arp.c" left="0" selected="0" name="unnamed" top="403" /> 92 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\Common\ethernet\uIP\uip-1.0\uip\psock.c" y="215" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\Common\ethernet\uIP\uip-1.0\uip\psock.c" left="0" selected="0" name="unnamed" top="209" /> 87 93 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\Common\Minimal\flash.c" y="134" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\Common\Minimal\flash.c" left="0" selected="0" name="unnamed" top="117" /> 94 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="2" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\webserver\http-strings.c" y="42" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\webserver\http-strings.c" left="0" selected="0" name="unnamed" top="22" /> 95 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\webserver\httpd-cgi.h" y="72" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\webserver\httpd-cgi.h" left="0" selected="0" name="unnamed" top="54" /> 96 <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="3" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\webserver\httpd-fs.c" y="73" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\webserver\httpd-fs.c" left="0" selected="0" name="unnamed" top="67" /> 88 97 </Files> 89 98 <ARMCrossStudioWindow activeProject="EnergyMetersEmbedded" autoConnectTarget="Macraigor Wiggler (20 Pin)" debugSearchFileMap="" fileDialogInitialDirectory="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source" fileDialogDefaultFilter="*.c" autoConnectCapabilities="388479" debugSearchPath="" buildConfiguration="ARM Flash Debug" /> webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/http-strings.c
r14 r39 38 38 /* "/index.html" */ 39 39 {0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2e, 0x68, 0x74, 0x6d, 0x6c, }; 40 41 //const char http_solar_html[12] = 42 ///* "/solar.html" */ 43 //{0x2f, 0x73, 0x6f, 0x6c, 0x61, 0x72, 0x2e, 0x68, 0x74, 0x6d, 0x6c, }; 44 40 45 const char http_404_html[10] = 41 46 /* "/404.html" */ webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c
r38 r39 54 54 #include <stdio.h> 55 55 #include <string.h> 56 57 58 extern unsigned char chanVolt[6]; /* holds the voltages measured on channel 0 to 5 */ 59 extern int chanWatt[6]; /* holds the wattages measured on channel 0 to 5 */ 60 extern int solarReadErrors; 56 61 57 62 HTTPD_CGI_CALL(file, "file-stats", file_stats); … … 212 217 { 213 218 lRefreshCount++; 214 sprintf( cCountBuf, "<p><br>Refresh count = %d", lRefreshCount ); 215 vTaskList( uip_appdata ); 219 sprintf( cCountBuf, "<p><br>Refresh count = %d\r\nVoltages %d %d %d %d\r\n\ 220 Wattages %d %d %d %d\r\nSolarReadErr %d\r\n", lRefreshCount, 221 chanVolt[0], chanVolt[1], chanVolt[2], chanVolt[3], 222 chanWatt[0], chanWatt[1], chanWatt[2], chanWatt[3], 223 solarReadErrors 224 ); 225 strcat( uip_appdata, cCountBuf ); 226 227 //vTaskList( uip_appdata ); 228 229 (( char *)uip_appdata)[ 0 ] = (char) 0x00; 230 strcat( ( char * ) uip_appdata, ( char * ) "\r\n" ); 231 232 233 216 234 strcat( uip_appdata, cCountBuf ); 217 235 webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c
r37 r39 104 104 105 105 106 portTickType xLastSolarStateChangeTime; 107 108 109 int solarReadErrors = 0; 110 106 111 /* pototype section */ 107 112 … … 134 139 void initSolarFSM(void) 135 140 { 141 xLastSolarStateChangeTime = xTaskGetTickCount(); 136 142 xLastReadTime = xTaskGetTickCount(); 137 143 solarState = SOL_NO_INIT; … … 315 321 getUart3RxData(); 316 322 323 /* did the SolarFSM get stuck during reading? */ 324 if (xTaskGetTickCount() > xLastSolarStateChangeTime + 5000) 325 { 326 /* something has gone wrong (possible Rx Timeout). restart, state SOL_NO_INIT */ 327 xLastSolarStateChangeTime = xTaskGetTickCount(); 328 initSolarFSM(); 329 solarReadErrors++; 330 } 331 332 317 333 switch (solarState) 318 334 { … … 323 339 /* send init 1 */ 324 340 send_uart3((unsigned char *)init1, sizeof(init1)); 341 xLastSolarStateChangeTime = xTaskGetTickCount(); 325 342 solarState = SOL_SENT_INIT; /* now wait for reply */ 326 343 break; … … 341 358 342 359 /* now ready to query channel 0 data in next state */ 360 xLastSolarStateChangeTime = xTaskGetTickCount(); 343 361 solarState = SOL_CHAN; 344 362 } … … 377 395 case 6: 378 396 /* we are through with all the channels, ready to send next init for next query round */ 397 xLastSolarStateChangeTime = xTaskGetTickCount(); 379 398 solarState = SOL_FINISHED; 380 399 break; … … 384 403 if (solarState != SOL_FINISHED) 385 404 { 405 xLastSolarStateChangeTime = xTaskGetTickCount(); 386 406 solarState = SOL_CHAN_WAIT_REPLY; /* wait for reply if not finished */ 387 407 } /* if */ … … 443 463 currentChannel++; 444 464 /* now ready to query channel data for next channel */ 465 xLastSolarStateChangeTime = xTaskGetTickCount(); 445 466 solarState = SOL_CHAN; 446 467 } … … 448 469 { 449 470 /* we received the finishing sequence */ 471 xLastSolarStateChangeTime = xTaskGetTickCount(); 450 472 solarState = SOL_NO_INIT; /* restart the measurement cycle */ 451 473 }