Navigation

← Previous Changeset
Next Changeset →

Changeset 34

Timestamp:

01/02/10 15:33:13 (15 years ago)

Author:

phil

Message:

added Code for SolarCount?, works sometimes already! :-)

Files:

webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzp (modified) (3 diffs)
webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs (modified) (5 diffs)
webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/FreeRTOSConfig.h (modified) (1 diff)
webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/main.c (modified) (1 diff)
webserver/example/EnergyMeters/EnergyMeters/Common/Minimal/flash.c (modified) (1 diff)
webserver/example/EnergyMeters/Source/EnergyMeters/SolarCountUART.c (added)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzp

r31	r34
2	2	<solution Name="EnergyMetersEmbedded" version="2">
3	3	<project Name="EnergyMetersEmbedded">
4		<configuration Name="Common" Target="LPC2368" arm_architecture="v4T" arm_core_type="ARM7TDMI-S" arm_linker_stack_size="10" arm_linker_svc_stack_size="1024" arm_simulator_memory_simulation_filename="$(TargetsDir)/Philips_LPC210X/LPC2000SimulatorMemory.dll" arm_simulator_memory_simulation_parameter="LPC23;0x80000;0x8000;0x10000;0x10000" arm_target_debug_interface_type="ARM7TDI" arm_target_flash_loader_file_path="$(TargetsDir)/Philips_LPC210X/Release/Loader_lpc2300.elf" arm_target_flash_loader_type="LIBMEM RPC Loader" arm_target_loader_parameter="12000000" build_remove_unused_symbols="No" c_additional_options="" c_enforce_ansi_checking="No" c_preprocessor_definitions="GCC_ARM7;SUPERVISOR_START;VECTORED_IRQ_INTERRUPTS;PACK_STRUCT_END=__attribute__((packed));ALIGN_STRUCT_END=__attribute__((aligned(4)))" c_system_include_directories="$(StudioDir)/include;$(PackagesDir)/include" c_user_include_directories=".;$(ProjectDir)\\..\\..\\Source\\include;$(ProjectDir)\\..\\..\\Source\\GCC\\ARM7_LPC2000;$(ProjectDir)\\..\\Common\\Include;$(ProjectDir)\\LCD;$(ProjectDir)\\webserver;$(ProjectDir)\\..\\Common\\ethernet\\uIP\\uip-1.0\\uip" gcc_entry_point="reset_handler" gcc_optimization_level="None" link_include_startup_code="No" linker_additional_files="$(PackagesDir)/lib/liblpc2000$(LibExt)$(LIB)" linker_memory_map_file="$(TargetsDir)/Philips_LPC210X/Philips_LPC2368_MemoryMap.xml" linker_printf_fmt_level="long" oscillator_frequency="12MHz" project_directory="" project_type="Executable" property_groups_file_path="$(TargetsDir)/Philips_LPC210X/propertyGroups23xx.xml"/>
	4	<configuration Name="Common" Target="LPC2368" arm_architecture="v4T" arm_core_type="ARM7TDMI-S" arm_linker_stack_size="10" arm_linker_svc_stack_size="1024" arm_simulator_memory_simulation_filename="$(TargetsDir)/Philips_LPC210X/LPC2000SimulatorMemory.dll" arm_simulator_memory_simulation_parameter="LPC23;0x80000;0x8000;0x10000;0x10000" arm_target_debug_interface_type="ARM7TDI" arm_target_flash_loader_file_path="$(TargetsDir)/Philips_LPC210X/Release/Loader_lpc2300.elf" arm_target_flash_loader_type="LIBMEM RPC Loader" arm_target_loader_parameter="12000000" build_remove_unused_symbols="No" c_additional_options="" c_enforce_ansi_checking="No" c_preprocessor_definitions="GCC_ARM7;SUPERVISOR_START;VECTORED_IRQ_INTERRUPTS;PACK_STRUCT_END=__attribute__((packed));ALIGN_STRUCT_END=__attribute__((aligned(4)))" c_system_include_directories="$(StudioDir)/include;$(PackagesDir)/include" c_user_include_directories=".;$(ProjectDir)\\..\\..\\Source\\include;$(ProjectDir)\\..\\..\\Source\\GCC\\ARM7_LPC2000;$(ProjectDir)\\..\\Common\\Include;$(ProjectDir)\\LCD;$(ProjectDir)\\webserver;$(ProjectDir)\\..\\Common\\ethernet\\uIP\\uip-1.0\\uip;$(ProjectDir)\\..\\..\\Source\\include\\Targets" gcc_entry_point="reset_handler" gcc_optimization_level="None" link_include_startup_code="No" linker_additional_files="$(PackagesDir)/lib/liblpc2000$(LibExt)$(LIB)" linker_memory_map_file="$(TargetsDir)/Philips_LPC210X/Philips_LPC2368_MemoryMap.xml" linker_printf_fmt_level="long" oscillator_frequency="12MHz" project_directory="" project_type="Executable" property_groups_file_path="$(TargetsDir)/Philips_LPC210X/propertyGroups23xx.xml"/>
5	5	<configuration Name="RAM" Placement="RAM" linker_section_placement_file="$(StudioDir)/targets/sram_placement.xml" target_reset_script="SRAMReset()"/>
6	6	<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()"/>
…	…
55	55	<file Name="heap_2.c" file_name="../../Source/portable/MemMang/heap_2.c"/>
56	56	</folder>
57		<configuration Name="ARM Flash Debug" arm_target_flash_loader_type="LIBMEM RPC Loader" c_enforce_ansi_checking="No" c_preprocessor_definitions="" gcc_optimization_level="~~Level 1~~" linker_keep_symbols="_vectors" linker_printf_fmt_level="int" linker_scanf_character_group_matching_enabled="No" linker_scanf_fmt_level="int"/>
	57	<configuration Name="ARM Flash Debug" arm_target_flash_loader_type="LIBMEM RPC Loader" c_enforce_ansi_checking="No" c_preprocessor_definitions="" gcc_optimization_level="None" linker_keep_symbols="_vectors" linker_printf_fmt_level="int" linker_scanf_character_group_matching_enabled="No" linker_scanf_fmt_level="int"/>
58	58	<folder Name="uIP Source">
59	59	<file Name="uIP_Task.c" file_name="webserver/uIP_Task.c">
…	…
93	93	<file file_name="../../Source/EnergyMeters/MetersIncludes.h"/>
94	94	<file file_name="../../Source/EnergyMeters/timeConversion.c"/>
	95	<file file_name="../../Source/EnergyMeters/SolarCountUART.c"/>
95	96	</folder>
96	97	</project>

webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs

r32	r34
2	2	<session>
3	3	<Bookmarks/>
4		<Breakpoints/>
	4	<Breakpoints>
	5	<BreakpointListItem line="108" action="" hardwareBreakpoint="" trigger="" useHWbreakpoint="false" group="Breakpoints" type="Breakpoint" state="2" counter="0" isFunctionBreakpoint="false" filename="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\EnergyMeters\SolarCountUART.c" expression="" />
	6	</Breakpoints>
5	7	<ExecutionCountWindow/>
6	8	<Memory1>
…	…
14	16	</Memory3>
15	17	<Memory4>
16		<MemoryWindow autoEvaluate="0" addressText="~~" numColumns="8" sizeText="~~" dataSize="1" radix="16" addressSpace="" />
	18	<MemoryWindow autoEvaluate="0" addressText="0x40005749" numColumns="8" sizeText="1" dataSize="1" radix="16" addressSpace="" />
17	19	</Memory4>
18	20	<Project>
…	…
32	34	</Register3>
33	35	<Register4>
34		<RegisterWindow openNodes="~~" binaryNodes="" unsignedNodes="" visibleGroups="~~" decimalNodes="" octalNodes="" asciiNodes="" />
	36	<RegisterWindow openNodes="UART3;UART3/U3IER;UART3/U3IIR;UART3/U3FCR;UART3/U3LCR;UART3/U3LSR;UART3/U3ACR;UART3/U3ICR;UART3/U3FDR;UART3/U3TER" binaryNodes="" unsignedNodes="" visibleGroups="UART3" decimalNodes="" octalNodes="" asciiNodes="" />
35	37	</Register4>
36	38	<TargetWindow programAction="" uploadFileType="" programLoadAddress="" programSize="" uploadFileName="" uploadMemoryInterface="" programFileName="" uploadStartAddress="" programFileType="" uploadSize="" programMemoryInterface="" />
…	…
39	41	</TraceWindow>
40	42	<Watch1>
41		<Watches active="1" update="Three Seconds" >
	43	<Watches active="0" update="Three Seconds" >
	44	<Watchpoint evalMode="2" linenumber="216" numelements="10" evalType="0" radix="16" name="rxUART3" expression="rxUART3" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
42	45	<Watchpoint evalMode="2" linenumber="72" numelements="10" evalType="0" radix="16" name="meterItems" expression="meterItems" filename="d:/energymetersproject/source/energymeters/meters_isrs.c" />
	46	<Watchpoint linenumber="419" radix="16" name="PINSEL0" expression="PINSEL0" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
43	47	<Watchpoint linenumber="64" radix="-1" name="currentTime" expression="currentTime" filename="d:/energymetersproject/source/energymeters/meters_isrs.c" />
44	48	</Watches>
…	…
53	57	</Watch3>
54	58	<Watch4>
55		<Watches active="0" update="Never" >
56		<Watchpoint evalMode="2" linenumber="66" numelements="10" evalType="0" radix="-1" name="meterItems" expression="meterItems" filename="d:/freertosexample/source/energymeters/meters_isrs.c" />
	59	<Watches active="1" update="Five Seconds" >
	60	<Watchpoint linenumber="86" radix="16" name="compareBuf" expression="compareBuf" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
	61	<Watchpoint linenumber="197" radix="16" name="compareBufMask" expression="compareBufMask" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
	62	<Watchpoint linenumber="197" radix="16" name="compareBuf" expression="compareBuf" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
	63	<Watchpoint linenumber="211" radix="16" name="numRxBytes" expression="numRxBytes" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
	64	<Watchpoint linenumber="211" radix="16" name="numRxBytes" expression="numRxBytes" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
	65	<Watchpoint evalMode="2" linenumber="375" numelements="6" evalType="0" radix="-1" name="chanWatt" expression="chanWatt" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
	66	<Watchpoint evalMode="2" linenumber="414" numelements="100" evalType="0" radix="-1" name="rxUART3" expression="rxUART3" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
	67	<Watchpoint linenumber="211" radix="-1" name="lengthCompare" expression="lengthCompare" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
	68	<Watchpoint evalMode="2" linenumber="375" numelements="6" evalType="0" radix="-1" name="chanVolt" expression="chanVolt" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
	69	<Watchpoint linenumber="214" radix="16" name="k" expression="k" filename="c:/dokumente und einstellungen/phil/desktop/repo/webserver/example/energymeters/source/energymeters/solarcountuart.c" />
57	70	</Watches>
58	71	</Watch4>
59	72	<Files>
60		<SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\EnergyMetersProject\Source\EnergyMeters\Meters.c" y="122" path="D:\EnergyMetersProject\Source\EnergyMeters\Meters.c" left="0" selected="0" name="unnamed" top="122" />
61		<SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\EnergyMetersProject\EnergyMeters\ARM7_LPC2368_Rowley\main.c" y="113" path="D:\EnergyMetersProject\EnergyMeters\ARM7_LPC2368_Rowley\main.c" left="0" selected="1" name="unnamed" top="129" />
62		<SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\EnergyMetersProject\Source\EnergyMeters\Meters_ISRs.c" y="71" path="D:\EnergyMetersProject\Source\EnergyMeters\Meters_ISRs.c" left="0" selected="0" name="unnamed" top="69" />
63		<SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\energymetersproject\source\energymeters\timeConversion.c" y="18" path="D:\energymetersproject\source\energymeters\timeConversion.c" left="0" selected="0" name="unnamed" top="18" />
64		<SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\energymetersproject\source\energymeters\MetersIncludes.h" y="8" path="D:\energymetersproject\source\energymeters\MetersIncludes.h" left="0" selected="0" name="unnamed" top="0" />
65		<SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="D:\EnergyMetersProject\EnergyMeters\ARM7_LPC2368_Rowley\webserver\httpd-cgi.c" y="0" path="D:\EnergyMetersProject\EnergyMeters\ARM7_LPC2368_Rowley\webserver\httpd-cgi.c" left="0" selected="0" name="unnamed" top="0" />
	73	<SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\portable\GCC\ARM7_LPC23xx\portISR.c" y="108" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\portable\GCC\ARM7_LPC23xx\portISR.c" left="0" selected="0" name="unnamed" top="85" />
	74	<SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\EnergyMeters\SolarCountUART.c" y="14" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\Source\EnergyMeters\SolarCountUART.c" left="0" selected="1" name="unnamed" top="12" />
	75	<SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\main.c" y="113" path="C:\Dokumente und Einstellungen\phil\Desktop\repo\webserver\example\EnergyMeters\EnergyMeters\ARM7_LPC2368_Rowley\main.c" left="0" selected="0" name="unnamed" top="105" />
66	76	</Files>
67		<ARMCrossStudioWindow activeProject="EnergyMetersEmbedded" autoConnectTarget="Macraigor Wiggler (20 Pin)" debugSearchFileMap="" fileDialogInitialDirectory="~~D:\freeRTOSexample\Source\EnergyMeters~~" fileDialogDefaultFilter="*.c" autoConnectCapabilities="388479" debugSearchPath="" buildConfiguration="ARM Flash Debug" />
	77	<ARMCrossStudioWindow activeProject="EnergyMetersEmbedded" autoConnectTarget="Macraigor Wiggler (20 Pin)" debugSearchFileMap="" fileDialogInitialDirectory="C:\Dokumente und Einstellungen\phil\Desktop\repo\Examples_CP-JR_ARM7_LPC2368\ETT_LPC2368_Examples\PERIPHERAL_DEMO\LED_Blink" fileDialogDefaultFilter="*.c" autoConnectCapabilities="388479" debugSearchPath="" buildConfiguration="ARM Flash Debug" />
68	78	</session>

webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/FreeRTOSConfig.h

r17	r34
79	79	#define configUSE_IDLE_HOOK 0
80	80	#define configUSE_TICK_HOOK 0
81		#define configCPU_CLOCK_HZ ( ( unsigned portLONG ) ~~57600000~~ )
	81	#define configCPU_CLOCK_HZ ( ( unsigned portLONG ) 72000000 /57600000/ )
82	82	#define configTICK_RATE_HZ ( ( portTickType ) 1000 )
83	83	#define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 4 )

webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/main.c

r22	r34
117	117	/* Setup the led's on the MCB2300 board */
118	118	vParTestInitialise();
	119
	120	testUART3();
119	121
120	122	/* Create the queue used by the LCD task. Messages for display on the LCD

webserver/example/EnergyMeters/EnergyMeters/Common/Minimal/flash.c

r17	r34
120	120	/* We will turn the LED on and off again in the delay period, so each
121	121	delay is only half the total period. */
122		xFlashRate /= ( portTickType ) 2;
	122	xFlashRate /= ( portTickType ) 1;
123	123
124	124	/* We need to initialise xLastFlashTime prior to the first call to

Navigation

Changeset 34

Legend:

webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzp

webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/EnergyMeters.hzs

webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/FreeRTOSConfig.h

webserver/example/EnergyMeters/EnergyMeters/ARM7_LPC2368_Rowley/main.c

webserver/example/EnergyMeters/EnergyMeters/Common/Minimal/flash.c

Download in other formats: