deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
8795 commits 6 branches 13 tags 80 MiB
Commit graph

2140 commits

Author SHA1 Message Date
fros4943 bd81fb29fe minor bug fixes + support for panning with alt+mouse + two new experimental features: log execution details and active radio channels 2010-08-13 10:23:20 +00:00
fros4943 f45e5fbd6b notify observers when radio channel changes 2010-08-13 10:20:07 +00:00
fros4943 982415c506 minor bug fix: address may be null 2010-08-13 10:19:20 +00:00
fros4943 3deb4408df implementing getExecutionDetails() by returning a stack trace 2010-08-13 10:18:54 +00:00
fros4943 fb2966fe3f updated mspsim.jar with channel listener support 2010-08-13 10:17:57 +00:00
fros4943 494d61b166 time focus on space key 2010-08-13 10:03:58 +00:00
fros4943 733664e8c2 mote-specific coloring bug fix + time focus on all active plugins 2010-08-13 10:03:12 +00:00
fros4943 797896d152 new method getExecutionDetails() 2010-08-13 09:59:41 +00:00
fros4943 bcc62fbb65 no error dialog for mspsim breakpoints 2010-08-13 09:53:33 +00:00
oliverschmidt 46b83d6ba4 Included Breadbox64 into cc65 binary relaease tools. 
This additional application results in three disks for the Apple2, two disks for the C64 and one disk for the C128. Therefore the download page can't get along anymore without some JavaScript adjusting the number of downloadable disks depending on the selected machine. With JavaScript turned off access to non-existent disks (i.e. disk 3 for the C64) results in a successfull download of a zero byte sized file - not exactly great but at least a defined behaviour.
 2010-08-05 22:50:19 +00:00
dak664 52ff852aa8 Add optional time stamps, delays, and verbosity levels 2010-07-30 20:44:24 +00:00
fros4943 3fc00a8bed minor fix to allow adding mote interfaces from configuration 2010-07-05 16:48:55 +00:00
fros4943 7712b7e1ed fixed nogui-argument 2010-07-01 11:14:00 +00:00
adamdunkels 5dc55f0a1b A quick and dirty service registry daemon hack. The servreg-hack 
allows a program to register an 8-bit service ID that gets
disseminated to the entire network, as long as a servreg-hack daemon
is running on all neighbors. Other nodes can look up the service ID to
figure out what nodes in the network offer this service.

This is officially labeled as a "hack" so that we don't get too comfy
with it; this hack is not the future of service discovery and
advertisement in Contiki.
 2010-06-15 19:00:28 +00:00
adamdunkels 3fa8ffda1a Moved the modules packetbuf, queuebuf, and packetqueue from net/rime to net/, since they are not Rime-specific 2010-06-14 19:19:16 +00:00
fros4943 53e150f240 bugfix: autofiltered data did not always trigger serial port event 2010-06-11 14:12:09 +00:00
fros4943 f3f6a0de24 minor fixes: using split pane, bugfix with canonical paths, added remove button 2010-06-11 09:12:21 +00:00
fros4943 b540408add added argument for disallowing config relative paths 2010-06-11 09:10:52 +00:00
nifi 351325b7f4 minor cleanup of example (changed to use uiplib to parse IPv6 address) 2010-06-01 13:31:23 +00:00
nvt-se ef16508613 Fixed problems with boot order and short timeouts in the UDP tests. 2010-06-01 12:23:24 +00:00
joxe 8e619e991d added support for sending link prefix to RPL border router 2010-05-25 19:05:31 +00:00
joxe 0d3c7edd6c fixed for new uip_buf 2010-05-24 11:10:51 +00:00
fros4943 2f64d4b3ab minor addition: sort motes by distance 2010-05-21 08:46:44 +00:00
adamdunkels 052c536db7 Remove the unicast mass-send test since the default number of queuebufs cannot handle 20 concurrent packets 2010-05-20 20:56:36 +00:00
fros4943 106bcc3c66 disable tree icons icon at errors 2010-05-19 17:52:23 +00:00
fros4943 83a1819992 fix: default icons are not always available 2010-05-19 17:38:46 +00:00
fros4943 b229e9aa59 rewrote project dialog, for easier import and management of cooja projects 2010-05-19 17:32:53 +00:00
nifi 16a3f710a4 Minor optimization: only lookup data when needed 2010-05-19 12:58:15 +00:00
fros4943 d6d84a1baa Added support for attribute colors, as introduced by the VisualHints Contiki project by Joris Borms. 
Example usage in Contiki:
printf("#A myattr=123;RED\n"); // color myattr attribute
printf("#A color=RED\n"); // color mote

For more examples, see the MoteAttribute documentation.
 2010-05-17 14:32:30 +00:00
fros4943 89c2c0c2c4 updated documentation examples 2010-05-17 14:21:51 +00:00
fros4943 5a3a938d1b added mote attribute visualizer skin: prints mote attributes below each mote 2010-05-17 11:44:16 +00:00
fros4943 e7b0902799 attribute summary method made public 2010-05-17 11:41:22 +00:00
fros4943 66657d9980 updated mspsim.jar that allows reading the current cpu speed 2010-05-17 09:57:31 +00:00
fros4943 8d7f9e2d72 plugin cleanup: removed list of mote interfaces, instead providing links to useful mote plugins 2010-05-17 09:30:27 +00:00
fros4943 f237e16d71 added stub for reading current cpu frequency of emulated motes 2010-05-17 09:29:28 +00:00
nifi 2bfeb01dcd Replaced borders with separator for a more compact view 2010-05-09 22:50:34 +00:00
joxe ffdda2259f made COOJA avoid guessing that the debug printouts are TinyOS if many SLIP chars in stream 2010-05-09 19:45:57 +00:00
nifi 99b2dd8ef7 Added option to connect to server instead of serial port 2010-05-07 12:22:41 +00:00
nifi d34f278256 jcreate now has its own platform 2010-05-04 10:38:55 +00:00
nvt-se 35282593c0 Updated the test information messages. 2010-05-03 14:56:13 +00:00
nvt-se c50e4ab4f3 Switched to examples/udp-ipv6 as the code for the test 2010-05-03 14:48:47 +00:00
fros4943 be5656ec2e set cooja mote random seed depending on simulation random seed 2010-05-02 09:42:52 +00:00
nvt-se 528614e89f Converted the test to examples/udp-ipv6 2010-04-30 22:16:51 +00:00
nvt-se 15f84a93fa Converted the test to use examples/udp-ipv6 2010-04-30 16:20:42 +00:00
nvt-se 66d99e00ec Removed obsolete test for the rimeroute module 2010-04-30 16:04:23 +00:00
fros4943 dc25860caa added option for mote-specific background coloring in log listener 2010-04-28 09:39:26 +00:00
fros4943 f4976f8800 test info minor fix 2010-04-27 07:15:33 +00:00
fros4943 dcc949e9ba set serial socket project to default cooja project 2010-04-26 08:21:01 +00:00
fros4943 87dd04fbd8 compiling serial socket project per default 2010-04-26 08:20:11 +00:00
fros4943 c2876b2d25 minor fix: save iconified plugins 2010-04-26 08:19:32 +00:00
fros4943 a430573688 restructured focus menu items, removed debugging output 2010-04-26 08:05:31 +00:00
fros4943 c7ef068f33 improved zoom 2010-04-26 08:00:19 +00:00
joxe 9f00170c59 made tunslip6 take an argument for TAP/TUN 2010-04-16 12:39:46 +00:00
nifi 6d9f904627 Minor cleanup of the radio logger output (packet description). 2010-04-06 23:38:18 +00:00
adamdunkels d9d3f7b6b5 Bugfix: don't send packets if they are shorter than the link layer header length 2010-04-05 21:05:56 +00:00
adamdunkels 5af47a2f0c Latest SVN version of MSPsim 2010-04-04 12:31:05 +00:00
joxe 3a286c4f93 improved tunslip6 with support for debug printouts and configuration of IPv6 address 2010-04-02 18:17:20 +00:00
joxe df4247f0c6 slightly improved timing on CCA/RSSI in the CC2420 emulation 2010-04-01 18:15:05 +00:00
fros4943 2595d31367 updated collect test: bigger network (50), more hops, bugfixed duplicate detection 2010-04-01 12:22:39 +00:00
joxe 02dc04cc6a improved CC2420 emulation 2010-03-31 20:11:03 +00:00
fros4943 70ab82761b test now also includes multi-hop pinging (uip_over_mesh), up to 4 hops 2010-03-31 09:35:01 +00:00
oliverschmidt 8dd2b75383 Explicitly set CBM filetypes (PRG, USR). 2010-03-31 06:05:37 +00:00
fros4943 bb7944a201 workaround to survive the bad characters that are sometimes printed by mspsim-based motes + make clean before compilation 2010-03-29 14:14:09 +00:00
fros4943 6460bc1214 old compilation flag WITH_NULLMAC=1 was replaced by netstack's nullmac_driver and nullrdc_Driver 2010-03-29 13:00:15 +00:00
fros4943 f228272cfc test update: contiki shell prompt was changed 2010-03-29 10:52:22 +00:00
fros4943 d84f84de52 bugfix: using MspMoteTimeEvent:s to ensure that MSPSim's internal clock is correct when button is clicked 2010-03-29 10:18:14 +00:00
fros4943 9316b31d9a shell command 'ps' was removed from sky-shell.c, instead using 'echo' in test 2010-03-29 09:20:47 +00:00
fros4943 90f174509b removed previous workaround for already fixed bug in CC2420 CRC 2010-03-26 13:33:40 +00:00
fros4943 ce5d19fefd moved elf loading and debugging info to the mote type, rather than keeping a separate refence in each mote. this patch reduces both the memory usage of MSPSim-based motes, and the processing time to load them 2010-03-26 12:29:11 +00:00
nifi e6a8ba41fd Added consumer thread timeout 2010-03-26 10:11:50 +00:00
fros4943 9a32ec8a31 using update aggregator to avoid event queue flooding in fast simulations, restructured copy to clipboard popup menu 2010-03-26 09:29:04 +00:00
fros4943 c6c0b1b486 help class that simplifies effective handling of high rate events, that otherwise might flood the event queue 2010-03-26 09:27:58 +00:00
fros4943 96979b5fbf lower simulation thread priority, added timeout on blocking stop simulation method 2010-03-26 09:26:22 +00:00
fros4943 e4c3ac8125 synchronizing access to log list 2010-03-26 09:12:20 +00:00
joxe 1f4ced16eb fixed ack with DSN CC2420 and improved timer capture 2010-03-25 16:32:00 +00:00
fros4943 20d9f70b09 plugin is updated to support non-visualized simulations 2010-03-25 08:00:15 +00:00
nifi 81dbcf1654 Added option to move motes in Visualizer without confirm dialog by dragging motes with ALT button pressed 2010-03-24 14:22:56 +00:00
fros4943 78069e8853 minor fix: section size was printed in hex, not decimal 2010-03-24 12:29:33 +00:00
nifi 75481f6460 Removed debug output 2010-03-23 12:05:36 +00:00
adamdunkels 8f7e96b06f Tools for parsing and plotting a power trace from Contiki 2010-03-19 22:01:34 +00:00
fros4943 f2a1604b63 make portable paths method public 2010-03-19 15:04:51 +00:00
fros4943 54db259c32 using EXPORT attribute to automatically copy firmware files in executable JARs 2010-03-19 15:04:05 +00:00
fros4943 4498c39e9e removed debugging output 2010-03-19 15:03:14 +00:00
fros4943 e83635832a added simconfig attribute EXPORT that determines how files should be handled when a simulation is exported as an executable JAR 2010-03-19 15:02:26 +00:00
nifi cba5256ca2 updated to use uip-ds6 2010-03-19 12:58:17 +00:00
fros4943 ae122627de export project config to allow project plugins to be run from executable jars 2010-03-19 12:34:37 +00:00
fros4943 c71b5b60d0 minor bugfix: cause may be null 2010-03-19 12:34:03 +00:00
fros4943 aa41f9218a loading user settings before generating executable jar, added debugging output 2010-03-19 11:32:59 +00:00
fros4943 c5c6c3b775 return success (0) after exporting jar, use portable firmware paths in exported config 2010-03-19 09:08:38 +00:00
fros4943 09446c0ee7 added export-jar target, updated help 2010-03-19 08:57:04 +00:00
nifi ef5a4a6ad7 only add separator if there is more data 2010-03-17 22:44:20 +00:00
nifi 0a579e0c6a Bug fix: only continue to analyze packet data when ANALYSIS_OK_CONTINUE is returned from previous analyzer. 2010-03-17 14:16:13 +00:00
nifi 60ea81297a Removed the IPHC flags from the brief packet description (the flags are shown in the verbose description) 2010-03-16 13:10:50 +00:00
fros4943 79f4dd467e added maximum log message size (1024 bytes) to avoid buffering up on binary serial output 2010-03-15 22:04:26 +00:00
fros4943 2f20d6b108 fixed cc2420's received signal strength indicator to be an average of the last 8 symbols (192us) 2010-03-15 19:22:03 +00:00
fros4943 573e772a32 removed contiki cooja template source, updated configurations 2010-03-15 11:04:37 +00:00
fros4943 ace6cff93f do not generate source + prepare environment method was updated 2010-03-15 11:04:06 +00:00
fros4943 99fe1faa0a updated mspsim.jar with improved sht11 support 2010-03-15 08:06:12 +00:00
fros4943 4fa88d2bfd added method for getting mote interfaces based on class names + getInterfaces() returns a collection instead of a vector 2010-03-14 19:50:34 +00:00
fros4943 4710441bb6 added temperature mote interface for sky motes 2010-03-14 19:45:04 +00:00
fros4943 5877528f3a added possibility to add radio logger analyzers from cooja projects 2010-03-12 16:02:47 +00:00
joxe efda8edcc5 fixed UDP uncompression 2010-03-12 14:23:40 +00:00
fros4943 ef35fe6e6e added experimental visualizer skin that shows the current source code of each mote in the simulation (for emulated mspmotes only) 2010-03-11 22:15:58 +00:00
fros4943 87733c176a added notes plugin, useful for storing simulation notes in the config 2010-03-11 22:11:10 +00:00
fros4943 b422ef90ad updated help 2010-03-10 14:49:47 +00:00
fros4943 9e229a35c4 bugfix: bad jar arguments 2010-03-10 14:47:58 +00:00
fros4943 6b68d2e051 added output jar arguments 2010-03-10 14:39:47 +00:00
fros4943 feb0db0b3e print jar process errors if building archive fails 2010-03-10 14:17:36 +00:00
fros4943 f057939595 delete META-INF directory before building JAR 2010-03-10 13:09:05 +00:00
fros4943 bffd3ca433 warn if JAVA_HOME is not set 2010-03-10 12:48:35 +00:00
fros4943 adf6263b0d updated configs: MAC_DRIVER was replaced by NETSTACK_RDC 2010-03-10 12:34:29 +00:00
fros4943 f9e4ebf7cf updated test configs: the test should normally not specify the network configuration, but rather use the default in the application directory 2010-03-10 12:29:24 +00:00
fros4943 89d7d926c4 added ipv4 and ipv6 default configuration 2010-03-10 12:18:29 +00:00
fros4943 7dd4397f6c bugfix: getSignalStrength() did not return the correct value 2010-03-10 10:11:36 +00:00
fros4943 7c25544cdb added possibility to override the default netstack in contiki-conf.h at compile time, by specifying another header 2010-03-10 07:51:30 +00:00
fros4943 70dd5454fc removed contiki motes' communication stack configuration; the network stack instead depends on compiler flags/contiki-conf.h 2010-03-10 07:49:25 +00:00
joxe 52114b50e3 fixed serial-input bug in MSPSim 2010-03-09 12:16:10 +00:00
nifi c4370676ee Fixed CRC for updated CRC-handling in new MSPSim 2010-03-09 10:37:47 +00:00
fros4943 e3a3b2a845 catch no class exception when registering new plugin 2010-03-09 08:27:48 +00:00
fros4943 5c8b306558 simplified code, netstack init without relying on external net_init() functions 2010-03-09 08:16:05 +00:00
fros4943 07753fb01f updated radio driver, simplified code 2010-03-09 08:11:05 +00:00
fros4943 0cb572bcb6 temporarily disabled communication stacks on cooja platform, removed radio sensor 2010-03-09 08:09:57 +00:00
joxe bde33fa4d7 new version of mspsim.jar - improved CC2420 emulation + bugfix of SFR handling - fixes UART bug 2010-03-08 14:53:42 +00:00
fros4943 df8cc48739 three patches to simplify loading TinyOS firmwares (via MSPSim), contributed by Philipp Sommer 2010-03-08 14:26:12 +00:00
fros4943 03605a568c bugfix: wrapping signal strength updates in separate event, to be executed after the last byte received 2010-03-08 11:29:39 +00:00
joxe c1ce8721d8 added support for icmpv6 analysis / RPL 2010-03-07 20:44:40 +00:00
joxe 577056c452 fixed 6lowpan analyzer 2010-03-07 19:53:07 +00:00
oliverschmidt 8ca206aa6b Changed ETH64 base address from $DE10 to $DE00 as this is the default base address according to the manufacturer. 2010-03-06 13:05:16 +00:00
fros4943 308ecfed2a simple patch to allow application motes to receive serial data 2010-03-05 14:59:43 +00:00
nifi b59845d117 Minor cleanup of radio logger verbose output 2010-03-03 12:45:39 +00:00
fros4943 024d8ff2b5 minor fixes: better statistics output, added zoom level, popup menu labels 2010-03-02 13:33:10 +00:00
fros4943 4c9112a176 enabled debug output again 2010-03-02 13:24:48 +00:00
fros4943 d3b44510f8 make cli method public 2010-03-02 13:22:29 +00:00
adamdunkels 486f7f9728 Rewrite of the Sky shell collect test. The new test is better equipped 
to handle reordered packets - unlike the previous test, the new test
counts all incoming packets in the data stream, even those that are
significantly reordered. The new test also shows the received packets
and their hop counts in a much more readable fashion.
 2010-02-28 08:25:36 +00:00
nifi a373c426f0 Disabled the cross-level conversion of Contiki timestamp (currently not used by Contiki) 2010-02-26 08:15:41 +00:00
nifi 52d234417d Changed to draw the network traffic under the motes 2010-02-26 07:46:26 +00:00
nifi 512da4195c Changed to draw the mote relations under the motes 2010-02-26 07:38:08 +00:00
nifi 74df2dbf43 * Save selected packet analyzer chain and split pane position in simulation file 
* Update all log entries when changing packet analyzer chain
* Added popup menu to verbose pane
* Added serialVersionUID to menu actions to avoid compiler warnings
 2010-02-25 23:44:16 +00:00
joxe 83d203afb5 added support for hc06 decompression in radiologger / analyzer 2010-02-25 22:36:08 +00:00
fros4943 026c4d7e85 synchronize time to timeline and radio logger at space key 2010-02-24 10:45:44 +00:00
fros4943 4c7ca7009b listen to all log interfaces, also mote debug interfaces 2010-02-24 10:38:35 +00:00
fros4943 be76ae53f9 added warning when reloading a simulation with less then 20% memory left 2010-02-23 22:53:34 +00:00
joxe fbc5b20404 added initial 802.15.4 and IPHC/hc06 analyzer 2010-02-23 22:35:17 +00:00
joxe 588d0374fa added initial 802.15.4 packet analyzer to COOJA radio logger 2010-02-23 22:32:57 +00:00
fros4943 cd8047bc77 added method that returns a mote with the given id 2010-02-23 21:55:55 +00:00
adamdunkels 14bc9aa98b New and improved shell collect test: the new test sends out 10 packets from each node and counts the received packets. If less than 10 packets from each node is received, the test fails 2010-02-23 18:46:20 +00:00
fros4943 dbd1cd7b08 show contiki stack trace in error dialog, not just print to console 2010-02-21 21:50:58 +00:00
adamdunkels 51980f0be4 CC2420_CONF_AUTOACK is now defined in contiki-conf.h 2010-02-18 23:03:36 +00:00
joxe 470b93c79f added mote attributes to various types of motes 2010-02-18 11:13:20 +00:00
joxe 19c75b30e0 added the MoteAttributes interface for handling mote printouts of #A x=y 2010-02-18 11:06:37 +00:00
adamdunkels 333c14e734 New version of MSPsim from the MSPsim SVN, with support for CC2420 auto ACKs 2010-02-17 18:51:59 +00:00
oliverschmidt 94153a9508 Adjusted Contiki download page content to the fact that there are now two disk images (apart from the larger D71 image for the C128). 2010-02-14 17:41:05 +00:00
fros4943 66bf4a6063 temporarily disabled experimental mspsim debug interface for upcoming release 2010-02-12 09:34:49 +00:00
fros4943 c56d04e2bb added support for external script file, which currently requires manually editing the .csc 2010-02-12 09:28:28 +00:00
fros4943 f1db103777 added support for multiple log interfaces 2010-02-12 09:25:46 +00:00
oliverschmidt 49e73b71b8 Added new wget app (and some reorg). 2010-02-11 10:13:18 +00:00
fros4943 308df68375 bugfix: only handle log output from our mote + added support for debug log interface 2010-02-10 13:29:27 +00:00
fros4943 6d987651c6 bugfix: previously did not listen to all log interfaces 2010-02-09 22:14:23 +00:00
oliverschmidt 736d49c7f1 Added new DHCP app (and some reorg). 2010-02-08 22:29:26 +00:00
fros4943 8ec88e2fcb added method for turning off radio receiver of application motes 2010-02-08 16:00:46 +00:00
adamdunkels 5efce5eeed The path to the Contiki root was not correctly set 2010-02-06 18:23:04 +00:00
adamdunkels d5e133bf7c Added target for making the tools/ and tools/sky/uip6-bridge 2010-02-06 18:22:34 +00:00
adamdunkels 9011013fb0 Automated test for testing IPv6/6lowpan fragmentation 2010-02-06 09:57:14 +00:00
fros4943 5424b679be removed unused configurations and increased default contiki mote transmission bitrate to 250kbit/s 2010-02-05 09:09:55 +00:00
fros4943 4d7fe46561 removing obsolete method previously used for estimating contiki's energy consumption. 2010-02-05 09:07:58 +00:00
fros4943 cdb1b93dc6 removing obsolete method previously used for estimating contiki's energy consumption + removed encoding overhead and header assumption when calculating transmission durations 2010-02-05 09:07:13 +00:00
fros4943 b9bf06c2a7 decreased default cooja CFS size 2010-02-05 08:59:51 +00:00
fros4943 a32035dc14 removing obsolete method previously used for estimating contiki's energy consumption. 2010-02-05 08:49:18 +00:00
fros4943 b749a560cc removing obsolete method previously used for estimating contiki's energy consumption 2010-02-05 08:44:34 +00:00
fros4943 ef4881e8df removing obsolete method previously used for estimating contiki's energy consumption 2010-02-05 08:24:57 +00:00
nifi e64d9466eb replaced relative path with portable path 2010-02-04 16:03:28 +00:00
nifi 86f6bbf61a Removed obsolete mote class reference in simulation configs 2010-02-04 15:32:41 +00:00
adamdunkels 5e62a0dd20 Bugfix: the cxmac and lpp netperf tests didn't actually run cxmac and lpp 2010-02-04 08:02:09 +00:00
fros4943 dcacabf1ec bugfix: byte were written from both queue and in response to uart state rx flag clearing, which caused byte to be corrupted 2010-02-04 00:30:26 +00:00
fros4943 ddf498a065 write command was removed from sky-shell, which requires a test update 2010-02-04 00:07:18 +00:00
oliverschmidt f5004dca14 Adjusted the offsets of the file 'contiki.cfg' in the disk images. Should be more stable in the future now that the file is the first in all images. 2010-02-04 00:01:59 +00:00
oliverschmidt 26beba31ee Added a (batch-type of) Makefile to create the various disk images making up "6502 Contiki". 2010-02-03 23:52:31 +00:00
oliverschmidt 821d24de4f Added ProDOS 8 system program immediately returning to ProDOS. Thus allows to select between system programs if copied as first system program onto a ProDOS disk. 2010-02-03 23:44:56 +00:00
adamdunkels 83e823959f Reverted previous change of the sky tools path: it was correct before 2010-02-03 22:01:08 +00:00
adamdunkels c06526326c Bugfix in the path to the sky linux tools 2010-02-03 21:55:09 +00:00
adamdunkels 028239e1a3 Added a timeout before the button is pressed, to allow it to initialize 2010-02-03 21:24:24 +00:00
fros4943 a13b6697df explicit make clean before compiling firmwares 2010-02-03 21:16:13 +00:00
adamdunkels 2e7ade836e Wait 1s before pressing the button to give the button sensor time to activate 2010-02-03 20:57:50 +00:00
adamdunkels 3746ffb4f1 Removed the energest-demo from the nightly builds since it is now moved to contikiprojects 2010-02-03 20:43:04 +00:00
fros4943 5d6a073655 bugfix: time event was initialized with null mote 2010-02-03 20:00:29 +00:00
fros4943 b832479e34 wrapping tr1001 custom data byte delivery in MspMoteTimeEvent 2010-02-03 19:30:32 +00:00
fros4943 cb34e9760f wrapping serial byte input in a MspMoteTimeEvent 2010-02-03 19:17:30 +00:00
fros4943 74c003b7d4 wrapping tr1001 byte delivery in MspMoteTimeEvent:s, to avoid scheduling problems when emulated mote is in lpm 2010-02-03 19:15:56 +00:00
fros4943 510eb54494 wrapping cc2420 byte delivery in MspMoteTimeEvent:s, to avoid scheduling problems when emulated mote is in lpm 2010-02-03 19:15:15 +00:00
fros4943 31b9369dff mspsim-specific time event that explicitly forces mspsim to synchronize its internal time to the current cooja time 2010-02-03 19:10:36 +00:00
fros4943 3786f2f5fb introduced execute method with duration argument 2010-02-03 19:08:40 +00:00
adamdunkels b3e0a2506f Turned off CC2420 auto ack for the bridge 2010-02-03 16:48:54 +00:00
fros4943 a9e358eb9e convert paths when saving configuration 2010-02-03 16:26:36 +00:00
fros4943 4776328731 fixed paths 2010-02-03 16:25:31 +00:00
fros4943 8f6026a92f javadoc update 2010-02-03 16:06:04 +00:00
fros4943 0286e4115f removed obsolete tick method 2010-02-03 16:04:44 +00:00
fros4943 182805a65d title bug fix: mote may have several log interfaces 2010-02-03 15:55:50 +00:00
fros4943 778c14e9e3 javadoc update 2010-02-03 15:49:24 +00:00
fros4943 3aeaf86b1a added a method for pausing the simulation that doesn't block 2010-02-03 15:33:36 +00:00
fros4943 a15f424753 added application-level mote (/tools/cooja/examples/appmote_rimeabc) to cross-level test 2010-02-03 15:22:58 +00:00
fros4943 6032f6508f using application serial port 2010-02-03 15:11:48 +00:00
fros4943 3836b3e2e5 added simple serial port to be used by application motes 2010-02-03 15:11:28 +00:00
fros4943 0845bf18d7 printing on serial port instead of System.out 2010-02-03 15:10:55 +00:00
fros4943 1246174525 compile with nullmac + require all nodes to receive at least 3 messages before test ok 2010-02-03 14:14:57 +00:00
fros4943 36ab835973 + calculates CRC for incoming packets (from cooja to cc2420). not yet checking outgoing packets for correct CRC 2010-02-03 14:07:45 +00:00
nifi 01502926d0 Better handling of cross-level radio packet. Minor code cleanup. 2010-02-03 13:47:33 +00:00
fros4943 e207f89307 added inter-byte delay for delivering cross-level packet bytes (250kbit/s) 2010-02-03 12:37:34 +00:00
fros4943 83fc001abd show error dialog at simulation exception 2010-02-03 12:15:37 +00:00
fros4943 7025402510 removed unnecessary call to initEmulator (already called when the mote is first created) 2010-02-03 11:06:23 +00:00
fros4943 d8c32de4db minor fix: avoid too wide dialog by printing each project on a separate line 2010-02-03 10:19:58 +00:00
fros4943 fd2a377666 avoid exception if rime address does not exist + removed obsolete methods 2010-02-03 10:14:46 +00:00
fros4943 1965dcf754 fixed misspelling 2010-02-03 09:58:07 +00:00
fros4943 1e203e1b77 updated plugin example to also save and restore configuration 2010-02-03 09:54:54 +00:00
fros4943 26e15fe4f1 added shortcut for logging to any file directly from test scripts 2010-02-03 09:32:25 +00:00
fros4943 8e11e600ec hide exceptions if table input parsing fails 2010-02-03 09:30:38 +00:00
fros4943 50f09d7f85 removed warning for unrecognized configuration elements 2010-02-03 09:28:55 +00:00
fros4943 9b7706bc8f removed obsolete energy consumption references + updated doc 2010-02-03 09:27:24 +00:00
fros4943 07e0eee1f7 application-level mote that imitates the behavior of Rime's anonymous broadcast example in /examples/rime/example-abc. 2010-02-03 09:25:52 +00:00
adamdunkels b0db9cc588 Print informative message if radvd could not be restarted (instead of failing) 2010-02-01 11:54:07 +00:00
adamdunkels 6fd46e0582 Nightly tests for LPP and CXMAC duty cycling protocols 2010-01-31 20:29:56 +00:00
adamdunkels fcd50868aa Moved the TIMEOUT() definition until after the print_stats() definition so that the print_stats() function can be called when the TIMEOUT() is invoked 2010-01-31 19:18:26 +00:00
adamdunkels da3a7ffbd8 Increase uIP buffer size for the bridge to accomodate for the Ethernet headers from the PC host 2010-01-28 13:49:24 +00:00
fros4943 440ffae2a0 new project: adds two new plugins for forwarding data between a socket and a simulated serial port 2010-01-27 14:28:26 +00:00
fros4943 31b9cf0ce4 patch for avoiding snprintf()-related compiler error 2010-01-27 12:54:31 +00:00
fros4943 15dd2bd88a removed debug tooltip 2010-01-25 07:49:42 +00:00
joxe 940a2903f2 fixed interference in app radio 2010-01-24 23:16:17 +00:00
joxe c0e7eb21bc added LED to application motes 2010-01-24 22:24:36 +00:00
nifi 115ee7b936 Changed mote creation to always be done by the MoteType (allows application motes to be loaded with the right class loader) 2010-01-24 20:10:57 +00:00
nifi 7922108cbd added support for multi-class application motes 2010-01-24 20:06:16 +00:00
joxe 123c612614 only deliver packets that are not null to app mote 2010-01-23 11:26:32 +00:00
fros4943 057750b109 test update: corrected write newlines, increased initial wait before issuing the first sendcmd() 2010-01-22 17:09:07 +00:00
fros4943 7c924089da improved test: reading files with blocksize 13, verifying the complete file30.txt output, no newlines when writing mote commands 2010-01-22 16:57:56 +00:00
fros4943 8f296ac2fb updated test: testing ESB<->Sky comm + improved test output 2010-01-22 13:56:42 +00:00
fros4943 de93c85292 increased esb helloworld test timeout 2010-01-22 13:12:31 +00:00
fros4943 bdda5f1c29 bugfix: rescheduling mspsim-based after breakpoint stops simulation + disabled automatic CLI "trace" at exceptions 2010-01-21 22:32:32 +00:00
fros4943 fa5f1f73ab avoid java expection when debug pointer doesn't exist 2010-01-21 18:02:54 +00:00
fros4943 633405a73c experimental debugging output interface for mspsim-based motes 2010-01-21 17:43:59 +00:00
fros4943 83be7a9fe0 updated default mac os x compiler configuration 2010-01-20 17:01:50 +00:00
fros4943 5470cb5bc3 + script also includes the common data section 
contributed by Lars Rasmusson @ SICS
 2010-01-20 16:38:55 +00:00
fros4943 41142c4836 ContikiMoteType class methods were renamed 2010-01-20 16:29:15 +00:00
fros4943 efdb9f6e04 added support for a third optional memory section (currently only used on mac os x) + 
added section address parsing debugging output +

removed unused code and + increased code readability
 2010-01-20 16:21:36 +00:00
fros4943 27131dfa98 removed unused methods and code cleanup 2010-01-20 13:33:33 +00:00
fros4943 9a477a300c contiki mote type: added additional regexps for parsing common section addresses 2010-01-20 13:27:02 +00:00
adamdunkels ae3341691d updated version of mspsim with bugfix in event scheduling 2010-01-19 20:34:52 +00:00
adamdunkels 5fc17c4f04 Small script for invoking indent for converting a C file into the Contiki code style 2010-01-18 13:28:28 +00:00
nvt-se ca7f69d480 moved to a better place 2010-01-15 15:05:02 +00:00
fros4943 ec2b3c4086 spelling fix 2010-01-15 14:00:43 +00:00
fros4943 f371965755 bugfix: generated random seeds were not reloaded correctly 2010-01-15 14:00:06 +00:00
fros4943 758710cadd cvs ignore for build directory 2010-01-15 10:57:42 +00:00
fros4943 760818260c using new MotePlugin interface 2010-01-15 10:54:42 +00:00
fros4943 a2b6c39ac2 setFilter() and getFilter() methods made public 2010-01-15 10:54:05 +00:00
fros4943 34844188dd added script example, demonstrating how to interact with surrounding cooja plugins 2010-01-15 10:52:55 +00:00
fros4943 d3f367ff58 statistics extraction public, to be accessible from other plugins and test scripts 2010-01-15 10:51:20 +00:00
fros4943 e16107b053 using MotePlugin interface, rather than object tagging 2010-01-15 10:47:36 +00:00
fros4943 61890416f5 removed obsolete object tagging methods on plugins, earlier only used by mote plugins 2010-01-15 10:46:53 +00:00
fros4943 bddc5ae132 introduced simple MotePlugin interface, to be used by all mote plugins 2010-01-15 10:46:12 +00:00
fros4943 6669b52c61 automatically ending transmission if radio hw is turned off 2010-01-15 10:44:26 +00:00
fros4943 515f5c7f78 removed warning when packet conversion failed 2010-01-15 10:43:02 +00:00
adamdunkels 51c8ff150e 'Set default' -> 'Save as default' 2010-01-15 10:09:23 +00:00
nifi bca8104a86 Updated scheduling for user triggered events 2010-01-14 19:06:14 +00:00
nifi 684c91d0fd Changed separator for concatenated mote id and log message for filtering to a space character. 2010-01-13 15:04:47 +00:00
nifi 313f857135 Enabled antialiasing in visualizer paint. 2010-01-13 12:29:10 +00:00
nifi 00d6ae56b6 Added option to filter on concatenated mote id and log message + removed compiler warnings 2010-01-12 15:42:08 +00:00
fros4943 8ee7b3c3be minor fix: remove relations if mote is removed 2010-01-12 09:36:10 +00:00
fros4943 2756ff2e31 improved zooming by slider 2010-01-12 09:11:26 +00:00
matsutsuka 26ade836b4 synchronized with updated version; fixed Unix environment handling 2009-12-15 07:13:14 +00:00
fros4943 9ddc25527d explicitly calling startPlugin and showPlugin methods, instead of relying on the plugin constructor to configure the plugin. if a simulation is loaded, startPlugin() is called after the simulation configuration is set 2009-12-14 13:29:35 +00:00
fros4943 32936c3df8 added method to select a log listener message near a given time, similar to timeline and radio logger methods 2009-12-14 13:25:04 +00:00
fros4943 cc252e5c16 added support for multiple msp command line listeners 2009-12-14 13:22:57 +00:00
fros4943 6940c85518 added: zoom in/out via ctrl +/- 
removed: mouse tooltip (only appears when mouse is clicked)
 2009-12-11 10:41:10 +00:00
fros4943 5660d6c168 bugfix: returned radio on during boot 2009-12-07 12:31:19 +00:00
fros4943 be1c818938 statistics bug fix: divide by number of motes + show time ruler at zoom in/out 2009-12-07 11:14:02 +00:00
fros4943 c1520a7134 added support for multiple log mote interfaces / mote 2009-12-07 11:06:08 +00:00
fros4943 5e251b837a hide interfered radio events when radio is not on 2009-12-07 11:04:15 +00:00
fros4943 38e0b7918a set radio interfered even when it is turned off -> cca is set immediately when radio is turned on 2009-12-07 11:03:19 +00:00
fros4943 9ec2b64008 added ESB helloworld test (cloned from Sky) 2009-12-02 17:16:57 +00:00
fros4943 5f88fac53c renamed serial port mote interface SkySerial to MspSerial + replaced ESB's log mote interface with the new MspSerial (ESB motes can now read serial port data) 2009-12-02 17:12:32 +00:00
fros4943 36d09eaa69 requesting mote wakeup when receiving radio data + code cleanup (faster code) 2009-12-02 16:39:42 +00:00
fros4943 51f210b37f removed unused and unneeded custom radio data classes 2009-12-02 16:29:36 +00:00
fros4943 2f9ccfa26d merged mspsim's compile dialogs 2009-12-02 16:27:32 +00:00
fros4943 8bd7187491 the simulation object now handles the motetype configuration for motes; common functionality that was earlier implemented in each mote. 
this patch allows the simulator more freedom for hand-picking mote class loaders

+ some debug output in experimental ImportAppMoteType
 2009-11-27 15:53:10 +00:00
fros4943 236a6eee15 added new application mote type that loads a configurable application mote java class. 
the new mote type makes it easier to create and load new application-level motes
 2009-11-25 20:52:33 +00:00
fros4943 fa26d2f213 configure and load methods may throw a MoteTypeCreationException 2009-11-25 20:48:22 +00:00
fros4943 93672649d2 made project class loader public + throw exception is mote class could not be loaded 2009-11-25 20:47:18 +00:00
fros4943 ac424ca88a bugfix: interfered nondestination radio 2009-11-25 18:13:05 +00:00
fros4943 7d6ee814da added documentation 2009-11-25 16:05:47 +00:00
fros4943 ff93ba8e0f decreased transmission interval and increased transmission duration of disturber mote, since short packets could still get through with the current settings 2009-11-25 16:03:00 +00:00
fros4943 d77d7ab667 updated mspsim.jar: implements cc2420's crc footer 2009-11-25 15:51:15 +00:00
fros4943 451be82efd radio connection update: radio should not be removed from destinations, but instead flagged as interfered. 
(and the radio medium will keep delivering data also to interfered destinations to avoid the half-filled RXFIFO problem)

+ minor fix: the received signal strength is the maximum of all sending radio
 2009-11-25 15:49:58 +00:00
fros4943 5c67d113c8 minor bug fix: arraydequeue may return null entries 2009-11-25 15:44:51 +00:00
fros4943 3c4fe0e3b7 closing fileoutputstream 2009-11-25 15:43:45 +00:00
fros4943 24d0330d2d radio connection update: radio should not be removed from destinations, but instead flagged as interfered 2009-11-25 15:43:03 +00:00
fros4943 45d23c026e new radio medium method signature + increased history size 2009-11-25 15:40:46 +00:00
fros4943 0a9e9dea59 * observing motes' radio states ("is transmitting") instead of radio events ("started transmitting"). 
previously the last radio event was logged in the Timeline, which could be very confusing when a radio was interfered while transmitting a packet: it looked like the radio stopped transmitting. (this behavior did not, however, affect the simulation output but only the timeline)

* added Radio Logger menu option shortcut, for quickly moving from the Timeline to the Radio Logger plugin
* minor ui fixes regarding event tooltips: tooltip info appear at mouse clicks
 2009-11-25 15:39:57 +00:00
fros4943 d27a2dfb5b added Payload Alias for easier overview of several packets with identical payloads. 
added Timeline menu option for quickly viewing the selected radio packet in the Timeline plugin.
 2009-11-25 15:32:34 +00:00
fros4943 d4f674c053 updated obsolete method signature: 
when the radio medium was still tick-based, several radio connection could finish "simultaneously" (during the same tick), which is no longer possible
 2009-11-25 15:26:35 +00:00
fros4943 2955eb9798 distinct between a radio connection's interfered radios, and interfered destination radios: interfered destinations still receive connection data 
+ faster code and updated documentation
 2009-11-25 15:21:15 +00:00
fros4943 7e6fbd9f7b output warning if radio shuts down during transmission 2009-11-25 15:18:11 +00:00
fros4943 01e9498dd9 radio medium update: receiving nodes that become interfered still receive connection data, but may (should) choose to ignore or corrupt it. 
this solves a problem with half-filled FIFO buffers on CC2420 radio platforms

+ minor fixes: the received signal strength is the maximum of all active connection, and a transmitting radio may still be interfered
 2009-11-25 10:36:08 +00:00
fros4943 5ed294f001 minor patch: remember last exported jar filename 2009-11-25 10:29:21 +00:00
fros4943 c0e115895d when a receiving radio is interfered by another transmission, the actual data received is corrupted. 2009-11-25 10:01:55 +00:00
fros4943 cd8a407ee1 fix: mote id should not return memory value, but rather the configured value. 2009-11-25 09:17:16 +00:00
fros4943 857c7d5a9d fixed integer to long wrap bug for simulation times over 2000s 2009-11-23 15:25:13 +00:00
nvt-se a96e8a33b3 removed interference because it covered several hops and caused problems with x-mac broadcasts 2009-11-20 14:51:30 +00:00
joxe 65a50f3d88 fixed MicaZ ID for contiki nodes by programming EEPROM 2009-11-17 14:30:26 +00:00
joxe f5ae0b9c82 fixed mote id for micaz 2009-11-17 14:09:02 +00:00
fros4943 445d6b6a72 test script bug fix: serial writes to motes should not include a newline. 
the additional newline character was earlier (wrongly) dropped by the serial line module, but is now handled by the ringbuf-based serial line implementation
 2009-11-14 11:52:03 +00:00
fros4943 8283ccf750 fixed cooja test info 2009-11-14 11:33:44 +00:00
fros4943 c869104e83 bug fix: schedule button events from simulation thread 2009-11-14 11:09:41 +00:00
fros4943 d71fe1d25f added delay before starting ping process 2009-11-14 10:58:28 +00:00
fros4943 721a698a24 + progress message type 2009-11-13 14:27:46 +00:00
fros4943 a3bd96f97e show compilation warnings dialog after successful load + save config to history even if load fails 2009-11-13 14:25:43 +00:00
fros4943 29310addc5 improved timeline zooming 2009-11-13 13:01:13 +00:00
joxe add9d2a387 added write to memory from COOJA + fixed byte ordering 2009-11-13 09:50:25 +00:00
fros4943 eded6497f2 removed dependency on mote interface getEnergyConsumption() method 2009-11-13 08:52:26 +00:00
fros4943 28f910b8d9 removed delay configuration option + lots of obsolete code from dialog 2009-11-13 08:51:23 +00:00
fros4943 977809144f cleaning up after a removed simulation by the removed() methods + 
exposing methods for loading simulations from external plugins +
minor bug fix: the reload progress dialog sometimes disappear even when a simulation is loading
 2009-11-13 08:49:26 +00:00
fros4943 467cf88bcd removed energyConsumption() method from mote interface: obsolete, we should instead interface Contiki's power profiler or MSPSim for better estimations 
+
added stub removed() method: mote interfaces that need explicit cleanup should override this method
 2009-11-13 08:41:06 +00:00
fros4943 499c3b8c26 removeDestination(Mote) method returns true is the argument mote was actually a destination (and hence was removed) 2009-11-13 08:38:45 +00:00
fros4943 a9eecb03df strict event scheduling from simulation thread + 
added method for removing mote types from a simulation +
added cleanup-methods for simulation/motes/mote interfaces: void removed();
 2009-11-13 08:37:36 +00:00
fros4943 9c861b486d minor fix: isTransmitting() flag should be true during transmissions + removed obsolete MSPSim setCCA interface 2009-11-13 08:32:01 +00:00
joxe be313dd97d improved support for MicaZ emulation - added variable watcher functionality 2009-11-12 12:49:34 +00:00
joxe 27bca64fe0 improved micaz emulation - supports radio on/off states + moved over to used common emulation classes 2009-11-10 12:56:20 +00:00
joxe 474698b36e added common emulation classes for emulated motes 2009-11-10 12:54:39 +00:00
adamdunkels d41a050310 Nightly test for the netperf shell command 2009-11-08 20:02:33 +00:00
fros4943 91a4322d2b minor fix: show rime address when no IP address was found 2009-11-05 11:54:59 +00:00
nvt-se 9b801b59c7 Do not print error message for errno when showing the usage string. Use the same usage string in the two places where the usage is printed. 2009-11-03 14:00:28 +00:00
adamdunkels 78fd88d0ec Print stats even when test fails 2009-11-03 09:27:11 +00:00
adamdunkels 01683428ea Added missing functions to make the bridge code compile 2009-11-03 09:09:55 +00:00
fros4943 0b2cd19cac removed debugging output 2009-11-02 13:18:27 +00:00
adamdunkels 0a12f6da77 Allow debugging output to be written from the bridge mote and be printed out by the tapslip6 program 2009-11-02 11:46:49 +00:00
fros4943 5bd2008def minor fix: check that event is not already scheduled 2009-11-02 10:02:58 +00:00
nifi a22348a496 Use canonical path to find parent directory when creating config relative path 2009-10-30 15:27:26 +00:00
fros4943 36eae6fcdf micaz port now extends AbstractWakeupMote and schedules itself to execute every millisecond. 
still no memory access, so simulation of micaz motes remains limited
 2009-10-30 09:42:50 +00:00
fros4943 a45aa8e89c minor changes in executable jars: removed jdk dependency on simulating computer + temporary files from simulation are stored in a subdirectory + temporary files from building the jar are removed when done 2009-10-29 17:05:13 +00:00
fros4943 b4a4572d97 added help method for reading from streams 2009-10-29 16:48:50 +00:00
fros4943 54ac5bc64e added two example scripts 2009-10-29 14:39:08 +00:00
fros4943 62c8535678 bugfix: radio medium should reset last connection data before notifying observers that a new connection has begun 2009-10-29 10:31:55 +00:00
fros4943 53b6e0e7fa new feature: generate executable jar from current simulation 
useful for preparing a simulation, and then running it elsewhere without having to configure cooja
 2009-10-29 10:17:15 +00:00
fros4943 4c7ef8b022 added experimental feature: generate executable JAR from current simulation 
+ made some methods public for accessing configuration state etc from outside the GUI class + minor bug fix in reparse projectes method
 2009-10-29 10:16:05 +00:00
fros4943 bc0d46a966 added "ant help" target, with build executable simulation example 2009-10-29 10:13:46 +00:00
fros4943 7f1d5c90d6 added method for writing text to files 2009-10-29 10:10:22 +00:00
fros4943 82b8006c0c using MoteTimeEvent instead of TimeEvent: scheduled events are automatically removed when the mote is removed 2009-10-28 15:58:42 +00:00
fros4943 281639c779 fixed potential memory leak when motes are removed during a simulation 2009-10-28 15:42:03 +00:00
fros4943 a4226e14c5 fixed potential memory leak when motes are removed during a simulation 2009-10-28 15:34:34 +00:00
fros4943 51130cea80 fixed potential memory leak: did not unregister mote observer if the mote was removed from the simulation while the skin was active 
+
added ability to copy mote IP addresses to clipboard
 2009-10-28 15:16:21 +00:00
fros4943 5650e818ec abstract application mote, used for implementing application-level motes, now extends wakeup mote. 
+ reimplemented disturber mote using abstract application mote
+ removed obsolete dummy mote example
 2009-10-28 14:38:02 +00:00
fros4943 cb04423a57 added default methods for saving and restoring the mote id 2009-10-28 14:35:10 +00:00
nifi c51956bc8c Minor fix with config relative path and allow external tools editing with specified Contiki path. 2009-10-28 13:37:29 +00:00
fros4943 be230d4d37 exporting paths relative to contiki, not cooja 
+ new project management api
 2009-10-28 12:07:37 +00:00
fros4943 226a41abbf throw exception if project directory or config file does not exist 2009-10-28 12:05:43 +00:00
fros4943 8e1de297d5 new dialog api + removed lots of obsolete code 2009-10-28 12:03:48 +00:00
fros4943 175e39a3d2 remember last source file used relative to current contiki 2009-10-28 12:02:21 +00:00
fros4943 edd94c00b0 increased timeout to 80sec (new mspsim is more accurate emulating flash memory timing) 2009-10-27 15:47:37 +00:00
fros4943 fc83caf42a updated mspsim.jar with timer bugfix (div by zero) 2009-10-27 14:43:51 +00:00
fros4943 c5dd2726f3 removed debug output 2009-10-27 10:36:01 +00:00
fros4943 5c2fd30afb disabled micaz clock until new wakeup interface is implemented 2009-10-27 10:20:25 +00:00
fros4943 2911ea483b jipv6 jar path fix 2009-10-27 10:19:07 +00:00
fros4943 29f618836f new radio medium api 2009-10-27 10:14:09 +00:00
fros4943 2d7e188c77 using mspsim's new window manager, not fully implemented yet 2009-10-27 10:13:34 +00:00
fros4943 38dcc8ed93 extending abstract wakeup mote 2009-10-27 10:12:33 +00:00
fros4943 ed8867bcb5 new event scheduling api 2009-10-27 10:11:17 +00:00
fros4943 a81f216acb radio medium patch: udgm uses hash table for efficient lookup in large networks + minor patches to dgrm 2009-10-27 10:10:03 +00:00
fros4943 59e1c464e7 introduced new abstract mote classes: 
AbstractWakeupMote shared functionality common to both contiki-based and mspsim-based motes
 2009-10-27 10:07:56 +00:00
fros4943 64293abe03 major update to cooja's event scheduler: 
* all events must now be scheduled from the simulation thread
* added new methods for requesting simulation thread execution

this patch solves some race conditions introduced by the new mspsim execution scheduling, but affects many existing plugins and interfaces
 2009-10-27 10:06:59 +00:00
fros4943 4715637b38 major update to mspsim-based emulated mote: 
* fully event based scheduling instead of previous event-tick-hybrid model

->
* faster emulation of large mspsim-based networks
* enables variable clock frequency (no longer fixed to 3.9 Mhz)
 2009-10-27 10:02:48 +00:00
fros4943 ae9aaea5f3 added build dependcy jipv6.jar 2009-10-27 09:58:18 +00:00
fros4943 639121f835 updated mspsim.jar, with dependency jipv6.jar and autorun script 2009-10-27 09:57:44 +00:00
fros4943 a344925b50 added methods for writing and reading byte array from files 2009-10-27 09:52:24 +00:00
fros4943 6100734897 added convenience method for accessing active plugins 2009-10-27 09:31:22 +00:00
fros4943 8b136c0b35 removed obsolete until method 2009-10-27 08:52:49 +00:00
adamdunkels 61f16ae6cb Configure RF channel to be the same as the default Contiki sky channel 2009-10-26 13:34:08 +00:00
adamdunkels fca2cfc919 radvd configuration file for linux 2009-10-26 13:20:57 +00:00
adamdunkels 2b54d1f1b4 Added make targets that help to setup the SLIP IPv6 bridge 2009-10-26 13:20:31 +00:00
fros4943 1dba4d40ca minor fix for non-GUI simulations: stop simulation and clean-up before shutting down COOJA 2009-10-23 11:55:53 +00:00
fros4943 4c1706bebb do not show dialog unless COOJA is visualized 2009-10-21 16:43:24 +00:00
fros4943 15c4cdaa3e on non-windows platforms: manually entering simulated gateway arp address 
+ minor updates: introduced network interface wrapper class , extending vis plugin, showing number of bytes forwarded between native and simulated network (not just number of packets)
 2009-10-20 09:22:07 +00:00
adamdunkels b4be72be7d Removed use of NULLMAC 2009-10-19 21:42:39 +00:00
adamdunkels 1b26fcd5c7 Increased timeout 2009-10-19 20:50:16 +00:00
adamdunkels 4ef2f4f6b5 Reduced interference range 2009-10-19 20:48:43 +00:00
adamdunkels f9d00bc8bf Reduced the number of packets that needs to be received 2009-10-19 20:47:28 +00:00
fros4943 d8f31b6630 check that radio connection is non-null when painting radio traffic history 2009-10-19 17:37:50 +00:00
fros4943 1c4b6afea3 minor feature: show mouse drag distance (in time) from mouse press 2009-10-19 17:36:28 +00:00
fros4943 9d7275db7e added option to limit the number of messages in list 2009-10-19 17:33:25 +00:00
fros4943 2bc52699c6 bugfix: removed-flag should become false when rescheduling unsorted event 2009-10-19 17:32:38 +00:00
fros4943 b144b78478 increased slip data buffer size 2009-10-19 17:31:13 +00:00
oliverschmidt 644d637530 cc65 2.13. supports 'native' ProDOS 8 system programs. So LOADER.SYSTEM doesn't act as resident shell anymore but works now as pure loader. 2009-10-18 10:01:40 +00:00
oliverschmidt d8aee18f6c cc65 2.13. allows to 
- explicitly set 80 column mode
- control exit behaviour from the program itself (instead of requiring a loader variant).
 2009-10-18 09:37:37 +00:00
fros4943 2c1b7013d5 by request: added mote type visualizer skin 2009-10-16 13:14:53 +00:00
fros4943 92eecd3e38 added method for more easily accessing the coffee filesystem interface 2009-10-08 14:41:20 +00:00
adamdunkels 5dd7f44162 Increased the transmission time to 40 seconds from 20 seconds 2009-10-02 09:10:08 +00:00
nifi 1f9642039e increased timeout due to better timing in new version of MSPSim 2009-09-28 09:46:54 +00:00
nifi 51cbcd9193 minor bug fix: enforce string to avoid merging mote ids 2009-09-24 08:56:17 +00:00
fros4943 21d1c5e939 added experimental functionality for mapping between debug info paths and real source locations. 
useful when the firmware is not compiled on the cooja computer, or when the source files have been moved after compilation.

this functionality is not yet saved with simulation configs
 2009-09-23 08:22:36 +00:00
fros4943 25767a1f0f faster repaint for large source files 2009-09-23 08:16:06 +00:00
nvt-se fc34a4572b Removed the deprecated COFFEE_DIR_CACHE_ENTRIES parameter. 2009-09-22 16:31:36 +00:00
fros4943 88b4e22aad fixed executable path 2009-09-18 16:45:26 +00:00
fros4943 0beda36034 show progress dialog during minimal-net compilation 2009-09-18 16:38:15 +00:00
fros4943 0c4dc6fc6b start plugins in non-dispatcher thread 2009-09-18 16:13:31 +00:00
fros4943 d9f3e2b05f bugfix: restoring path from wrong source when loading msp mote type 2009-09-18 09:26:22 +00:00
fros4943 dc07c1ad26 debug info before loading ELF file 2009-09-18 09:06:15 +00:00
fros4943 fcfb68e329 added micaz port hello world test 2009-09-17 14:00:50 +00:00
fros4943 e974b896dc removing unsafe MoteID interface dependencies 2009-09-17 13:19:08 +00:00
fros4943 87aa2c2aad bug fix: z-coord was not painted + some (even) positions caused errors 2009-09-17 12:38:04 +00:00
fros4943 ca0f2c91c8 paint both actual transmission range (depends on current tx power), and the maximum value as configured in the radio medium 2009-09-17 12:10:28 +00:00
fros4943 f144b012b9 changed default tx power to maximum 2009-09-17 12:09:14 +00:00
fros4943 b526851ac1 added getID() stub to avoid compiler errors: the application motes does not yet respect the configured mote IDs 2009-09-17 11:12:25 +00:00
fros4943 b2ea7ba9b2 removed reference to potentially non-existing mote ID interface: the mote getID() method should instead be used 2009-09-17 11:07:58 +00:00
fros4943 8116da5c4e removed mote state references 2009-09-17 11:06:35 +00:00
fros4943 62287dcb03 implements mandatory getID() method 2009-09-17 11:05:56 +00:00
fros4943 72105a161e added getID() method (mandatory for all motes) 
removed the common state notion: these are instead mote specific
 2009-09-17 11:05:09 +00:00
fros4943 eb4698612d minor changes: removing some unused code, restructuring, added getID() methods 2009-09-17 10:50:11 +00:00
fros4943 969154c6f0 added some basic functionality for cooja motes like save/load support, compile dialog, and configurable mote interfaces. some parts are still missing (memory r/w access and mote IDs) 
+
code restructuring preparing for a generic emulated mote type layer in cooja (made avrora-based motes look more like mspsim-based motes)
 2009-09-17 10:45:13 +00:00
fros4943 edae45a101 added visualizer quick help 2009-09-15 11:26:39 +00:00
oliverschmidt 61929d7a3c Updated from Loader 1.3 to Loader 1.4. 2009-09-13 19:05:52 +00:00
zdshelby fc237101be - Added the Sensinode platform programming tools to /tools 2009-09-09 09:48:16 +00:00
nvt-se b5295fef10 use PATH_MAKE when compiling Contiki mote types. doesn't work on BSD systems 
otherwise.
 2009-09-07 15:05:05 +00:00
fros4943 eacda19281 support for extracting very simple statistics from observed events 2009-08-27 16:38:09 +00:00
fros4943 a69c8f03fe minor update: sorting variables by name + decreased default plugin size 2009-08-27 14:38:57 +00:00
fros4943 39aeb2f150 visualizer skin updates: broke out traffic visualization from the udgm radio medium skin (the stand-alone traffic skin can be used with any radio medium), added a simple background grid skin and a mote position skin 2009-08-27 13:59:47 +00:00
fros4943 23f13a2b6f visualizer plugin major update: support for zooming and panning, hiding window decorations, and a more powerful visualization skin api 2009-08-27 13:57:42 +00:00
nvt-se b8e268e598 Added FreeBSD support. 
Made the Sky mote type use PATH_MAKE for the build procedure.
 2009-08-27 12:25:11 +00:00
oliverschmidt 5fcb9613be Changed Contiki IPv4 address to 10.1.1.1 to allow for out-of-the-box testing in emulators with Ethernet support bound to a loopback interface (see Contiki Wiki article "Capturing loopback traffic with Wireshark"). 2009-08-24 20:28:16 +00:00
fros4943 d13f47a64f bugfix: clock drift must be set even when the random startup delay is zero 2009-08-20 13:10:35 +00:00
fros4943 91e762b7bc bugfix: do not assume that the debugged mote is compiled from source 2009-08-20 12:52:17 +00:00
nvt-se f78c9d6a20 fixed error: -e arg should be checked 2009-08-13 12:15:35 +00:00
nvt-se 9ab5859421 added platform configuration argument. 2009-08-13 12:11:20 +00:00
fros4943 3847927a43 including the coffee manager JAR in build system and project directory 2009-08-12 07:41:30 +00:00
fros4943 cdcf783ac6 coffee manager mote interface for sky motes 2009-08-11 17:09:16 +00:00
fros4943 8fcff235e2 optional ant build.xml for building the coffee jar file 2009-08-11 17:04:31 +00:00
fros4943 b4f3cce790 minor changes for allowing coffee manager access from cooja 2009-08-11 17:03:59 +00:00
nvt-se c154985d7e load configuration from the JAR 2009-08-11 14:42:58 +00:00
nvt-se 7d25016895 added ESB platform properties and made build.sh include properties files in 
the JAR.
 2009-08-11 14:21:28 +00:00
nvt-se 1c52dfefef read the bytes of a full region from the original file if the log record doesn't exist. 2009-08-10 12:56:13 +00:00
nvt-se 9d030cad2c added support for extracting micro logs 2009-08-10 12:51:52 +00:00
nvt-se a4f7f33b74 simplified the argument interface. cleaned up some code 2009-08-04 15:19:07 +00:00
nvt-se 6612a77d66 only include class files. 2009-08-04 14:49:52 +00:00
nvt-se 44772060af removed debug output 2009-08-04 10:39:13 +00:00
nvt-se 0f1f50d9c8 Add a managment tool for Coffee file system images. 2009-08-04 10:36:53 +00:00
joxe 68ba32eaee added autoack config for bridge 2009-07-28 21:34:13 +00:00
dak664 3869a3b212 Remove coffee page size option, not used 2009-07-23 16:16:54 +00:00
dak664 31253a29a1 Generalize to coffee files, data attributes, includes 2009-07-20 19:18:36 +00:00
dak664 450aa16a5b Added input args and optional complemented output 2009-07-15 22:06:23 +00:00
dak664 97e258814c Configured for 1284p Raven webserver 2009-07-14 19:25:46 +00:00
nifi e8c11209da added notification to model when removing events 2009-07-06 14:04:21 +00:00
fros4943 091bdb080f +quickhelp for control panel 2009-07-06 12:54:42 +00:00
fros4943 28976d9e15 allow simulation delays below real-time 2009-07-06 12:29:57 +00:00
fros4943 d5a7a18145 more debugging output + minor refactoring 2009-07-03 14:06:20 +00:00
fros4943 739e21caaf + support for configurable buffer sizes (currently only for log output events) 2009-07-03 13:37:40 +00:00
fros4943 d282c70572 using event central for keeping track of simulation motes + for sharing log output events among different log listeners. 
note that at least one log listener plugin must be kept opened, otherwise the event central will clear the history
 2009-07-02 12:07:18 +00:00
fros4943 47bf1de4ca using event central for keeping track of simulation motes 2009-07-02 12:05:24 +00:00
fros4943 9b164adc35 method for accessing event central + include mote when notifying simulation observers that a mote was added/removed 2009-07-02 12:04:28 +00:00
fros4943 f13a313a7d event central used for simplifying plugin implementations: a plugin can listen for simulation-wide mote interface changes via this class, and does not need to keep track of added/removed motes. 
in addition, the event central may be configured to keep an event history of selected mote interface events, useful for sharing events among several different plugins
 2009-07-02 12:03:09 +00:00
fros4943 fe0f03a5fd help methods for manipulating arrays 2009-07-02 11:58:37 +00:00
nifi ac11dc90d8 only reload with new seed if simulation exists 2009-06-30 13:31:42 +00:00
nifi adbe225132 removed unused import 2009-06-30 13:10:14 +00:00
fros4943 5e1afdbc92 quick help for log listener and time line pluging + keyboard shortcuts 2009-06-30 12:47:00 +00:00
fros4943 5a053d7d4e added quick help 2009-06-30 12:46:26 +00:00
fros4943 bed44c8f55 made desktop scrollable + added quick help pane (keyboard F1) 2009-06-30 12:45:51 +00:00
nifi 1cdbda249a enable routing for test (UIP_CONF_ROUTER is now disabled by default for platform sky) 2009-06-29 09:58:14 +00:00
adamdunkels d98de28966 README file for the contents of the release-tools directory 2009-06-26 19:56:33 +00:00
fros4943 eb964b9dc6 added make clean + added an extra compilation command with CORE enabled 2009-06-26 13:56:20 +00:00
fros4943 a4bc10edfa + verifies the base64 encoded executable stored in flash 2009-06-26 13:26:48 +00:00
fros4943 242d8edf03 more debugging output when test fails 2009-06-26 11:30:36 +00:00
fros4943 964f63645b more debugging output 2009-06-26 09:28:45 +00:00
fros4943 4525bcb8f0 added shutdown hook for make sure the minimal-net application is killed when cooja exits without shutting down all plugins 2009-06-25 17:43:13 +00:00
fros4943 e36479f0b5 added mote separator background colors + painting LED events as three thin lines (RGB) instead of in a single color 2009-06-25 16:44:08 +00:00
fros4943 124380e354 more efficient toggle warnings implementation + listen to all popup triggers 2009-06-25 15:46:57 +00:00
fros4943 c66b8422ee bug fix: RUN_TEST removed the aggrerated log + simplified code 2009-06-25 11:10:50 +00:00
nvt-se c1b2607161 removed deprecated WITH_NULLMAC setting for IPv6. 2009-06-24 16:32:45 +00:00
fros4943 2a5781566f moved test scripts into simulation config (.csc) 2009-06-24 14:42:50 +00:00
fros4943 28a9b815b5 minor script updates 2009-06-24 14:41:47 +00:00
fros4943 e6fa5334ae print random seed and end time to all test logs 2009-06-24 14:08:14 +00:00
fros4943 25893c463e minor fixes: allow copy to clipboard and output to console when hinding stdout + always show the last output 2009-06-24 14:07:19 +00:00
fros4943 b70f013ab4 added support for hiding normal output, only showing warnings/errors 2009-06-24 12:41:05 +00:00
fros4943 5d20b01f04 bugfix: random generator was initialized differently at load vs reload 2009-06-24 07:56:15 +00:00
fros4943 e353666550 removed regexp filtering on time column 2009-06-23 12:57:19 +00:00
dak664 e7bc9f20a2 Put strings in PROGMEM, strip CRLF in text files only 2009-06-19 17:12:35 +00:00
adamdunkels 81786900f2 Makefile for automated nightly building of example code 2009-06-18 08:42:08 +00:00
adamdunkels 4c22ef33d0 Moved compile-platforms from examples/ to tools/release-tools 2009-06-18 08:40:57 +00:00
fros4943 532c1b6c77 bugfixes: recalculate executable address after loading breakpoint + iterate over array, not list 2009-06-17 13:06:55 +00:00
fros4943 f086c92b40 implemented saving current flash memory 2009-06-17 13:05:27 +00:00
fros4943 563a9f1b8e added target that instructs the jvm to show a message box at errors, useful for debugging Contiki nodes 2009-06-16 17:06:02 +00:00
fros4943 34584fc05e show watchpoint colors and use a fix watchpoint event width 2009-06-16 12:16:02 +00:00
fros4943 752e80167b added breakpoint colors and user defined messages 2009-06-16 12:15:15 +00:00
fros4943 ebb47546a2 replaceFirst() also for Contiki relative paths + verify that the generated config path is valid 2009-06-15 18:13:45 +00:00
fros4943 d7b35b5b40 bugfix: only replace the first instance when generating portable paths (simulation configs) 2009-06-15 17:43:48 +00:00
fros4943 9dd0e076a6 GENERATE_MESSAGE() argument in milliseconds 2009-06-15 17:39:02 +00:00
fros4943 32ac82fc22 added debugging output + generated javascript code tooltip 2009-06-15 16:53:32 +00:00
fros4943 67bca87c1d bugfix: remove unsorted time event 2009-06-15 16:51:42 +00:00
fros4943 a45e2382b2 bugfix: do not activate script engine according to simulation config in test mode (without GUI), instead, always keep it activated 
+ more debugging output
 2009-06-15 15:41:32 +00:00
fros4943 4c4cdeb546 schedule wakeup after new data has been written 2009-06-15 14:40:28 +00:00
fros4943 244d780809 support for character arrays + various UI updates, contributed by Kasun Hewage. 2009-06-15 11:59:21 +00:00
fros4943 4a4630d9ec added menu options: copy to clipboard and save to file 2009-06-15 10:53:24 +00:00
fros4943 3c7d0329ef minor fixes: integer wrap in repaint method + check watchpoint cast 2009-06-15 09:47:05 +00:00
fros4943 e8ca6d4a4e + shortcut for registering identical breakpoints for all motes of a particular mote type (currently only in popup menu) 2009-06-15 09:45:46 +00:00
fros4943 4fecf3fe1e moved handling of breakpoint configs from plugin to mote 2009-06-15 09:44:42 +00:00
fros4943 61885eba09 added menu options: copy to clipboard and save to file 2009-06-15 08:34:51 +00:00
fros4943 e7a6df77f3 directly call java script method instead of parsing GENERATE_MESSAGE calls 2009-06-12 15:12:46 +00:00
fros4943 1d504be38c no source code repaints while simulation is running 2009-06-12 15:11:22 +00:00
nifi e7c13890ee log listener plugin update: support for regexp filtering + nicer ui 
+ minor tooltip fix in radio logger
 2009-06-12 14:34:29 +00:00
nifi b2c0df08af radio logger update: autosizing columns + support for new microsecond resolution + some minor fixes 2009-06-12 14:12:59 +00:00
nifi be03c380c5 Show config file when reloading 2009-06-12 13:00:57 +00:00
nifi 2c4f9b50f8 cvs ignore for generated jars 2009-06-12 12:42:32 +00:00
fros4943 3b25d8b5e4 no stack trace printout when a visualized plugin fails to in test mode 2009-06-11 10:23:29 +00:00
fros4943 8842b700a7 ui updates + extracted code to external classes 2009-06-11 10:12:44 +00:00
fros4943 12ee67171b mspmote is now a watchpoint mote + mspmote is responsible for parsing and providing firmware debugging info 2009-06-11 10:08:12 +00:00
fros4943 a8aa75fa8d updated code watcher user interfaces: added support for disabling breakpoints without removing them + several minor fixes 2009-06-11 10:06:47 +00:00
fros4943 c19c8a16ad mspsim breakpoint wrapper with source code information (part of the code was extracted from the code watcher plugin) 2009-06-11 10:05:28 +00:00
fros4943 a39b87f214 implemented watchpoint visualization + 
saving current zoom and divider locations in simulation configs
 2009-06-11 10:02:53 +00:00
fros4943 b63322ebb1 added simple watchpoint interfaces, currently only implemented on mspsim motes 2009-06-11 10:02:11 +00:00
fros4943 8a44b78934 + startPlugin method throws exceptions 2009-06-10 15:57:08 +00:00
fros4943 1a2084b597 minor etimer code cleanup 2009-06-09 19:38:38 +00:00
fros4943 1776fb0449 bugfix: if timer expired but was not yet handled due to long running operations (such as radio transmits), warn and reschedule timer handling later 2009-06-09 19:12:30 +00:00
fros4943 8b01f0e3aa cooja runtime arguments updated 2009-06-09 09:49:14 +00:00
fros4943 24897fb71f two simple example scripts 2009-06-09 09:47:50 +00:00
fros4943 02733e15ab made test editor plugin a simulation plugin: it now depends on a specific simulation 
this change enables multiple simultaneous scripts in a simulation, and also makes it easier to create tests since they will be stored with the simulation config

since the plugin now depends on a simulation it is no longer possible to create/reload simulations from the test scripts (this was however not often used)
 2009-06-09 09:47:04 +00:00
fros4943 5bac672099 added help methods for reading text files from disk 2009-06-09 09:42:01 +00:00
fros4943 efe1bb9cff warn if Contiki has an event timer scheduled to the current time, which has for some reason not been executed 2009-06-08 13:07:54 +00:00
fros4943 646fb6fec0 bug fix: delay field is in milliseconds, not microseconds 2009-06-08 12:42:58 +00:00
fros4943 24f00bce76 reload simulation bug fix (lost edges) + removed some debugging output 2009-06-08 12:42:10 +00:00
fros4943 6e26f08c15 + automatically add/remove simulation motes 2009-06-08 11:55:58 +00:00
fros4943 c6c7c51c10 generate random mote type identifiers 2009-06-03 17:27:37 +00:00
fros4943 7ada9705a4 show dialog at script errors 2009-06-03 17:26:31 +00:00
fros4943 7877d54e1e bugfix: mote plugins should use the start plugin action 2009-06-02 15:04:49 +00:00
fros4943 af0c20e00d extend SerialUI to avoid code duplication 2009-06-02 09:34:59 +00:00
fros4943 9ea673f3be minor fix: always show start of lines 2009-06-02 09:34:12 +00:00
fros4943 cdf4bfd4f8 gui action fix: do not directly change isEnabled() from the simulation thread 2009-05-28 14:53:26 +00:00
fros4943 e54e0db966 bugfix: non-simulation plugins menu items need separate action listeners 2009-05-28 13:45:18 +00:00
fros4943 c9e97fd1ae fix: only toggle actions state in visualized mode + documentation 2009-05-28 12:59:02 +00:00
fros4943 02b5d5e230 gui update: enable menu items depending on whether a simulation is loaded or not 2009-05-28 12:55:14 +00:00
nifi efbae10245 Load last opened simulation configuration file when reloading without simulation. 
Added key shortcuts to last opened files.
 2009-05-27 23:23:41 +00:00
fros4943 0f924ed2dd fix: report test success by log.testOK() 2009-05-26 14:52:09 +00:00
fros4943 6ddc3642bf fix: Contiki path printout 2009-05-26 14:36:26 +00:00
fros4943 b143dbe4b2 example updates 2009-05-26 14:34:43 +00:00
fros4943 e238d84a75 milliseconds -> microseconds update + removed dependency of radio interface 2009-05-26 14:34:30 +00:00
fros4943 1c22bf5151 event based mote interfaces + reimplemented cross level functionality for TR1001 2009-05-26 14:33:30 +00:00
fros4943 c59fc91487 milliseconds -> microseconds update 2009-05-26 14:31:07 +00:00
fros4943 62db437c2d minor bugfixes + added zoom functionality 2009-05-26 14:30:20 +00:00
fros4943 7985a9310b milliseconds -> microseconds update + more effective repainting using swing timers (avoid AWT event floods) 2009-05-26 14:27:00 +00:00
fros4943 e5219e0d8b better description 2009-05-26 14:25:29 +00:00
fros4943 cf9b7b76fe milliseconds -> microseconds update 2009-05-26 14:25:07 +00:00
fros4943 d996ae1476 event based mote interfaces: less dependencies on tick polling + using new mote time events 2009-05-26 14:24:20 +00:00
fros4943 fba3701a86 contiki mote schedules their next wakeup based on Contiki etimers + removed notion of active vs LPM state (optimization no longer needed) 2009-05-26 14:21:20 +00:00
fros4943 a327180762 new help class: time event associated with (or scheduled from) a mote. if the mote is removed during simulation, this enables removing all its scheduled events 2009-05-26 14:19:17 +00:00
fros4943 633f9bb5ef radio medium updates: removed obsolete tick observer + notifying observers for each finished radio connection separately 2009-05-26 14:17:29 +00:00
fros4943 61c2ed2e1a two major updates: 
simulation time now uses microsecond resolution instead of earlier millisecond (allows for better simulation accuracy)
+
Contiki motes schedule their own events instead of the earlier approach of having the simulation loop register tick events common to all Contiki motes (faster simulation)

both changes require extensive changes throughout COOJA
 2009-05-26 14:15:41 +00:00
fros4943 300f3396ac allow contiki motes to handle several contiki events each tick + corrected variables types 2009-05-26 14:08:51 +00:00
fros4943 990aa93d57 setting timeline plugin as default 2009-05-26 14:07:19 +00:00
fros4943 a5ec895bf7 updated cross level test: bug fix + more debug info 2009-05-26 14:05:35 +00:00