Changeset 46

Timestamp:

02/07/10 11:36:21 (15 years ago)

Author:

phil

Message:

have now got METER_INDEX_BUTTON and METER_INDEX_GAS with display on page

Files:

• webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs (modified) (5 diffs)
• webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (modified) (1 diff)
• webserver/example/EnergyMeters/Source/EnergyMeters/Meters.c (modified) (1 diff)
• webserver/example/EnergyMeters/Source/EnergyMeters/MetersIncludes.h (modified) (1 diff)
• webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c (modified) (1 diff)

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

@@ -5 +5 @@
- <ExecutionCountWindow/>
- <Memory1>
-592c" numColumns="8" sizeText="2000
+4d28" numColumns="8" sizeText="4
- </Memory1>
- <Memory2>
@@ -14 +14 @@
- </Memory3>
- <Memory4>
-0x0000008e" numColumns="16" sizeText="20
+" numColumns="16" sizeText="
- </Memory4>
- <Project>
@@ -21 +21 @@
-  <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>
@@ -42 +41 @@
- <Watch1>
-  <Watches active="0" update="Three Seconds" >
-2
+7
-   <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" />
-08
+12
-  </Watches>
- </Watch1>
@@ -58 +57 @@
- <Watch4>
-  <Watches active="1" update="Twice a Second" >
+   <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="1" linenumber="607" evalType="1" radix="-1" name="data" expression="data" 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" />
+   <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="340" 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" />
+   <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="109" radix="16" name="solarReadErrors" expression="solarReadErrors" filename="c:/dokumente und einstellungen/phil/desktop/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" />
-   <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" />
-
+
+
+
+
-   <Watchpoint linenumber="53" radix="16" name="currentChannel" expression="currentChannel" 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 Debug" />

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

@@ -239 +239 @@
-        //strcat( ( char * ) uip_appdata, ( char * ) "\r\n" );
-
+        sprintf( cCountBuf, "<p><br>BUTTONmeter %d %d %d %d %d %d %d %d\r\n",
+            meterItems[METER_INDEX_BUTTON].meterEnabled,
+            (portLONG)(meterItems[METER_INDEX_BUTTON].timeLastTick << 32),
+           (portLONG)(meterItems[METER_INDEX_BUTTON].timeLastTick & 0xffffffff),
+            (portLONG)(meterItems[METER_INDEX_BUTTON].timeBeforeLastTick << 32),
+           (portLONG)(meterItems[METER_INDEX_BUTTON].timeBeforeLastTick & 0xffffffff),
+            meterItems[METER_INDEX_BUTTON].valueLastTick,
+            meterItems[METER_INDEX_BUTTON].currentValue,
+            meterItems[METER_INDEX_BUTTON].valueBeforeLastTick
+         );
+
+
+        strcat( uip_appdata, cCountBuf );
+
+
-        sprintf( cCountBuf, "<p><br>GASmeter %d %d %d %d %d %d %d %d\r\n",
-            meterItems[METER_INDEX_GAS].meterEnabled,

webserver/example/EnergyMeters/Source/EnergyMeters/Meters.c

@@ -138 +138 @@
-  }
-
+  // Init Example Button meter
+  meterItems[METER_INDEX_BUTTON].meterEnabled = 1;  /* 0: item not used, 1: meter enabled */
+  meterItems[METER_INDEX_BUTTON].timeLastTick = getEpochTimeWithMs(); /* when did the last tick occur? epoch (seconds) */
+  meterItems[METER_INDEX_BUTTON].timeBeforeLastTick = getEpochTimeWithMs(); /* when did the tick before last tick occur? epoch (seconds) */
+  meterItems[METER_INDEX_BUTTON].valueLastTick = 1;   /* what value did we have at the last tick? */
+  meterItems[METER_INDEX_BUTTON].currentValue = 1; /* same: start value of the meter */
+  meterItems[METER_INDEX_BUTTON].valueBeforeLastTick = 0;   /* what value did we have at the tick before the last tick? */
+
-  // Init Gas meter
-  meterItems[METER_INDEX_GAS].meterEnabled = 1;  /* 0: item not used, 1: meter enabled */

webserver/example/EnergyMeters/Source/EnergyMeters/MetersIncludes.h

@@ -3 +3 @@
-unsigned long long getEpochTimeWithMs(void);
-
-11
+5
-
-
+
+
+
-
-#define DEBOUNCE_TICK_THRESHOLD_MS 50 /* when two ticks are less than this time period apart, the second tick is ignored (debouncing) */

webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c

@@ -33 +33 @@
-  if ((IO2_INT_STAT_R & (1 << 10)) != 0) /* P2.10 interrupt triggered - SPI Load Switch */
-  {
-10
+METER_INDEX_BUTTON
-    IO2_INT_CLR |= (1<<10);
-  }
-  else if ((IO2_INT_STAT_R & (1 << 0)) != 0) /* P0.0 interrupt triggered - connector J4, Pin 0*/
-  {
-0
+METER_INDEX_GAS
-    IO2_INT_CLR |= (1<<0);
-  }