Changeset 22 for webserver/example/freeRTOSexample

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/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp (modified) (3 diffs)
• webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzs (modified) (1 diff)
• webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/main.c (modified) (4 diffs)
• webserver/example/freeRTOSexample/Demo/Common/Minimal/BlockQ.c (deleted)
• webserver/example/freeRTOSexample/Demo/Common/Minimal/PollQ.c (deleted)
• webserver/example/freeRTOSexample/Demo/Common/Minimal/blocktim.c (deleted)
• webserver/example/freeRTOSexample/Demo/Common/Minimal/death.c (deleted)
• webserver/example/freeRTOSexample/Demo/Common/Minimal/integer.c (deleted)
• webserver/example/freeRTOSexample/Demo/Common/Minimal/semtest.c (deleted)
• webserver/example/freeRTOSexample/Source/EnergyMeters/Meters.c (modified) (6 diffs)
• webserver/example/freeRTOSexample/Source/EnergyMeters/MetersIncludes.h (added)
• webserver/example/freeRTOSexample/Source/EnergyMeters/Meters_ISRs.c (modified) (3 diffs)
• webserver/example/freeRTOSexample/Source/EnergyMeters/timeConversion.c (added)

webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp

@@ -11 +11 @@
-      </file>
-      <file Name="portlcd.c" file_name="LCD/portlcd.c">
-        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
-      </file>
-      <file Name="blocktim.c" file_name="../Common/Minimal/blocktim.c">
-        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
-      </file>
-      <file Name="integer.c" file_name="../Common/Minimal/integer.c">
-        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
-      </file>
-      <file Name="BlockQ.c" file_name="../Common/Minimal/BlockQ.c">
-        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
-      </file>
@@ -36 +27 @@
-        <configuration Name="ARM Flash Debug" build_exclude_from_build="No"/>
-        <configuration Name="Common" asm_additional_options=""/>
-      </file>
-      <file Name="death.c" file_name="../Common/Minimal/death.c"/>
-      <file Name="PollQ.c" file_name="../Common/Minimal/PollQ.c"/>
-      <file Name="semtest.c" file_name="../Common/Minimal/semtest.c">
-        <configuration Name="Common" c_enforce_ansi_checking="No"/>
-      </file>
-    </folder>
@@ -105 +91 @@
-      <file file_name="../../Source/EnergyMeters/Meters_ISRs.c"/>
-      <file file_name="../../Source/EnergyMeters/Meters.c"/>
+      <file file_name="../../Source/EnergyMeters/MetersIncludes.h"/>
+      <file file_name="../../Source/EnergyMeters/timeConversion.c"/>
-    </folder>
-  </project>

webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzs

@@ -45 +45 @@
- </Watch1>
- <Watch2>
-
-
-
-
-
+
- </Watch2>
- <Watch3>
-
+
+
+
- </Watch3>
- <Watch4>
-  <Watches active="0" update="Never" >
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  </Watches>
- </Watch4>
- <Files>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
- </Files>
-Release
+Debug
-</session>

webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/main.c

@@ -56 +56 @@
-
-/* Demo app includes. */
-
-
-
-
+
-#include "portlcd.h"
-#include "flash.h"
-
-
-
+
-
-/* Demo application definitions. */
@@ -74 +69 @@
-#define mainQUEUE_POLL_PRIORITY                         ( tskIDLE_PRIORITY + 2 )
-#define mainCHECK_TASK_PRIORITY                         ( tskIDLE_PRIORITY + 3 )
-#define mainSEM_TEST_PRIORITY                           ( tskIDLE_PRIORITY + 1 )
-#define mainBLOCK_Q_PRIORITY                            ( tskIDLE_PRIORITY + 2 )
-#define mainFLASH_PRIORITY                  ( tskIDLE_PRIORITY + 2 )
-
-
+
-
-
@@ -134 +126 @@
-
-//  vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
-BLOCK_Q
+FLASH
-        /* Start the standard demo tasks. */
-//  vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
@@ -181 +173 @@
-                /* Has an error been found in any task? */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        LCD_cls();

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

@@ -4 +4 @@
-#include "task.h"
-
-
++200
-/* masks for RTC */
-#define MASKSEC 0x3F                                                                            // Second 00..59   00000000:00000000:00xxxxxx
@@ -10 +10 @@
-#define MASKHR  0x1F0000                                                                        // Hour 00..23     000xxxxx:00000000:00000000
-
+#include "MetersIncludes.h"
+
+extern xTickCount; /* tick counter (milliseconds) */
-
-portBASE_TYPE Init_P2_0(void);
@@ -21 +24 @@
-
-portTickType xLastMeterTaskRunTime; /* keeps the last time the meter calculation ran */
-portTickType xMeterIdleRate = 1000; /* the rate (in ticks = ms) at which the calculation runs when no pulses triggered a calculation */
-
-
@@ -35 +37 @@
-        
-  Init_P2_0(); /* init GPIO for meters */
-  xLastMeterTaskRunTime = xTaskGetTickCount(); /* init last run time */
-
-
-  for( ;; )
@@ -73 +73 @@
-{
-
+  initMeterItems();
-  /* Spawn the task. */
-  xTaskCreate( vMeters_Task, ( signed portCHAR * ) "Meters", metersSTACK_SIZE, NULL, uxPriority, ( xTaskHandle * ) NULL );
@@ -106 +107 @@
-
-}
+
+void initMeterItems(void)
+{
+  int i;
+  for (i = 0; i < NUMBER_OF_METERS; i++)
+  {
+    meterItems[i].meterEnabled = 0; // disable all meters
+  }
+
+  // Init Gas meter
+  meterItems[METER_INDEX_GAS].meterEnabled = 1;  /* 0: item not used, 1: meter enabled */
+  meterItems[METER_INDEX_GAS].timeLastTick = getEpochTimeWithMs(); /* when did the last tick occur? epoch (seconds) */
+  meterItems[METER_INDEX_GAS].timeBeforeLastTick = getEpochTimeWithMs(); /* when did the tick before 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? */
+
+}

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? */
+}
-
-
-