Changeset 32

Timestamp:

08/14/09 23:28:59 (15 years ago)

Author:

phil

Message:

completed the gas meter calculation algorithm

Files:

• webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs (modified) (3 diffs)
• webserver/example/EnergyMeters/Source/EnergyMeters/Meters_ISRs.c (modified) (2 diffs)

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>
@@ -38 +39 @@
- </TraceWindow>
- <Watch1>
-
+
+
-   <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="-1" name="meterItems" expression="meterItems" filename="d:/energymetersproject/source/energymeters/meters_isrs.c" />
-  </Watches>
- </Watch1>
@@ -58 +59 @@
- <Files>
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\EnergyMetersProject\Source\EnergyMeters\Meters.c" y="122" path="D:\EnergyMetersProject\Source\EnergyMeters\Meters.c" left="0" selected="0" name="unnamed" top="122" />
-0" name="unnamed" top="101
-89" path="D:\EnergyMetersProject\Source\EnergyMeters\Meters_ISRs.c" left="0" selected="1" name="unnamed" top="66
+1" name="unnamed" top="129
+71" path="D:\EnergyMetersProject\Source\EnergyMeters\Meters_ISRs.c" left="0" selected="0" name="unnamed" top="69
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\energymetersproject\source\energymeters\timeConversion.c" y="18" path="D:\energymetersproject\source\energymeters\timeConversion.c" left="0" selected="0" name="unnamed" top="18" />
-8
+0
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\EnergyMetersProject\EnergyMeters\ARM7_LPC2368_Rowley\webserver\httpd-cgi.c" y="0" path="D:\EnergyMetersProject\EnergyMeters\ARM7_LPC2368_Rowley\webserver\httpd-cgi.c" left="0" selected="0" name="unnamed" top="0" />
- </Files>

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

@@ -70 +70 @@
-     * enough on the web page to be read by the server 
-     */
- currentTime > ((unsigned long long)meterItems[METER_INDEX_GAS].tim
+currentTime > ((unsigned long long)meterItems[METER_INDEX_GAS].timeBefor
-    {
-
+
+
+
-      meterItems[METER_INDEX_GAS].timeBeforeLastTick = meterItems[METER_INDEX_GAS].timeLastTick;     /* when did the tick before the last tick occur? (epoch in milliseconds) */
-      meterItems[METER_INDEX_GAS].timeLastTick = currentTime; /* when did the last tick occur? (epoch in milliseconds) */
@@ -81 +83 @@
-    else
-    {
-
+
+
+
-    }
-  }