adamdunkels
0d1e7e9b32
Improved parsing of serial data and output
2009-02-08 19:38:22 +00:00
adamdunkels
54b4226f70
Nightly test that runs Contiki's shell collect command in much the same way as the Contiki collect program does
2009-02-08 19:34:34 +00:00
fros4943
2d671a1265
Nimbus look and feel is not fully supported on many linux platforms:
...
* changing default look and feel to cross platform l&f on linux systems
2009-02-08 18:33:05 +00:00
fros4943
3fcd77f522
increased default java memory allocation for contiki tests
2009-02-07 17:24:15 +00:00
joxe
250ed0b910
updated mspsim with support for setting node id
2009-02-07 16:39:43 +00:00
joxe
4b78e80bda
added MAC address setting - setNodeID in SkyNode
2009-02-07 16:38:51 +00:00
adamdunkels
29ec3b02f5
A nightly test of the Rime collect protocol on the sky platform
2009-02-07 16:18:25 +00:00
adamdunkels
cf57c8189f
Added a nightly test for the Rime collect protocol
2009-02-06 10:13:55 +00:00
fros4943
3c11bf4d8c
start each log file with its filename
2009-02-04 17:58:17 +00:00
fros4943
520ad77046
sky checkpointing test:
...
Tests node local checkpointing on the Sky platform. A single node checkpoints and rollbacks with a repeating echo background process. Running examples/sky-shell/sky-shell.c
2009-02-04 17:53:16 +00:00
fros4943
67f41c8e5c
re-enabled radio channels on sky motes
2009-02-03 14:34:47 +00:00
joxe
4879e83403
minor TOS serial fix
2009-02-03 14:18:12 +00:00
joxe
cf197a3496
fixed TOS detect on usart output
2009-02-03 14:08:24 +00:00
fros4943
04738e219d
bugfix: setting heap start to enable stack watch again
2009-01-23 15:32:24 +00:00
fros4943
fe4cc83441
removed button debug output
2009-01-21 14:31:12 +00:00
fros4943
e194514cb3
printing contiki version and address at startup, similar to other Contiki platforms such as the sky
2009-01-21 12:18:10 +00:00
fros4943
49e0822d28
increased timeout time to 90sec
2009-01-15 13:56:16 +00:00
fros4943
f0111ac181
increased buffer size for maximum sized packets including preamble
2009-01-15 13:55:20 +00:00
fros4943
57584c7af6
added wget contiki test
2009-01-15 13:20:18 +00:00
fros4943
2d8667cad1
added simple method for wrapping serial data in SLIP packets
2009-01-15 13:13:47 +00:00
fros4943
98d23c3494
added help method for writing to script mote serial ports
2009-01-15 13:11:56 +00:00
joxe
c3b6ff6bd3
bugfixed version of mspsim - v0.96
2009-01-14 14:09:37 +00:00
fros4943
424985c5f8
added generate_message macro to contiki scripts
2009-01-12 10:45:40 +00:00
fros4943
30e6d4943a
changed compilation debug messages
2009-01-12 10:44:36 +00:00
fros4943
6c66d36d62
increased timeout + added some more test output
2009-01-08 18:01:36 +00:00
fros4943
54b7875295
minor fix: using yield and wait_until macro to implement yield_wait_until
2009-01-08 17:47:37 +00:00
fros4943
f296df8bca
fixed typo
2009-01-08 17:46:25 +00:00
fros4943
268df2cadf
bugfix in test: script must yield to avoid infinitely looping at receive messages
2009-01-08 17:34:49 +00:00
fros4943
000fd29f4c
updated threaded contiki test scripts
2009-01-08 17:11:06 +00:00
fros4943
17fa4513dc
updated threaded contiki test scripts
2009-01-08 16:55:53 +00:00
fros4943
b2a1dd2156
updated threaded contiki test scripts
2009-01-08 16:41:48 +00:00
fros4943
94f0d8ca02
implemented contiki test scripts as threads instead of state machines for easier test development
2009-01-08 16:33:14 +00:00
fros4943
fd432fa22c
implemented contiki test scripts as threads instead of state machines for easier test development:
...
new example script + minor fixes
2009-01-08 16:31:43 +00:00
fros4943
2088451994
implemented contiki test scripts as threads instead of state machines for easier test development:
...
javascript generator that replaces test script specific "macros"
2009-01-08 16:27:48 +00:00
fros4943
4af3e29af8
better project load failure notification
2009-01-08 15:43:49 +00:00
fros4943
0f0aab0005
added support for removing events from queue outside simulation thread
2009-01-08 15:42:25 +00:00
fros4943
e9fa905ff1
minor bugfix: use isVisualized() method to determine if Cooja is visualized
2008-12-19 12:48:09 +00:00
fros4943
9e689d4b54
RUN_ALL assumes default Contiki search path
2008-12-17 13:14:46 +00:00
fros4943
e3d3634249
merged script runner plugins:
...
* in GUI-mode the script is editable
* without GUI, the script loads the simulation and activates the test script
2008-12-17 13:12:07 +00:00
fros4943
67d2761fcc
gateway plugin does not extend visplugin; it can be used when cooja is not visualized (such as during tests)
2008-12-17 12:15:43 +00:00
fros4943
1a2794d961
visplugins are optional, but require cooja to be visualized:
...
* hybrid plugins (used both when cooja is visualized and in test mode) should not extend VisPlugin
2008-12-17 11:02:05 +00:00
fros4943
2c344d0754
added cooja support for 64-bit 64-bit architectures:
...
* compiling for PIC
contributed by David Gustafsson and Jesper Karlsson
2008-12-16 16:15:36 +00:00
fros4943
a55f178c7e
implemented getGUI() method
2008-12-16 15:11:18 +00:00
fros4943
4d399119a4
removed dependency on visplugin class, instead referencing plugin visualizers via new plugin method getGUI()
...
+ sanity-check when restoring last cooja location
2008-12-16 15:10:49 +00:00
fros4943
55e5f12503
removing visplugin class dependency
...
* added method for fetching plugin visualizer
2008-12-16 15:07:14 +00:00
fros4943
a5e3a34324
implemented default method for fetching plugin visualizer
2008-12-16 15:05:27 +00:00
fros4943
558244b488
ip ping test for sky platform (telnet server).
2008-12-16 09:51:36 +00:00
fros4943
c36aae56bb
added support for linux:
...
* starting external Contiki process to setup tun interface (instead of JNI solution)
* sending simulation-generated packets to loopback network device (need to activate forwarding and disable rp filter)
2008-12-12 16:27:40 +00:00
nvt-se
747d27ecda
updated cooja/mspsim test for coffee. now with GC
2008-12-12 13:24:42 +00:00
fros4943
c2ef633c87
create lib directory when building
2008-12-09 17:01:42 +00:00
fros4943
e0cc36b02e
removed todo: serial data callback is implemented
2008-12-09 16:58:36 +00:00
fros4943
d45aafc2bb
native IP gateway mote plugin: enables IP communication with simulated networks, such as with ping or telnet
2008-12-09 16:57:57 +00:00
fros4943
c4ba4b7008
thread-safe event scheduling
2008-12-08 13:07:06 +00:00
fros4943
34829fe41e
storing current project directories as meta data in simulation configs.
...
currently no action: only warns if loaded simulation depends on a project not active
2008-12-08 10:26:21 +00:00
fros4943
2e66e36755
added for convenience: reload simulation with new random seed
2008-12-08 09:38:42 +00:00
fros4943
28f299ad87
allow mote tick events to be removed from event queue (slightly faster execution)
2008-12-04 16:52:03 +00:00
joxe
37b40f99c7
changed simulation time from int to long to support very long simulations
2008-12-04 14:03:41 +00:00
fros4943
aae4b54c68
bugfix: mspsim cycle counter was cast to int, limiting maximum simulation time
2008-12-04 13:14:34 +00:00
fros4943
cdd2d9daa5
synchronizing pending bytes vector
2008-12-04 13:09:27 +00:00
fros4943
5e6b02d1b9
ok
2008-12-04 13:08:55 +00:00
fros4943
3893969096
check that simulation is running before joining sim thread
2008-12-04 13:04:26 +00:00
fros4943
dafd174e30
renamed button "Step millisecond"
2008-12-04 12:46:42 +00:00
fros4943
1a7c791a93
reimplemented single tick method
2008-12-04 12:44:02 +00:00
fros4943
609ae94b14
only notify tick observers when simulation time changes, not for every handled event
2008-12-03 16:37:06 +00:00
fros4943
b55b825a60
including test log in test report
2008-12-03 16:25:17 +00:00
fros4943
0083cc2080
using timeout event instead of slower tick observer
2008-12-03 16:23:26 +00:00
fros4943
c6d6bb4a14
removed warning when not starting visualizer plugin in tests
2008-12-03 16:06:33 +00:00
fros4943
9213ea747d
updated mspsim:
...
with serial data callback and (experimental) bad memory access checks
2008-12-03 15:44:50 +00:00
fros4943
7767b03bae
parsing currently used exception for bad memory access by MSPSim
2008-12-03 15:38:01 +00:00
fros4943
d8b0705cb3
mspsim should warn at bad memory access (not activated yet)
2008-12-03 15:36:49 +00:00
fros4943
430333b515
using updated messagelist
2008-12-03 15:18:47 +00:00
fros4943
1117ce1be8
store messages outside model to avoid event thread problems
2008-12-03 15:17:56 +00:00
fros4943
87ebab7113
modified test to fail if any single node successfully delivers 20 sensor data packets, before all other nodes has delivered 5 packets
2008-12-03 14:19:41 +00:00
fros4943
ace83513e8
empty USART stateChanged handler
2008-12-03 13:13:07 +00:00
fros4943
2d7238e775
uIP IP address interface (reading from uip_hostaddr)
2008-12-03 13:11:20 +00:00
fros4943
8c4d5b51f9
using state changed callback for more accurate incoming serial data throughput
2008-12-03 13:04:21 +00:00
nifi
e86b63112a
changed to use MSPSim from tools/mspsim
2008-12-03 09:55:26 +00:00
fros4943
9bde9cedae
updated test script for new sky serial output format (without new line)
2008-11-27 09:00:57 +00:00
fros4943
4a546a3529
automatically stop simulation when script finishes test
2008-11-27 08:51:35 +00:00
adamdunkels
cf3a889cb5
Added INF files to Raven binary package
2008-11-26 19:49:44 +00:00
nifi
9d36fb106e
added command line history
2008-11-26 16:23:43 +00:00
nifi
2013c4fece
Simulator for MSP430-based platforms
2008-11-24 11:09:36 +00:00
fros4943
3b8f6af71c
use system look and feel instead of cross platform if nimbus fails (contributed by David Gustafsson)
2008-11-21 13:09:53 +00:00
fros4943
f9152668e8
Added multithreading test:
...
Single Sky node running examples/multi-threading/multi-threading.c. Waits until both threads have counted up and down 5 times.
2008-11-21 12:02:29 +00:00
fros4943
daec791521
function should return void
2008-11-20 17:04:34 +00:00
fros4943
42c3b0fc19
towards adding support for 64-bit architectures: registering relative memory addresses with contiki instead of fetching absolute addresses to java
2008-11-20 16:34:45 +00:00
fros4943
11fa5a9a6b
towards adding support for 64-bit architectures: registering relative memory addresses with contiki instead of fetching absolute addresses to java
2008-11-20 16:22:28 +00:00
c_oflynn
8bae6890a8
Changes by "David Kopf" <dak664@embarqmail.com> to:
...
-Add hit counter to index.html
-Adding link to favicon.png
-Fix serving of binary (image) files in avr-makefsdata file
Changes by Colin O'Flynn:
-Removed extra linebreak in tutorial-raven.txt
-Fix to contiki-conf.h in avr-rcb platform
2008-11-18 22:03:12 +00:00
fros4943
62854151d7
more extensive rime abc testing:
...
less than perfect radio environment (95%) + each node receives 30 radio messages each
2008-11-11 15:17:44 +00:00
fros4943
06a8b5d7d6
added Rime reliable unicast test.
...
uses examples/rime/example-runicast.c
2008-11-11 15:00:43 +00:00
fros4943
93b32243d0
bugfix: regexps were too restrictive to correctly parse all Contiki processes
...
thanks to Fetahi Wuhib for pointing this out
2008-11-11 11:47:15 +00:00
fros4943
bcb0efab77
added rime rucb test
2008-11-11 11:30:02 +00:00
fros4943
94b06b4617
added sky shell basic commands test.
2008-11-11 10:35:26 +00:00
fros4943
875be00548
using the new methods for reporting test ok/failed.
2008-11-11 10:07:24 +00:00
adamdunkels
629963a6ba
Bugfix: the directory filename was wrong
2008-11-10 21:08:01 +00:00
nifi
fe1aa4d54c
changed file history to not add same file twice and increase history size to 10 entries
2008-11-10 14:59:03 +00:00
c_oflynn
29d164db3f
Added makefs script for AVR
2008-11-07 19:58:19 +00:00
adamdunkels
1ddc7443e8
Cleaned up the release compilation process by moving the targets for the binary packages into separate makefiles
2008-11-06 08:46:35 +00:00
fros4943
ab388c2068
added sky collect test
2008-11-05 19:22:18 +00:00
fros4943
773ebbc866
using new testOK() method
2008-11-05 18:20:30 +00:00
fros4943
c42af73101
same class description as GUI-version
2008-11-05 18:18:16 +00:00
fros4943
8cd7d7c981
updated example script with new testOK() methods + better explanations
2008-11-05 18:17:45 +00:00
fros4943
18bb997761
added testOK and testFailed methods accessible from test scripts
2008-11-05 18:16:56 +00:00
fros4943
c46bb21f5e
compile from separate thread, not edt
2008-11-04 17:37:09 +00:00
fros4943
3320f8cb35
add messages directly, scroll list later
2008-11-04 17:33:42 +00:00
adamdunkels
bd2c039dc6
Test that checks if the Contiki shell compiles and runs on the Tmote Sky
2008-11-04 15:17:31 +00:00
adamdunkels
ce338125d7
'OK (Saves)' button -> 'Save'
2008-11-04 15:01:08 +00:00
fros4943
553b576e98
introduced wrapper class for executing swing code in event dispatcher thread.
...
not used by all parts of the code yet
2008-11-04 14:32:32 +00:00
fros4943
118aa4cd4e
changed default lang to english
2008-11-04 09:27:23 +00:00
fros4943
4a7f8d3075
disabled choice of communication protocols
2008-11-03 18:32:22 +00:00
fros4943
488e5dab37
minor fixes + added experimental debugging function: run until function returns
2008-11-03 18:11:44 +00:00
fros4943
730917f846
remember look and feel background color
2008-11-03 18:10:52 +00:00
fros4943
066085a174
click on breakpoint to open source file
2008-11-03 18:10:34 +00:00
fros4943
6ba2594d50
consistent labelling
2008-11-03 18:10:13 +00:00
fros4943
ac4f2544b8
registering tick events when simulation starts running
2008-11-03 18:09:43 +00:00
fros4943
b14dddcb3d
with target specific extensions (.sky)
2008-11-03 14:40:51 +00:00
fros4943
6095919463
Cooja crosslevel communication test:
...
tests radio communication between emulated nodes (ESB + Sky) and Cooja Contiki nodes
2008-11-03 14:05:30 +00:00
fros4943
2df1f699aa
using target extensions (.sky/.esb) instead of generic .firmware
2008-11-03 13:18:28 +00:00
fros4943
3fa37e21ac
more error checking + compile default choice
2008-11-03 12:45:52 +00:00
fros4943
3c7565dd68
allow radio to flush before feeding with packet data
2008-11-03 12:31:33 +00:00
fros4943
a7a87386b5
misspelled method
2008-11-03 10:33:15 +00:00
adamdunkels
e0b821e448
Made it easier to package the current CVS (the HEAD tag). Added package for the AVR Raven uIPv6 files.
2008-10-30 21:29:21 +00:00
fros4943
4a494eebb5
updated mspsim jar
2008-10-29 18:39:00 +00:00
fros4943
8668f69077
using cc2420 packet converter for conversions between cc2420 and cooja
2008-10-29 18:38:26 +00:00
fros4943
6e792ff766
removed old sky packet radio
2008-10-29 18:28:28 +00:00
fros4943
6ae7fc99a1
packet converter with x-mac and crc support
2008-10-29 18:28:16 +00:00
fros4943
d6fff91861
added tostring method
2008-10-29 18:23:04 +00:00
fros4943
fdcfbd0e62
bugfix: source file got lost when reloading msp motes
2008-10-29 16:36:33 +00:00
fros4943
0967158d86
bugfix: initializing contiki array with wrong number
2008-10-29 15:55:46 +00:00
fros4943
a95fb2edbd
storing screen device
2008-10-29 13:31:02 +00:00
fros4943
8b3cc86d36
forcing vertical scrollbar
2008-10-29 11:47:50 +00:00
fros4943
9c0d65ae1c
using new nimbus look and feel by default
2008-10-29 10:39:04 +00:00
fros4943
3523f4a0c8
increased label height
2008-10-29 10:36:58 +00:00
fros4943
eb08babd4c
using time events for following up on ongoing transmissions
2008-10-29 09:13:12 +00:00
fros4943
5d7ed0eab2
using events to write serial data to mote
2008-10-29 08:51:09 +00:00
fros4943
d23978318f
added getDrift method
2008-10-29 08:37:42 +00:00
fros4943
2a2be77707
implemented getDrift method
2008-10-29 08:36:12 +00:00
fros4943
cb790a62e3
scheduling events for persistent IDs instead of polling: more efficient
2008-10-29 08:35:38 +00:00
fros4943
9faae40d7c
new interface format without passive/active
...
+ energy method renamed
2008-10-28 17:02:58 +00:00
fros4943
3ee86789e2
new interface format without passive/active
2008-10-28 17:02:13 +00:00
fros4943
0ccb368fba
checking that mote interface class was actually loaded
2008-10-28 17:01:15 +00:00
fros4943
5d90dcdd11
created build file for experimental gdb mote debugger
2008-10-28 17:00:20 +00:00
fros4943
0d7f5468cb
removed old uAODV code
2008-10-28 16:57:08 +00:00
fros4943
efca8688fd
created visualizer example
2008-10-28 16:56:59 +00:00
fros4943
a1a99673f2
updated example radio medium
2008-10-28 16:36:48 +00:00
fros4943
59ed193e58
updated example plugin
2008-10-28 16:22:35 +00:00
fros4943
9e928313cb
removed old project example directory for adding Contiki processes - obsolete method
2008-10-28 16:18:35 +00:00
fros4943
1d7efba71a
updated example interface
2008-10-28 16:09:52 +00:00
fros4943
ee655cf8c4
using new energy interface
2008-10-28 15:36:25 +00:00
fros4943
6e9e29f758
removed passive mote interface
2008-10-28 15:32:23 +00:00
fros4943
b262d5bfce
minor bug fix: storing observer at correct panel
2008-10-28 15:31:51 +00:00
fros4943
b33c7f49af
removed run until button
2008-10-28 15:31:08 +00:00
fros4943
a0bf017e2f
removed passive/active interfaces notion.
2008-10-28 14:09:25 +00:00
fros4943
e7c064801e
removed passive/active interfaces notion.
...
+ fixed scrollbar
2008-10-28 13:59:35 +00:00
fros4943
bbf88f3723
removed passive/active interfaces notion.
2008-10-28 13:38:55 +00:00
fros4943
4231e5f41a
renamed schedule event method
2008-10-28 13:37:11 +00:00
fros4943
0c34a1f000
removed tick time
2008-10-28 13:36:26 +00:00
fros4943
456ef03dc1
removed tick lists and variable tick times
...
handling tick events in simulation loop: moving towards fully event based (as opposed to tick based)
2008-10-28 13:35:59 +00:00
fros4943
5c2d5940ed
new energy method: collecting total energy consumption from each interface
2008-10-28 13:28:35 +00:00
fros4943
237de606b1
removed tick lists and tick time functionality
2008-10-28 12:58:32 +00:00
fros4943
41a74cd9a9
new energy method, not fully implemented yet
2008-10-28 12:55:20 +00:00
fros4943
bbeed74eda
Cooja event queue. Ported from MSPSim
2008-10-28 12:52:24 +00:00
fros4943
37554001d3
Cooja time event. Ported from MSPSim
2008-10-28 12:51:22 +00:00
fros4943
a45f451dcf
removed passive/active interfaces notion.
...
also, new energy estimation method
2008-10-28 12:50:38 +00:00
fros4943
1de0d38ccb
interface handler support for new interface polling format
2008-10-28 12:40:35 +00:00
fros4943
7e864bd3c7
updated interfaces to new polling format.
2008-10-28 12:30:48 +00:00
fros4943
5650f8ba89
implemented by mote interfaces to determine when they should be polled
2008-10-28 12:09:14 +00:00
fros4943
31e2c88a66
passive/active interfaces distinction removed.
2008-10-28 12:05:30 +00:00
fros4943
f35eeb575d
rewriting mote interfaces for faster simulation execution.
...
vibration sensor interface
2008-10-28 12:02:35 +00:00
fros4943
db2c5d3a12
rewriting mote interfaces for faster simulation execution.
...
rs232 interface
2008-10-28 11:59:23 +00:00
fros4943
bee9a6d9ac
rewriting mote interfaces for faster simulation execution.
...
radio interface
2008-10-28 11:49:00 +00:00
fros4943
ddcd54d24a
rewriting mote interfaces for faster simulation execution.
...
PIR interface
2008-10-28 11:16:37 +00:00
fros4943
24308b8915
rewriting mote interfaces for faster simulation execution.
...
node id interface
2008-10-28 11:11:52 +00:00
fros4943
86c3ea9bc8
rewriting mote interfaces for faster simulation execution.
...
log interface
2008-10-28 10:28:38 +00:00
fros4943
960f32f3d4
rewriting mote interfaces for faster simulation execution.
...
LEDs interface
2008-10-28 10:21:37 +00:00
fros4943
892ed6f316
rewriting mote interfaces for faster simulation execution.
...
ipv4 interface
2008-10-28 10:12:43 +00:00
fros4943
ae80b1a585
rewriting mote interfaces for faster simulation execution.
...
clock interface
2008-10-28 09:57:48 +00:00
fros4943
f9d2581e06
rewriting mote interfaces for faster simulation execution.
...
cfs interface
2008-10-28 09:53:23 +00:00
fros4943
ed9063719f
rewriting mote interfaces for faster simulation execution.
...
button interface
2008-10-28 09:42:26 +00:00
fros4943
eb7e75c851
rewriting mote interfaces for faster simulation execution.
...
beeper interface
2008-10-28 09:33:00 +00:00
joxe
545eaedee4
updated mspsim with some new bugfixes - but still some problems with CC2420 and LPL
2008-10-27 07:34:41 +00:00
nifi
8134af742c
updated for new Radio API
2008-10-15 09:00:52 +00:00
nifi
69b73246b9
refactored MSPMote setup + added plugin to access MSPSim CLI
2008-10-13 14:50:50 +00:00
joxe
37214513d6
improved cc2420 support
2008-10-09 11:13:00 +00:00
joxe
9646fa0a01
fixed new byte based radio model for MSPSim based Sky node
2008-10-09 11:11:30 +00:00
joxe
626638d8b8
bugfix for the TinyOS node id support
2008-10-09 09:41:27 +00:00
fros4943
6011abbb79
removed unused currentSimTime + fixed bug when nodes are added during simulations
2008-10-07 16:49:21 +00:00
fros4943
11a084f8df
mspsim with fifop bugfix (setting fifop false when radio is reconfigured)
2008-10-07 15:01:46 +00:00
fros4943
526a5ae497
new mspsim jar with some cc2420 fixes
2008-10-07 11:53:40 +00:00
fros4943
3bae1a2b59
persistent node ID defaults to true
...
+ removed some debugging output
2008-10-07 08:21:05 +00:00
fros4943
e473939ebf
support for node IDs in variables node_id, TOS_NODE_ID or none
2008-10-07 08:18:54 +00:00
fros4943
b8d8474668
mspsim 0.94
2008-10-06 14:03:52 +00:00
fros4943
87cdcfc4da
using Contiki's regular hello-world application in test (examples/hello-world), instead of Cooja's test application
2008-10-05 17:11:54 +00:00
fros4943
3f5daef8bc
compiler should not replace printfs with puts
2008-10-05 15:50:20 +00:00
fros4943
3a26f02fb2
removing debug output
2008-10-05 15:49:10 +00:00
fros4943
74dcd17875
print compilation error stream if not visualized
2008-10-03 15:43:44 +00:00
fros4943
2a2b764ee6
updated some references to old getLastLogMessages()
2008-10-03 15:18:48 +00:00
fros4943
66e361058a
fix: local firmware file variable defined when compilation starts
2008-10-03 15:08:17 +00:00
fros4943
43d97043a7
added clean option
2008-10-03 15:02:21 +00:00
fros4943
e26d2b596f
if newly started plugin has not specified a location/size, use defaults
2008-10-03 14:31:32 +00:00
