Changeset 39 for webserver

Timestamp:

01/31/10 18:53:49 (15 years ago)

Author:

phil

Message:

- added output function for Voltages and Wattages to generate_rtos_stats ,
- added detection of read error in SolarFSM() with restart.

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)

webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs

@@ -14 +14 @@
- </Memory3>
- <Memory4>
-" numColumns="16" sizeText="
+0x0000008e" numColumns="16" sizeText="2
- </Memory4>
- <Project>
@@ -20 +20 @@
-  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded" name="unnamed" />
-  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;Demo Source" name="unnamed" />
+  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;EnergyMeters" name="unnamed" />
+  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;FreeRTOS.org Source" name="unnamed" />
+  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;uIP Source" name="unnamed" />
- </Project>
- <Register1>
@@ -39 +42 @@
- <Watch1>
-  <Watches active="0" update="Three Seconds" >
-
+
+
-   <Watchpoint evalMode="2" linenumber="72" numelements="10" evalType="0" radix="16" name="meterItems" expression="meterItems" filename="d:/energymetersproject/source/energymeters/meters_isrs.c" />
-
-
+
-  </Watches>
- </Watch1>
@@ -55 +58 @@
- <Watch4>
-  <Watches active="1" update="Twice a Second" >
-
-
+
+
+
-   <Watchpoint linenumber="53" radix="16" name="currentChannel" expression="currentChannel" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
-61
-61
-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
+83
+83
+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
-   <Watchpoint linenumber="55" radix="16" name="solarState" expression="solarState" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
-
-
-
-
-
+
+
+
+
+
+
+
-   <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" />
-  </Watches>
@@ -72 +78 @@
- <Files>
-  <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" />
-3" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\EnergyMeters\SolarCountUART.c" left="0" selected="0" name="unnamed" top="98
+8" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\EnergyMeters\SolarCountUART.c" left="0" selected="0" name="unnamed" top="95
-  <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" />
-1" name="unnamed" top="113
+0" name="unnamed" top="96
-  <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" />
-  <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" />
-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
+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
-  <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" />
-946" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\queue.c" left="0" selected="0" name="unnamed" top="929
-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
-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
-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
-0
-27
+881" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\queue.c" left="0" selected="0" name="unnamed" top="865
+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
+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
+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
+6
+15
-  <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" />
+  <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" />
+  <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" />
+  <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" />
- </Files>
- <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

@@ -38 +38 @@
-/* "/index.html" */
-{0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2e, 0x68, 0x74, 0x6d, 0x6c, };
+
+//const char http_solar_html[12] = 
+///* "/solar.html" */
+//{0x2f, 0x73, 0x6f, 0x6c, 0x61, 0x72, 0x2e, 0x68, 0x74, 0x6d, 0x6c, };
+
-const char http_404_html[10] = 
-/* "/404.html" */

webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c

@@ -54 +54 @@
-#include <stdio.h>
-#include <string.h>
+
+
+extern unsigned char chanVolt[6]; /* holds the voltages measured on channel 0 to 5 */
+extern int chanWatt[6]; /* holds the wattages measured on channel 0 to 5 */
+extern int solarReadErrors;
-
-HTTPD_CGI_CALL(file, "file-stats", file_stats);
@@ -212 +217 @@
-{
-        lRefreshCount++;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        strcat( uip_appdata, cCountBuf );
-  

webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c

@@ -104 +104 @@
-
-
+portTickType xLastSolarStateChangeTime;
+
+
+int solarReadErrors = 0;
+
-/* pototype  section */
-
@@ -134 +139 @@
-void initSolarFSM(void)
-{
+  xLastSolarStateChangeTime = xTaskGetTickCount();
-  xLastReadTime = xTaskGetTickCount();
-  solarState = SOL_NO_INIT;
@@ -315 +321 @@
-  getUart3RxData();
-
+  /* did the SolarFSM get stuck during reading? */
+  if (xTaskGetTickCount() > xLastSolarStateChangeTime + 5000)
+  {
+    /* something has gone wrong (possible Rx Timeout). restart, state SOL_NO_INIT */
+    xLastSolarStateChangeTime = xTaskGetTickCount();
+    initSolarFSM();
+    solarReadErrors++;
+  }
+
+
-  switch (solarState)
-  {
@@ -323 +339 @@
-       /* send init 1 */
-      send_uart3((unsigned char *)init1, sizeof(init1));
+      xLastSolarStateChangeTime = xTaskGetTickCount();
-      solarState = SOL_SENT_INIT; /* now wait for reply */
-    break;
@@ -341 +358 @@
-
-      /* now ready to query channel 0 data in next state */
+      xLastSolarStateChangeTime = xTaskGetTickCount();
-      solarState = SOL_CHAN;
-    }
@@ -377 +395 @@
-      case 6:
-        /* we are through with all the channels, ready to send next init for next query round */
+        xLastSolarStateChangeTime = xTaskGetTickCount();
-        solarState = SOL_FINISHED;
-        break;
@@ -384 +403 @@
-     if (solarState != SOL_FINISHED)
-     {
+     xLastSolarStateChangeTime = xTaskGetTickCount();
-      solarState = SOL_CHAN_WAIT_REPLY; /* wait for reply if not finished */
-     } /* if */
@@ -443 +463 @@
-          currentChannel++;
-          /* now ready to query channel data for next channel */
+          xLastSolarStateChangeTime = xTaskGetTickCount();
-          solarState = SOL_CHAN;
-        }
@@ -448 +469 @@
-        {
-          /* we received the finishing sequence */
+          xLastSolarStateChangeTime = xTaskGetTickCount();
-          solarState = SOL_NO_INIT; /* restart the measurement cycle */
-        }