Changeset 50

Timestamp:

02/14/10 16:25:17 (15 years ago)

Author:

phil

Message:

added meters AU1 and AU2 (Auxiliary 1 and Auxiliary 2), interrupt handler now uses macros for meters numbers.

Files:

• 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/webserver/httpd-cgi.c

@@ -297 +297 @@
-            meterItems[METER_INDEX_EL2].valueBeforeLastTick
-         );
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        //strcat( ( char * ) uip_appdata, ( char * ) "1234test" );

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

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

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

@@ -3 +3 @@
-unsigned long long getEpochTimeWithMs(void);
-
-5
+6
-
-
-
-
-
-
-
+ 
+ 
+ 
+ 
+
+
-
-

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

@@ -53 +53 @@
-  else if ((IO2_INT_STAT_R & (1 << 3)) != 0) /* P0.3 interrupt triggered - connector J4, Pin 3*/
-  {
-3
+METER_INDEX_AU1
-    IO2_INT_CLR |= (1<<3);
-  }
-  else if ((IO2_INT_STAT_R & (1 << 4)) != 0) /* P0.4 interrupt triggered - connector J4, Pin 4*/
-  {
-4
+METER_INDEX_AU2
-    IO2_INT_CLR |= (1<<4);
-  }
-
-  /* Clear the interrupt. */ 
-  IO2_INT_CLR |= (1<<10);
-  VICVectAddr = 0;
-