Changeset 47 for webserver

Timestamp:

02/14/10 13:59:45 (15 years ago)

Author:

phil

Message:

- now three meter entries: TST, GAS, EL1, EL2
- added CurrentTime? to web page

Files:

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

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

@@ -223 +223 @@
-generate_rtos_stats(void *arg)
-{
+
+        unsigned long long currentTime = getEpochTimeWithMs();
+
-        lRefreshCount++;
-        sprintf( cCountBuf, "<p><br>Refresh count = %d\r\nVoltages %d %d %d %d\r\n\
-
+CurrentTime %d\r\n
-         chanVolt[0], chanVolt[1], chanVolt[2], chanVolt[3],
-         chanWatt[0], chanWatt[1], chanWatt[2], chanWatt[3],
-
+, currentTime
-         );
-        //strcat( uip_appdata, cCountBuf );
@@ -239 +242 @@
-        //strcat( ( char * ) uip_appdata, ( char * ) "\r\n" );
-
-BUTTON
-BUTTON
-BUTTON
-BUTTON
-BUTTON
-BUTTON
-BUTTON
-BUTTON
-BUTTON
-
-
-
-
-
-
-<p><br>
+TST
+TST
+TST
+TST
+TST
+TST
+TST
+TST
+TST
+
+
+
+
+
+
+
-            meterItems[METER_INDEX_GAS].meterEnabled,
-            (portLONG)(meterItems[METER_INDEX_GAS].timeLastTick << 32),
@@ -267 +270 @@
-
-        strcat( uip_appdata, cCountBuf );
+
+
+        sprintf( cCountBuf, "EL1meter %d %d %d %d %d %d %d %d\r\n",
+            meterItems[METER_INDEX_EL1].meterEnabled,
+            (portLONG)(meterItems[METER_INDEX_EL1].timeLastTick << 32),
+           (portLONG)(meterItems[METER_INDEX_EL1].timeLastTick & 0xffffffff),
+            (portLONG)(meterItems[METER_INDEX_EL1].timeBeforeLastTick << 32),
+           (portLONG)(meterItems[METER_INDEX_EL1].timeBeforeLastTick & 0xffffffff),
+            meterItems[METER_INDEX_EL1].valueLastTick,
+            meterItems[METER_INDEX_EL1].currentValue,
+            meterItems[METER_INDEX_EL1].valueBeforeLastTick
+         );
+
+
+        strcat( uip_appdata, cCountBuf );
+
+
+        sprintf( cCountBuf, "EL2meter %d %d %d %d %d %d %d %d\r\n",
+            meterItems[METER_INDEX_EL2].meterEnabled,
+            (portLONG)(meterItems[METER_INDEX_EL2].timeLastTick << 32),
+           (portLONG)(meterItems[METER_INDEX_EL2].timeLastTick & 0xffffffff),
+            (portLONG)(meterItems[METER_INDEX_EL2].timeBeforeLastTick << 32),
+           (portLONG)(meterItems[METER_INDEX_EL2].timeBeforeLastTick & 0xffffffff),
+            meterItems[METER_INDEX_EL2].valueLastTick,
+            meterItems[METER_INDEX_EL2].currentValue,
+            meterItems[METER_INDEX_EL2].valueBeforeLastTick
+         );
+
+
+        strcat( uip_appdata, cCountBuf );
+
+
+
-
-        //strcat( ( char * ) uip_appdata, ( char * ) "1234test" );

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

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

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

@@ -5 +5 @@
-#define NUMBER_OF_METERS 5 /* the number of meters we use */
-
-
+
+
+
+
-
-
+
+
-
-#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 */
-  {
-BUTTON
+TST
-    IO2_INT_CLR |= (1<<10);
-  }
@@ -43 +43 @@
-  else if ((IO2_INT_STAT_R & (1 << 1)) != 0) /* P0.1 interrupt triggered - connector J4, Pin 1*/
-  {
-
+METER_INDEX_EL
-    IO2_INT_CLR |= (1<<1);
-  }
-  else if ((IO2_INT_STAT_R & (1 << 2)) != 0) /* P0.2 interrupt triggered - connector J4, Pin 2*/
-  {
-
+METER_INDEX_EL
-    IO2_INT_CLR |= (1<<2);
-  }