Changeset 68 for webserver

Timestamp:

09/12/10 19:33:03 (14 years ago)

Author:

phil

Message:

query time once per minute now works.
more detailled output on FSM stuck error.
FSM needs redesign, search for "duplicate".

Files:

• webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzp (modified) (2 diffs)
• webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs (modified) (3 diffs)
• webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (modified) (4 diffs)
• webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (modified) (16 diffs)

webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzp

@@ -56 +56 @@
-      <file file_name="../../Source/serial.c"/>
-    </folder>
-
+_use_multi_threaded_libraries="No" link
-    <folder Name="uIP Source">
-      <file Name="uIP_Task.c" file_name="webserver/uIP_Task.c">
@@ -87 +87 @@
-    </folder>
-    <configuration Name="THUMB" c_preprocessor_definitions="THUMB_INTERWORK"/>
-
+ link_use_multi_threaded_libraries="No"
-    <configuration Name="THUMB Flash Debug" arm_linker_fiq_stack_size="0" arm_linker_heap_size="0" arm_linker_stack_size="0" arm_linker_svc_stack_size="512"/>
-    <folder Name="EnergyMeters">

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

@@ -19 +19 @@
-  <ProjectSessionItem path="EnergyMetersEmbedded" name="unnamed" />
-  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded" name="unnamed" />
-  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;Demo Source" name="unnamed" />
-  <ProjectSessionItem path="EnergyMetersEmbedded;EnergyMetersEmbedded;EnergyMeters" name="unnamed" />
- </Project>
@@ -40 +39 @@
- <Watch1>
-  <Watches active="0" update="Three Seconds" >
+   <Watchpoint evalMode="2" linenumber="312" 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" />
+   <Watchpoint evalMode="2" linenumber="72" numelements="10" evalType="0" radix="16" name="meterItems" expression="meterItems" filename="d:/energymetersproject/source/energymeters/meters_isrs.c" />
+   <Watchpoint linenumber="64" radix="-1" name="currentTime" expression="currentTime" filename="d:/energymetersproject/source/energymeters/meters_isrs.c" />
-   <Watchpoint linenumber="547" radix="16" name="PINSEL0" expression="PINSEL0" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
-   <Watchpoint linenumber="64" radix="-1" name="currentTime" expression="currentTime" filename="d:/energymetersproject/source/energymeters/meters_isrs.c" />
-   <Watchpoint evalMode="2" linenumber="72" numelements="10" evalType="0" radix="16" name="meterItems" expression="meterItems" filename="d:/energymetersproject/source/energymeters/meters_isrs.c" />
-   <Watchpoint evalMode="2" linenumber="312" 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" />
-  </Watches>
- </Watch1>
@@ -56 +55 @@
- <Watch4>
-  <Watches active="1" update="Twice a Second" >
+   <Watchpoint linenumber="948" radix="-1" name="carry" expression="carry" filename="d:/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
+   <Watchpoint evalMode="2" linenumber="111" numelements="11" evalType="0" radix="-1" name="meterItems" expression="meterItems" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/meters_isrs.c" />
+   <Watchpoint linenumber="951" radix="-1" name="crcCHAR" expression="crcCHAR" filename="d:/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
+   <Watchpoint linenumber="381" radix="-1" name="cmpResult" expression="cmpResult" filename="d:/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
+   <Watchpoint linenumber="981" radix="-1" name="cmpValue" expression="cmpValue" filename="d:/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
+   <Watchpoint linenumber="940" radix="-1" name="crcLONG" expression="crcLONG" filename="d:/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
+   <Watchpoint linenumber="637" radix="-1" name="ch" expression="ch" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
-   <Watchpoint evalMode="2" linenumber="539" 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" />
-
-
+
+
+
-   <Watchpoint evalMode="2" linenumber="488" 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" />
-   <Watchpoint evalMode="0" linenumber="396" 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" />
-evalMode="2" linenumber="111" numelements="11" evalType="0" radix="-1" name="meterItems" expression="meterItems" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/meters_isrs
+linenumber="951" radix="-1" name="crcCHARinv" expression="crcCHARinv" filename="d:/repo/webserver/example/energymeters/source/energymeters/solarcountuart
-   <Watchpoint linenumber="109" radix="16" name="solarReadErrors" expression="solarReadErrors" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
+   <Watchpoint linenumber="969" radix="-1" name="staticCRC" expression="staticCRC" filename="d:/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
-   <Watchpoint linenumber="55" radix="16" name="solarState" expression="solarState" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
-
-
-
-
-
-
-
-
+
+
+
-  </Watches>
- </Watch4>
- <Files>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- </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 Release" />

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

@@ -64 +64 @@
-extern unsigned long correctVoltWattRx;
-extern unsigned long failedVoltWattRx;
+extern unsigned long queryTimeCounter;
-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 */
@@ -69 +70 @@
-extern int solarReadCounter;
-extern unsigned char scDate[6]; /* date received from solar count */
+
+extern int solarStateWhenFail;
+extern int currentChannelWhenFail;
-
-HTTPD_CGI_CALL(file, "file-stats", file_stats);
@@ -232 +236 @@
-        lRefreshCount++;
-        sprintf( cCountBuf, "<h2>\r\n<p><br>Refresh count = %d\r\nVoltages %d %d %d %d\r\n\
-\r\n
+
-         chanVolt[0], chanVolt[1], chanVolt[2], chanVolt[3],
-         chanWatt[0], chanWatt[1], chanWatt[2], chanWatt[3],
@@ -249 +253 @@
-
-
-
-
+\r\nTimeQueries %d\r\nStateWhenFail=%u , chanWhenFail=%u
+, queryTimeCounter, solarStateWhenFail, currentChannelWhenFail
-         );
-        strcat( uip_appdata, cCountBuf );

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

@@ -23 +23 @@
-#define SOLAR_FSM_STUCK_TIMEOUT  2000
-
+/* how often (in ms) do we query the timer? */
+#define SOLAR_TIME_CHECK_INTERVAL (60 * 1000)
+
+
-/* means "unknown value", converted to "U" on rrdtool script side */
-#define SOLAR_FSM_INVALID_VALUE  0x4000 /* 16384 */
@@ -34 +38 @@
-unsigned long correctVoltWattRx = 0; /* counter of correctly received wattage/voltage packets */
-unsigned long failedVoltWattRx = 0;  /* counter of incorrectly received wattage/voltage packets */
-
+
-
-static unsigned short staticCRC;
@@ -81 +85 @@
-unsigned char currentChannel; /* the SolarCount channel we currently query (here: 0 to 3) */
-
-NO_INIT
+QUERY_TIME
-
-
@@ -140 +144 @@
-portTickType xLastSolarStateChangeTime;
-
+portTickType xLastTimeCheckTime;
+
+
- /* time when the elements of the history array were last moved on one step */
-portTickType xLastSolarHistoryAdvance;
@@ -148 +155 @@
-
-int solarReadCounter = 0;
+
+
+int solarStateWhenFail = 0xFF;
+int currentChannelWhenFail = 0xFF;
-
-/* pototype  section */
@@ -181 +192 @@
-  int i;
-  xLastSolarStateChangeTime = xTaskGetTickCount();
+  xLastTimeCheckTime = xTaskGetTickCount();
-  xLastReadTime = xTaskGetTickCount();
-NO_INIT
+QUERY_TIME
-  uart3TxRunning = 0; /* reset flag to tell if we are currently sending a datagram */
-  rxBuf3NextFreeRxPos = 0;
@@ -374 +386 @@
-
-  /* did the SolarFSM get stuck during reading? */
-xLastSolarStateChangeTime + SOLAR_FSM_STUCK_TIMEOUT
-
-NO_INIT
+(xLastSolarStateChangeTime + SOLAR_FSM_STUCK_TIMEOUT)
+
+QUERY_TIME
-    xLastSolarStateChangeTime = xTaskGetTickCount();
+
+    /* save error info */
+    solarStateWhenFail = solarState;
+    currentChannelWhenFail = currentChannel;
+    
-    initSolarFSM();
-    solarReadErrors++;
+
-  }
-  else if (xTaskGetTickCount() < xLastSolarStateChangeTime)
@@ -429 +447 @@
-      /* now ready to query channel 0 data in next state */
-      xLastSolarStateChangeTime = xTaskGetTickCount();
-QUERY_TIME
+CHAN
-    }
-    else
@@ -441 +459 @@
-
-      resetUart3RxBuf(); /* init */
-      currentChannel = 0; /* the channel we query first */
-
-       /* send query_sc_time */
-      send_uart3((unsigned char *)query_sc_time, sizeof(query_sc_time));
-      xLastSolarStateChangeTime = xTaskGetTickCount();
+      queryTimeCounter++;
-      solarState = SOL_WAIT_FOR_TIME_RSP; /* query sent wait for response */
-    break;
@@ -456 +474 @@
-      if (cmpResult == 0)
-      {
-
+  
-        
-          if (checkRxTwoByteCheckSum(1, 10, 11) == 1) /* checksum in bytes 11 and 12, check bytes 1 to 10 */
@@ -472 +490 @@
-          else
-          {
-
+/* time rx checksum error */ 
-          }
-
@@ -478 +496 @@
-        resetUart3RxBuf();
-
-
-CHAN; /* change state: time response received, now
+
+NO_INIT; /* change state: time response received, now init and
-      }
-      else
@@ -517 +535 @@
-        xLastSolarStateChangeTime = xTaskGetTickCount();
-        solarState = SOL_FINISHED;
+        currentChannel = 0;
+
+        /* new duplicated code: */
+
+        resetUart3RxBuf();
+
+
+        if (xTaskGetTickCount() > (xLastTimeCheckTime + SOLAR_TIME_CHECK_INTERVAL))
+        {
+           /* time to get the time info again! */
+           xLastTimeCheckTime = xTaskGetTickCount();
+           solarState = SOL_QUERY_TIME; /* restart the measurement cycle (with time check at first) */
+        }
+        else if (xTaskGetTickCount() < xLastTimeCheckTime)
+        {
+          /* overflow of timer, just recover. delay will be wrong. */
+          xLastTimeCheckTime = xTaskGetTickCount();
+          solarState = SOL_NO_INIT; /* restart the measurement cycle (without time check at first) */
+        }
+        else
+        {
+          /* not time to get the time info. leave state at SOL_FINISHED. */
+        }
+
+
+
-        break;
-      default:
-
+
+
+
-     } /* switch */
-solarState != SOL_FINISHED
+(solarState != SOL_FINISHED) && (solarState != SOL_QUERY_TIME)
-     {
-
+ 
-      solarState = SOL_CHAN_WAIT_REPLY; /* wait for reply if not finished */
-     } /* if */
@@ -552 +598 @@
-         case 6:
-          /* wait for the response to the finishing init */
-
+// 
-          break;
-        default:
@@ -601 +647 @@
-          /* switch to next channel */
-          currentChannel++;
+
+          /* finally, discard data from buffer */
+          resetUart3RxBuf();
+
-          /* now ready to query channel data for next channel */
-          xLastSolarStateChangeTime = xTaskGetTickCount();
@@ -607 +657 @@
-        else
-        {
+
+          /* I think we never go here ... */
+
-          /* we received the finishing sequence */
-          xLastSolarStateChangeTime = xTaskGetTickCount();
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-      }