Changeset 19

Timestamp:

08/12/09 10:41:35 (15 years ago)

Author:

phil

Message:

first display of button presses,
stubs for calculations,
removed calls of unused example functions

Files:

• webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley (modified) (1 prop)
• webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/ARM Flash Debug (modified) (1 prop)
• webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp (modified) (4 diffs)
• webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzs (modified) (2 diffs)
• webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/main.c (modified) (4 diffs)
• webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c (modified) (1 diff)
• webserver/example/freeRTOSexample/Source/EnergyMeters (added)
• webserver/example/freeRTOSexample/Source/EnergyMeters/Meters.c (added)
• webserver/example/freeRTOSexample/Source/EnergyMeters/Meters_ISRs.c (added)

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

@@ -2 +2 @@
-<solution Name="RTOSDemo" version="2">
-  <project Name="RTOSDemo">
-
+enforce_ansi_checking="No" c_
-    <configuration Name="RAM" Placement="RAM" linker_section_placement_file="$(StudioDir)/targets/sram_placement.xml" target_reset_script="SRAMReset()"/>
-    <configuration Name="Flash" Placement="Flash" arm_target_flash_loader_file_path="$(TargetsDir)/Philips_LPC210X/Release/Loader_lpc2300.elf" arm_target_flash_loader_type="LIBMEM RPC Loader" linker_section_placement_file="$(StudioDir)/targets/flash_placement.xml" target_reset_script="FLASHReset()"/>
@@ -45 +45 @@
-    <folder Name="System Files">
-      <file Name="crt0.s" file_name="$(StudioDir)/source/crt0.s"/>
-
+
+
+
-      <file Name="LPC230x.c" file_name="$(TargetsDir)/Philips_LPC210X/LPC230x.c"/>
-      <file Name="Philips_LPC210X_Target.js" file_name="$(TargetsDir)/Philips_LPC210X/Philips_LPC210X_Target.js">
@@ -58 +60 @@
-      </file>
-      <file Name="list.c" file_name="../../Source/list.c"/>
-
+
+
+
-      <file Name="port.c" file_name="../../Source/portable/GCC/ARM7_LPC23xx/port.c"/>
-      <file Name="portISR.c" file_name="../../Source/portable/GCC/ARM7_LPC23xx/portISR.c">
@@ -98 +102 @@
-    <configuration Name="ARM Flash Release" c_preprocessor_definitions="STARTUP_FROM_RESET" gcc_optimization_level="Optimize For Size"/>
-    <configuration Name="THUMB Flash Debug" arm_linker_fiq_stack_size="0" arm_linker_heap_size="0" arm_linker_stack_size="0" arm_linker_svc_stack_size="512"/>
+    <folder Name="EnergyMeters">
+      <file file_name="../../Source/EnergyMeters/Meters_ISRs.c"/>
+      <file file_name="../../Source/EnergyMeters/Meters.c"/>
+    </folder>
-  </project>
-  <configuration Name="ARM Flash Debug" inherited_configurations="ARM;Flash;Debug"/>

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

@@ -20 +20 @@
-  <ProjectSessionItem path="RTOSDemo;RTOSDemo" name="unnamed" />
-  <ProjectSessionItem path="RTOSDemo;RTOSDemo;Demo Source" name="unnamed" />
+  <ProjectSessionItem path="RTOSDemo;RTOSDemo;EnergyMeters" name="unnamed" />
+  <ProjectSessionItem path="RTOSDemo;RTOSDemo;FreeRTOS.org Source" name="unnamed" />
+  <ProjectSessionItem path="RTOSDemo;RTOSDemo;System Files" name="unnamed" />
+  <ProjectSessionItem path="RTOSDemo;RTOSDemo;uIP Source" name="unnamed" />
- </Project>
- <Register1>
-
+CPU - Current Mode
- </Register1>
- <Register2>
-
+CPU - Current Mode
- </Register2>
- <Register3>
@@ -41 +45 @@
- </Watch1>
- <Watch2>
-
+
+
+
+
+
- </Watch2>
- <Watch3>
-0
+1
- </Watch3>
- <Watch4>
-
-
+
+
+
+
+
+
+
+
+
+
-   <Watchpoint linenumber="131" radix="-1" name="xLastFlashTime" expression="xLastFlashTime" filename="c:/dokumente und einstellungen/birdy/desktop/freertos/demo/common/minimal/flash.c" />
-   <Watchpoint linenumber="131" radix="-1" name="xFlashRate" expression="xFlashRate" filename="c:/dokumente und einstellungen/birdy/desktop/freertos/demo/common/minimal/flash.c" />
-   <Watchpoint linenumber="139" radix="-1" name="uxLED" expression="uxLED" filename="c:/dokumente und einstellungen/birdy/desktop/freertos/demo/arm7_lpc2368_rowley/partest/partest.c" />
-   <Watchpoint linenumber="0" radix="-1" name="xStart" expression="xStart" filename="" />
-
+
+
-  </Watches>
- </Watch4>
- <Files>
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- </Files>
-C:\E\Dev\FreeRTOS\Demo\ARM7_LPC2368_Rowley\webserver" fileDialogDefaultFilter="*.c" autoConnectCapabilities="388479" debugSearchPath="" buildConfiguration="ARM Flash Debug
+D:\freeRTOSexample\Source\EnergyMeters" fileDialogDefaultFilter="*.c" autoConnectCapabilities="388479" debugSearchPath="" buildConfiguration="ARM Flash Release
-</session>

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

@@ -81 +81 @@
-
-
+void setRTC(void);
+void startRTC(void);
+
-/*
- * Checks the status of all the demo tasks then prints a message to the
@@ -98 +101 @@
-extern void vuIP_Task( void *pvParameters );
-
+/* 
+ * The task that handles the electricity meter handling/calculations.
+ */
+extern void vMeters_Task( void *pvParameters );
+
-/*
- * The LCD is written two by more than one task so is controlled by a 
@@ -113 +121 @@
-int main (void)
-{
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /* Start the standard demo tasks. */
-       
-  
-  
-  
-  
-  
+//  
+//
+
+//
+//
+//
-
-        /* Start the tasks defined within this file/specific to this demo. */
-
-       
+//
+    
-
-        /* The suicide tasks must be created last as they need to know how many
-        tasks were running prior to their creation in order to ascertain whether
-        or not the correct/expected number of tasks are running at any given time. */
-
+
+
-
-        /* Start the scheduler. */
@@ -245 +258 @@
-}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

webserver/example/freeRTOSexample/Demo/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c

@@ -208 +208 @@
-static char cCountBuf[ 32 ];
-long lRefreshCount = 0;
+extern basementGasReading;
+extern rtcHOURS;
+extern rtcMINUTES;
+extern rtcSECONDS;
-static unsigned short
-generate_rtos_stats(void *arg)
-{
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-}
-/*---------------------------------------------------------------------------*/