Changeset 22 for webserver/example/freeRTOSexample/Source/EnergyMeters/Meters_ISRs.c

Timestamp:

08/14/09 11:24:55 (15 years ago)

Author:

phil

Message:

deleted some test files,
gas meter values (unsigned long long) now updated.
added epoch time handling

Files:

• webserver/example/freeRTOSexample/Source/EnergyMeters/Meters_ISRs.c (modified) (3 diffs)

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

@@ -2 +2 @@
-#include "semphr.h"
-#include "task.h"
+#include "MetersIncludes.h"
-
-extern basementGasReading;
-extern xMetersSemaphore;
+extern xTickCount; /* millisecond tick counter */
+
+void handleGasMeterTick(void);
-
-/* The interrupt entry point. */
@@ -19 +22 @@
-  if ((IO2_INT_STAT_R & (1 << 10)) != 0) /* P2.10 interrupt triggered */
-  {
-basementGasReading++
+handleGasMeterTick()
-  }
- // else if ((IO2_INT_STAT_R & (1 << n)) != 0) /* some other interrupt triggered */
@@ -56 +59 @@
-}
-
+void handleGasMeterTick(void)
+{
+  meterItems[METER_INDEX_GAS].timeBeforeLastTick = meterItems[METER_INDEX_GAS].timeLastTick;     /* when did the tick before the last tick occur? */
+  meterItems[METER_INDEX_GAS].timeLastTick = getEpochTimeWithMs(); /* when did the last tick occur? epoch (seconds) */
+  meterItems[METER_INDEX_GAS].valueLastTick = 0;   /* what value did we have at the last tick? */
+  meterItems[METER_INDEX_GAS].valueBeforeLastTick = 1;   /* what value did we have at the tick before the last tick? */
+}
-
-
-