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

2399 commits

Author SHA1 Message Date
Fredrik Osterlind 51e62e8cb3 Cooja backwards compatibility with simulation files that uses non-Contiki Java package names 2013-11-20 16:43:28 +01:00
Fredrik Osterlind b5c94910ac Renamed Java packages to match our contiki-os.org domain. Note that this commit does not affect external dependencies 
like /tools/mspsim.

This is a very simple modification that affects a very large number of files in Contiki: Cooja,
/platform/cooja, Collect-view, Coffe-manager, and Cooja simulation files (.csc).

I've gone through Contiki to update all references I could find. Nevertheless, this commit will likely
break external dependencies, like saved Cooja simulation files.
 2013-11-20 16:43:27 +01:00
Fredrik Osterlind 2a9283884c renamed getGUI() method to getCooja(), to better reflect its purpose 2013-11-20 16:43:20 +01:00
Fredrik Osterlind 625537158f renamed main Java class of Cooja from GUI to Cooja. 
se.sics.cooja.GUI -> se.sics.cooja.Cooja

this commit does not contain any functional changes, but may require external scripts to be updated
such as Makefiles.
 2013-11-20 16:43:18 +01:00
Nicolas Tsiftes 263e212427 Merge pull request #431 from adamdunkels/push/ipv6-const 
Make IP addresses const
 2013-11-20 04:26:05 -08:00
Christian Taedcke 6a30e78390 In stm32w_flasher added check for pyudev and updated ubuntu package instructions. 2013-11-19 21:47:07 +01:00
Adam Dunkels 469884171a Added the const keyword to functions that use the tcpip_set_outputfunc(), which now takes a const argument 2013-11-18 23:26:37 +01:00
Yvonne-Anne Pignolet 83ae37b48e Add access to LQI and RSSI to Contiki motes 2013-11-18 15:05:23 +01:00
Adam Dunkels 3f34a146dd Merge pull request #375 from vsaw/tmp-uncrustify-changed 
feat(code-style): Add a script to automatically format all changed files
 2013-11-14 12:30:09 -08:00
Moritz 'Morty' Strübe d05b03108a Decent error if mspsim cant be built 2013-11-14 18:14:03 +01:00
Adam Dunkels 71eea754d6 Added mspsim as a submodule instead of as a binary mspsim.jar file 2013-11-07 17:28:50 +01:00
Moritz 'Morty' Strübe 56afc6d437 Allow setting random seed as parameter 2013-11-06 17:41:53 +01:00
Christian Taedcke 108692bb31 In stm32w_flasher replaced hal-* calls with usage of pyudev. 2013-10-19 14:58:58 +02:00
Oliver Schmidt e263bac1fc Merge pull request #378 from oliverschmidt/master 
Final adjustments for the switch from 'atari' to 'atarixl'.
 2013-10-06 08:24:30 -07:00
Oliver Schmidt c6474cc8bc Final adjustments for the switch from 'atari' to 'atarixl'. 2013-10-06 17:23:39 +02:00
Valentin Sawadski b25ef28ade feat(code-style): Add a script to automatically format all changed files 
If executed inside the repository it will run the default Contiki
uncrustify script on all changed .c and .h file. This could be added
as a Git pre-commit hook. See http://git-scm.com/book/en/Customizing-Git-Git-Hooks
 2013-10-05 10:39:47 +02:00
George Oikonomou 250de6201b Add uncrustify helper scripts 2013-10-04 15:27:46 +01:00
George Oikonomou a3e63d05d2 Add a config for the Uncrustify code beautifier 2013-10-04 15:27:45 +01:00
George Oikonomou 94a05f2f55 Move code style-related tools to their own dir 2013-10-04 14:34:57 +01:00
Oliver Schmidt 70d7953ce7 Adjustments for the switch from 'atari' to 'atarixl'. 2013-10-03 23:54:33 +02:00
Oliver Schmidt 73684b32c7 Some beautification for the Contiki online configurator. 2013-10-03 23:51:01 +02:00
Oliver Schmidt 57d9c43a33 Removed support for 'atari' now that 'atarixl' is part of the cc65 master. 2013-10-03 22:55:32 +02:00
Moritz 'Morty' Strübe 2b5f3bc6bd Add MSPSim Logging 2013-08-20 10:43:32 +02:00
Simon Duquennoy 5dc05e7913 Port apps, examples, platforms and tools so they use the new neighbor and route API. 2013-08-19 17:48:30 +02:00
Fredrik Osterlind 96968cb35e bugfix: only write to infomem if empty 2013-08-16 15:02:08 +02:00
Fredrik Osterlind 7c125ced9a a set of new cooja-mspsim mote types 2013-08-16 12:02:16 +02:00
Fredrik Osterlind 871ea380d0 only show printable characters in mote output plugin 2013-08-15 11:49:48 +02:00
Fredrik Osterlind e5fe37336e enable reconfigurable mote interfaces 
some minor trying to fix a bug that occasionally hangs cooja when reconfiguring a mote type
 2013-08-15 11:49:31 +02:00
Fredrik Osterlind 92655159c8 added a set of new mspsim-based mote types using CC1120, CC1101 and the Enc28j60 ethernet chip 
minor changes: removed some obsolete stack monitoring code, improved mspsim-cooja window handler
integration
 2013-08-15 11:46:29 +02:00
Fredrik Osterlind ba39d98a86 store current radio transmission bitrate in .csc 
trigger radio event when device radio channel is changed
 2013-08-14 13:56:39 +02:00
Fredrik Osterlind 9929cc2a10 added new mote type method that returns the by default used mote interfaces, as opposed to all compatible mote 
interfaces

this allows a user to override default settings in the create-new-mote-type dialogs
 2013-08-14 13:30:15 +02:00
Fredrik Osterlind 8e264badb7 added new mote type method that returns the by-default used mote interfaces, as opposed to all compatible mote 
interfaces

this allows the user to override default settings in the create-new-mote-type dialogs
 2013-08-14 13:25:53 +02:00
Fredrik Osterlind f59040375b repaint labels periodically instead of every time data is sent over the serial connection 2013-08-14 13:04:37 +02:00
Fredrik Osterlind 8a084926e2 re-implemented stack overflow monitoring, and user can now manually override the stack addresses for use with 
custom linker scripts
 2013-08-14 13:03:15 +02:00
Fredrik Osterlind 11d124882c made mote-to-mote relations optional, reordered how skins are painted to more easily decide which skin is 
painted first
 2013-08-14 13:00:00 +02:00
Fredrik Osterlind 21a901ad26 removed unnecessary imports 2013-08-14 12:57:58 +02:00
Fredrik Osterlind 5b7cc56cc5 guard amount of serial data being written to simulated contiki nodes 2013-08-14 12:57:17 +02:00
Fredrik Osterlind 1842fae903 write node id to infomem 2013-08-14 12:56:25 +02:00
Fredrik Osterlind 0b09084b92 minor bugfix: simulation speed was not restored correctly 2013-08-14 12:54:30 +02:00
Fredrik Osterlind 9cb2fd8465 allow saving .csc with contiki-relative paths when the .csc file is in a subdirectory of the referenced 
application
 2013-08-14 12:52:20 +02:00
Fredrik Osterlind eb1a147d7d new feature: ability to show log listener's output in the timeline, using the mote output plugin's currently 
active filter
 2013-08-14 12:47:44 +02:00
Fredrik Osterlind 4811d7f378 made ip-address-to-string method public 2013-08-14 12:36:14 +02:00
Fredrik Osterlind 1917ea574f added methods to more easily extract runtime statistics from simulation scripts 2013-08-14 12:34:52 +02:00
Fredrik Osterlind 1b556148d8 added 200% simulation speed alternative 2013-08-14 12:33:44 +02:00
Fredrik Osterlind 492cd5f721 added new optional features: time formatting, hide-duplicate-packets, hide-airshot-packets 2013-08-14 12:32:23 +02:00
Fredrik Osterlind bda04947e7 minor changes: methods that allow other plugins, e.g. the timeline, to learn about the currently used mote 
output filter, make mote-specific coloring on by default
 2013-08-14 12:28:18 +02:00
Fredrik Osterlind 37ebe133e9 increased maximum buffer size 2013-08-14 12:25:03 +02:00
Adam Dunkels 2d973c5353 Allow the exit code from a failed test script to propagate to the Java 
process, which makes it possible to track failing tests in makefiles and
via scripts.
 2013-08-06 21:33:03 +02:00
Adam Dunkels bcdebf0e9d Filter out symbols defined by the C implementation 2013-08-06 21:33:03 +02:00
Adam Dunkels 7c4715ced7 Updated mspsim.jar 
The Contiki source code holds a binary version of mspsim.jar until
we get a proper git submodule set up. This particular version of mspsim.jar
is built from Thingsquare's mspsim fork.
 2013-08-06 21:31:22 +02:00
Oliver Schmidt 6ab336f55f Several minor consistency improvements. 2013-07-31 00:55:31 +02:00
Adam Dunkels ec26d6160e Merge pull request #284 from cetic/fix-cooja-pcap-fcs 
Bugfix: Corrected wireshark bad FCS errors in COOJA Pcap export
 2013-07-28 16:44:45 -07:00
stefano pascali b43ce0f677 Travis-ci tweaks, added CPUREV to 01 regression test, needed by mbxxx platform 2013-07-12 17:07:04 +02:00
Laurent Deru d1f12638b4 Bugfix: Corrected wireshark bad FCS errors in COOJA Pcap export 2013-06-24 13:18:03 +02:00
Peter A. Bigot 5fc0575e99 Makefile.include: support make clean all 
Historically $(OBJECTDIR) was created when Makefile.include is read.  A
consequence is that combining "clean" with "all" (or any other build
target) results in an error because the clean removes the object
directory that is required to exist when building dependencies.
Creating $(OBJECTDIR) on-demand ensures it is present when needed.

Removed creation of $(OBJECTDIR) on initial read, and added an order-only
dependency forcing its creation all Makefile* rules where the target is
explicitly or implicitly in $(OBJECTDIR).
 2013-06-20 17:45:41 -05:00
Oliver Schmidt 61b8f4b58c Merge pull request #273 from oliverschmidt/master 
Removed some more old RCS tags from the Contiki source tree.
 2013-06-18 12:30:15 -07:00
Oliver Schmidt 16590095f7 Removed some more old RCS tags from the Contiki source tree. 2013-06-18 19:19:37 +02:00
Peter A. Bigot 09812fe5df cooja TimeLine: support mouse wheel zoom 
Add listener that zooms based on mouse wheel.  The zoom center is the
mouse position, which alleviates the pressure to touch pabigot/contikix#4.

Closes pabigot/contikix#5

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
 2013-06-17 13:12:47 -05:00
Peter A. Bigot e6a69d29bd cooja TimeLine: zoom keystroke failure 
The + typed character can only be generated on English keyboards by
shift-equals, resulting in a failure to recognize ctrl-plus because of
the unexpected shift modifier.  Adapt by supporting English and Spanish
keyboards, as well as number pad keys.

Closes pabigot/contikix#2

Reference: http://forums.oracle.com/thread/1356291
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
 2013-06-17 13:12:47 -05:00
Peter A. Bigot 0c373a8bee cooja TimeLine: refactor zoom infrastructure 
Refactor common code into private functions.  Abstract to support zoom
to level or exact value.

There should be no behavioral change as a result of this patch except:

 * zooms are consistently filtered to be in the valid range (those from
   configuration parameters formerly had been used directly);
 * the correct centerTime is used for zoomOutAction when
   mousePixelPositionX is positive

Supports pabigot/contikix#5

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
 2013-06-17 13:12:31 -05:00
Oliver Schmidt d636d7110f Added platform 'Atari XL'. 
Don't be afraid, I'm not trying to have more retro platforms than "real" platforms ;-)
The platform 'atarixl' will replace the platform 'atari'. However I need both for some
transition period.
 2013-06-01 22:49:00 +02:00
Rémy Léone e6bd4f1dde Rename to md 2013-03-26 23:15:37 +01:00
Rémy Léone 7b40a568a6 Update to markdown 
- Spellchecking
- Update plain text to github markdown
 2013-03-26 16:55:19 +01:00
Robert Quattlebaum 1d113f52ad core/net/uip: Rename uip_ethaddr to uip_lladdr. 
There isn't really a good reason I can think of for these
to be different between IPv4 and IPv6.
 2013-03-10 11:39:11 -07:00
Nicolas Tsiftes a7b3e99644 Merge pull request #91 from JelmerT/z1-mac 
Added support for motelist and uploading to Z1 motes under Mac OSX
 2013-02-17 09:28:49 -08:00
Oliver Schmidt 010d495e03 loader.system is now official part of the cc65 Apple II support. 2013-02-17 00:30:55 +01:00
Oliver Schmidt d4433a7498 Replaced 10.1.1.1/8 with 192.168.0.0/24. 2013-02-16 23:04:55 +01:00
Oliver Schmidt 5ed35d5c25 Added Atari 800k (MyDOS 4.53/4) floppy image. 2013-02-05 23:06:48 +01:00
Oliver Schmidt 7760b6baac Added Apple II 3.5" floppy image. 2013-02-05 21:07:54 +01:00
Oliver Schmidt 2af9f3f26f Reorganized retro distro Makefile (and added telnetd). 2013-02-04 23:29:07 +01:00
Oliver Schmidt efeab670de Removed unnecessary -p option from mkdir calls for cmd.exe compatibility. 2013-02-03 23:47:25 +01:00
Oliver Schmidt 21407162c4 Deliver retro CBM disk images as .d64, .d71 and .d81 files. 2013-02-02 01:07:50 +01:00
Oliver Schmidt b175ba7463 Moved retro IP configuration from web site to target machine. 
Better match user expectations by allowing to download plain disk images and configure the IP settings afterwards on the target machine - then most likely leveraging DHCP. This works for the users with the most usual Ethernet adapter and settings - which are now pre-configured in default.cfg's. Only the few users with non-default Ethernet adapter and/or settings are required to download a custom contiki.cfg and inject it manually into their disk image files.
 2013-02-01 23:19:12 +01:00
Oliver Schmidt 69317ad1db Renamed retro 'dhcp-client' to 'ipconfig' as it can as well be used for interactive manual configuration. 2013-02-01 21:20:21 +01:00
Jelmer Tiete 7ce2688d84 Added support for motelist and uploading to Z1 motes under Mac OSX 2013-01-23 22:56:43 +01:00
Adam Dunkels d917d64cfb Moved the Contiki tests from the tools/cooja directory into the regression-tests/ directory 2012-12-10 01:50:01 +01:00
Fredrik Österlind eec7fcd8a8 Merge pull request #50 from crawford/wpcapslip 
Correcting wait behavior for wpcapslip tool
 2012-12-03 04:20:19 -08:00
Alex Crawford 844c550ff5 Correcting wait behavior for wpcapslip tool 
-Added a check for EAGAIN to errno (this is need to handle temporary timeouts)
-Recompiled wpcapslip6.exe
 2012-12-02 11:10:24 -08:00
Fredrik Österlind 9f6689e538 Merge pull request #13 from adamdunkels/contiki-code-style-tools 
Contiki code style tools update
 2012-11-21 02:49:32 -08:00
Fredrik Österlind 150cb33b94 Merge pull request #16 from cmorty/COOJA_DGRM 
DGRM-Related Patches
 2012-11-21 02:44:13 -08:00
Adam Dunkels f6f9df802c Updated script per suggestion by @g-oikonomou to allow script to operate on files in subdirectories 2012-11-20 20:11:39 +01:00
Adam Dunkels 9131c4183b Allow contiki-indent to operate on multiple files at once 2012-11-20 20:11:39 +01:00
Adam Dunkels c31a907ccd A small tool that shows the diff between the original file and the file produced by running it through contiki-indent 2012-11-20 20:11:39 +01:00
Nicolas Tsiftes 8b13d2ea93 The image file size must include the size of the area before the FS. 2012-11-20 12:06:27 +01:00
Niclas Finne 2f72cb043d Minor improvements of coffee-manager. 2012-11-20 10:51:39 +01:00
Adam Dunkels 6a7435e0ba Merge pull request #17 from cmorty/Cooja_automation 
Cooja automation related patches.
 2012-11-13 03:59:17 -08:00
Adam Dunkels 1db75f3b98 Merge pull request #23 from boeglin/cooja_pcap_802154 
Export Pcap as LINKTYPE_IEEE802_15_4
 2012-11-13 03:52:16 -08:00
Adam Dunkels 23f9cdd90d Merge pull request #24 from boeglin/cooja_radiologger_no 
Add a "Packet Number" column to the RadioLogger plugin
 2012-11-13 03:51:18 -08:00
Etienne Duble 7905316c54 Fix: stm32w flasher for Ubuntu 12.04 and later 2012-11-09 14:14:57 +01:00
Etienne Duble ecdbbaec9a Fix: handle stm32f-based serial interfaces (/dev/ttyACMx) 2012-11-09 14:00:16 +01:00
Alexandre Boeglin 8f9931a215 Add a "Packet Number" column 2012-11-07 17:35:08 +01:00
Alexandre Boeglin fb7dcf982b Export Pcap as LINKTYPE_IEEE802_15_4 2012-11-07 17:31:59 +01:00
Moritz 'Morty' Strübe 7bca2e23fc Cooja: Allow running the simulation without motes. 
Normally it is not possible to start a simulation without motes. While
 this nomally makes sense, it might be, that motes are added at a later
 point in time by plugins.
 Removing this requirement is not problem, as it is still not possible
 to start the simulation without registered events. Thus a plugin can now
 register an event in the future to add motes at that point of time.
 2012-10-31 17:37:12 +01:00
Moritz 'Morty' Strübe 64c0b9c241 Cooja: Fix command line override of ContikiPath 
Without the fix the command line parameter was overwritten by the simulation configuration.
 2012-10-31 17:29:07 +01:00
Moritz 'Morty' Strübe 32aa70e5cf Cooja: Allow setting a folder to search for projects 2012-10-31 17:25:15 +01:00
Moritz 'Morty' Strübe 142fa4a9a5 Cooja: Make paths more configurable 2012-10-31 17:22:13 +01:00
Moritz 'Morty' Strübe 50346251a2 Cooja: Fix missing message when running a script 2012-10-31 17:21:44 +01:00
Moritz 'Morty' Strübe a3eb42387f Cooja: Give access to uninitialized motes 2012-10-31 17:21:33 +01:00
Moritz 'Morty' Strübe becd2d4e15 Cooja: Load whole simulation before executing it in nogui mode 2012-10-31 17:21:01 +01:00
Moritz 'Morty' Strübe 3c3b25a54b Cooja, DGRM: Fix problems with out-of-range RSSI-Values. 
Certain values cause the DGRMVisualizerSkin to calculate color values
 that are out of range.
 2012-10-31 16:36:17 +01:00
Moritz 'Morty' Strübe 80e7a6fd8c Cooja: Add LQI-Support to DGRM 2012-10-31 16:36:06 +01:00
Moritz 'Morty' Strübe 610f6cba14 Cooja, DRGM: Reordered interference checks: e.g. do not interfere if on different channel 2012-10-31 16:36:00 +01:00
Moritz 'Morty' Strübe 3c9e3e1b95 Cooja: Refactored AbstractRadioMedium:update(): if -> switch 2012-10-31 16:35:45 +01:00
Moritz 'Morty' Strübe f34826f3f1 Cooja: Change indention of AbstractRadioMedium to tabs 2012-10-31 16:35:39 +01:00
Moritz 'Morty' Strübe 9b1fb12a3f Cooja, DGRM: Change DirectedGraphMedium over to DGRMDestinationRadio and fix RSSI 2012-10-31 16:35:31 +01:00
Moritz 'Morty' Strübe bed3877984 Cooja: Add LQI to DGRM 2012-10-31 16:34:19 +01:00
Sébastien Dawans af1932de61 Fixes COOJA Network Visualiser glitch when clicking on a mote 2012-10-29 13:26:44 +01:00
Adam Dunkels 944537fccf Removed all old RCS tags in the Contiki source tree. Those RCS tags are not used any more, as we are now using git to manage the Contiki source tree 2012-10-26 15:54:49 +02:00
Niclas Finne e25226f01e Use the directory of the source file as initial directory when opening file browser 2012-10-19 14:07:22 +02:00
Niclas Finne c425e51911 Added support for nested quotes in arguments when calling external commands from Cooja 2012-08-22 14:14:55 +02:00
simonduq 24dba740e2 Added support for quote-delimited arguments when calling external commands from Cooja 2012-08-22 13:32:20 +02:00
Fredrik Osterlind 947f3322ba removed unused ipdistributor code: was previously used to assign IP addresses to simulated motes, 
a decision better made by Contiki
 2012-06-11 15:52:20 +02:00
Fredrik Osterlind 8947c7a3bb reverted previous plugin name changes, instead build displayed names when menu is created 2012-06-11 15:31:39 +02:00
Niclas Finne 46d1367566 Fixed compiler unchecked warning 2012-06-08 17:06:29 +02:00
Niclas Finne 4861aadb94 Added nmenomic for the exit action 2012-06-08 16:54:39 +02:00
Adam Dunkels 5a87f2ae7c Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-06-08 14:31:36 +02:00
Adam Dunkels 107bdf116d Updated file permissions 2012-06-08 14:30:51 +02:00
Fredrik Osterlind 019b984b7a simplified SerialUI implementation: code was both complex, buggy and contained unused broken functionality (slip, tos mode) 2012-06-07 12:33:29 +02:00
Niclas Finne 6da3c03884 Added button interface for Z1 platform 2012-06-07 10:45:31 +02:00
Fredrik Osterlind 26d7a8b492 rewrote tools menu code to allow access to mote tools directly from the main menu 
mote tools can still be started from the network visualizer
 2012-06-05 17:03:07 +02:00
Fredrik Osterlind a523127b6f removed obsolete exit cooja keyboard shortcut from quick help 2012-06-05 16:52:58 +02:00
Fredrik Osterlind e78c77c965 minor bugfix: start/stop simulation keyboard shortcut was not enabled correctly 2012-06-05 14:53:05 +02:00
Fredrik Osterlind b322eda91a added support for mote interface requirements in SupportedArguments annotation 
NativeIPGateway plugin now requires an IP address mote interface
 2012-06-05 14:45:16 +02:00
Fredrik Osterlind 49b949f9db implemented zoom menu and added keyboard shortcuts 
fixed typos in quick help
 2012-06-05 14:06:30 +02:00
Fredrik Osterlind 5c2ecd1def improved workaround to disable the code editor pane's built in run functionality: remove keyboard shortcut instead of 
disabling action
 2012-06-05 13:39:21 +02:00
Fredrik Osterlind afcc7559a5 improved repaint efficiency and fixed concurrent modification bug 2012-06-05 13:16:09 +02:00
Fredrik Osterlind a8a3c7b01a fixed menu bug that caused menu items to be enabled although script was active 
reinstated title that shows whether script is active or not

fixed Ctrl+R hotkey bug that triggered an error dialog when script was inactive

remember last script disk file
 2012-06-05 12:48:21 +02:00
Fredrik Osterlind 69457c5039 removed unnecessary warning 2012-06-05 12:45:43 +02:00
Fredrik Osterlind 9c05689be0 simplified skin menu implementation, removed unused skin button code 2012-06-05 10:03:47 +02:00
Fredrik Osterlind c276f90247 removed unused code including simulation observers, making the code cleaner and more efficient 2012-06-05 09:25:45 +02:00
Adam Dunkels 4a4efd0c32 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-06-05 08:10:19 +02:00
Adam Dunkels bd86a807c8 Rewrote the traffic history visualization with blue arrows that fade 
away based on their age. Age is calculated from the simulation time
so the fade depends on the simulation speed.
 2012-06-05 08:07:47 +02:00
Adam Dunkels cce3628440 Bugfix: viewers were not correctly ticked off in the menu when a simulation was loaded from file. The current fix feels like a hack through. 2012-06-05 08:07:10 +02:00
Niclas Finne d83b461654 Added check if the interface is not available 2012-06-04 17:57:11 +02:00
Niclas Finne 997baa67d1 No longer any need to specify memory when loading firmware 2012-06-04 17:57:09 +02:00
Fredrik Osterlind ad8941bc5d added hello world simulation tests for exp5438, z1, and wismote. 
extracted test script to a separate hello-world.js, and updated the remaining hello world tests accordingly.
 2012-06-04 17:45:43 +02:00
Fredrik Osterlind 322669df63 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-06-04 17:38:19 +02:00
Fredrik Osterlind 9f42e1e261 bugfix: use new setSpeedLimit(ratio) method in simulation instead of old setDelayTime() 2012-06-04 17:37:29 +02:00
Adam Dunkels c330d8ca84 Updated imports 2012-06-04 17:23:54 +02:00
Adam Dunkels ef22d93c05 Updated menu item name to indicate that a window is opened. 2012-06-04 17:22:47 +02:00
Adam Dunkels b7fe30c2d7 Updated menu item name to indicate that a window is opened. 2012-06-04 17:22:23 +02:00
Adam Dunkels 4f21efe827 Rewrote the code to use real menus instead of relying on context menus for top-level operaions. 
The transition is not complete yet; there are still a few functions left in context menus,
such as radio medium configuration options.

Renamed the window to better match what the user sees in the window.

Updated how mote movement is implemented: the user now sees that the mote moves when the
mouse is moved.
 2012-06-04 17:17:18 +02:00
Fredrik Osterlind bc0727a931 replaced Simulation's setDelayTime(ms) method with more intuitive setSpeedLimit(ratio) 
updated Simulation Control tool to use new setSpeedLimit(), and removed unused "run until" function

updated references to old setDelayTime(ms)
 2012-06-04 16:14:05 +02:00
Adam Dunkels 92765b384e Removed traffic counters from the main canvas. 2012-06-04 14:05:42 +02:00
Adam Dunkels f66d731f8d Rewrote the script editor to use real menus instead of the custom buttons 
at the bottom of the window as was previously used.
 2012-06-04 14:02:02 +02:00
Adam Dunkels 7202c408de Rewrote the context menu and the custom left pane as menus, to make the 
window more user-friendly.
 2012-06-04 13:52:01 +02:00
Adam Dunkels e84de44f63 Reimplemented the context menu, which was difficult for newcomers to find, 
to become real menus.
 2012-06-04 13:41:43 +02:00
Adam Dunkels b50d0784e3 Set Notes window to open by default. 
Changed name of the menu item in the Tools menu.

Slightly shorter default note text.
 2012-06-04 13:40:56 +02:00
Adam Dunkels 0f10f5bd92 Reimplementation of the context menu, which was difficult for newcomers to find, 
to become real menus instead.

Renamed the tool to have a more user-centric name.

Set a new default placement of the window.
 2012-06-04 13:39:37 +02:00
Adam Dunkels d6d2a96d8f Fixed menu item name to be consistent with others 2012-06-04 13:38:49 +02:00
Adam Dunkels e90b70e601 Close window when clicking the Save button. 
Changed the buttons for moving extensions up and down from icons to text.
Added a Remove text message to the remove button, which previously was
a red X.
 2012-06-04 13:37:09 +02:00
Adam Dunkels 029a14b5be Placed the radio medium selection in the Advanced settings frame. 2012-06-04 13:36:23 +02:00
Adam Dunkels 187364560c Updated menu item name to indicate that a window is opened when selecting it. 2012-06-04 13:36:04 +02:00
Adam Dunkels 4868a172be Added an isRunnable() method that returns true if the simulation can be run. 2012-06-04 13:32:34 +02:00
Adam Dunkels bb187d7882 Set default look and feel on Linux to Nimbus. If Nimbus is not available, 
default to CrossPlatformLookAndFeel.

Updated menus to avoid having a separate Mote Types menu and instead merged
mote type creation under the Motes->Add motes menu item.

Reimplemented the menus to make it easier to follow the menu structure
from the Java implementation.
 2012-06-04 13:30:33 +02:00
Fredrik Osterlind 86f1c34692 renamed radio method isReceiverOn() to isRadioOn() 
fixed bug in Msp802154Radio causing all packets from non-802154-radios to be dropped
 2012-06-04 12:39:46 +02:00
Adam Dunkels 6d2d05b146 Ping slower to allow routes to settle 2012-06-01 16:44:42 +02:00
Fredrik Osterlind 2e8ede93cf save simulation before exit 2012-06-01 16:04:39 +02:00
Fredrik Osterlind b9f1b9b205 simplified and bugfixed Cooja's IP address interface, added two 
variables in uip-ds6.c to allow Cooja to extract addresses from memory
 2012-06-01 15:47:22 +02:00
Fredrik Osterlind ebd9573574 minor window title fix 2012-06-01 13:20:03 +02:00
Fredrik Osterlind 1873904479 fixed Tools menu mnemonic (P->T) 2012-06-01 12:26:18 +02:00
Fredrik Osterlind f703965b67 verify that visualizer skin is compatible with the current simulation before starting it, 
set udgm/dgrm/mrm radio medium skins to be started as default
 2012-06-01 12:24:30 +02:00
Fredrik Osterlind e96a375e33 extracted quick help interface to a separate file, moved plugin-specific quick help from quickhelp.txt to the plugins themselves 2012-06-01 11:50:51 +02:00
Fredrik Osterlind 1a10fa9d58 simplified the external tools configuration with a single common file that is always loaded 2012-06-01 11:17:54 +02:00
Fredrik Osterlind be52981bcc added getting started quickhelp menu item, made quick help sticky 2012-06-01 10:49:56 +02:00
Adam Dunkels ef2338d2f3 Updated control panel quickhelp 2012-05-31 22:23:57 +02:00
Adam Dunkels 3286d62eca Renamed simulation visualizers to simulation visualizers, from simulation visualizer skins 2012-05-31 18:14:36 +02:00
Adam Dunkels 13800cb7ec General cleanup and fixes of texts and labels 2012-05-31 18:05:25 +02:00
Adam Dunkels 34c2cef205 General cleanup and fixes of texts and labels 2012-05-31 18:04:40 +02:00
Adam Dunkels cb00219096 Refactored window title that was duplicated in multiple places 2012-05-31 18:01:53 +02:00
Niclas Finne f8da0ea206 Updated API for external flash for storage API in MSPSim 2012-05-31 15:40:31 +02:00
Niclas Finne 8a7f572e87 Added serial interface that looks up default serial usart from MSPSim 2012-05-31 15:40:11 +02:00
Niclas Finne 9251692eed Added Z1 platform 2012-05-31 15:40:09 +02:00
Niclas Finne 0a437bfbe1 Removed unnecessary empty mote contructors 2012-05-31 15:40:07 +02:00
Niclas Finne 9753ad1301 Added simulation as argument to moteType.getConfigXML() instead of each MoteType storing a reference to the simulation. 2012-05-31 15:40:05 +02:00
Niclas Finne d2c8cefa18 Added constructor to exception 2012-05-31 15:40:03 +02:00
Niclas Finne 4c1cff310c removed executable flags 2012-05-31 15:40:01 +02:00
Niclas Finne 15690694cb Added JCreate and Sentilla USB platforms 2012-05-31 15:39:59 +02:00
Niclas Finne d86ae8766b Added Wismote platform 2012-05-31 15:39:56 +02:00
Niclas Finne 27fabd25c0 Button interface for MSPSim button abstraction 2012-05-31 15:39:54 +02:00
Niclas Finne 6fd69ade3e Leds interface for MSPSim leds abstraction 2012-05-31 15:39:52 +02:00
Niclas Finne 9dd2327f07 Replaced MSPSim interface SkyByteRadio with Msp802154Radio to easier support other 802.15.4 radio chips than CC2420. 2012-05-31 15:39:50 +02:00
Niclas Finne 4c03780e2b Updated version of MSPSim - bug fixes and support for more platforms 2012-05-31 15:39:32 +02:00
Fredrik Osterlind b22ced2ef0 using example-specific connect-router-cooja target, to automatically build dependencies (e.g. tunslip6) 2012-05-30 15:09:20 +02:00
Fredrik Osterlind 2f757527d4 bugfix: gui-dependency caused nullpointer exception in test mode 2012-05-30 14:45:36 +02:00
Fredrik Osterlind 5788560946 updated to use the renamed examples under /examples/er-rest-example, 
using Californium CoAP to perform CoAP tests (DISCOVER and GET)
 2012-05-30 14:31:25 +02:00
Fredrik Osterlind f411da8bd8 set loopback to default network interface, improved simulation layout 2012-05-30 13:07:57 +02:00
Fredrik Osterlind 00959b891c compiling with SMALL=0 to avoid problems with Contiki's elf loader 2012-05-29 16:46:53 +02:00
Fredrik Osterlind 516e3e9b16 increased inter-rucb-transfer delay to avoid problems in lossy networks 2012-05-29 14:56:39 +02:00
Fredrik Osterlind b27c92af12 updated test: shell command echo no longer includes a newline -> updated expected final file size, improved debugging output 2012-05-29 13:50:36 +02:00
Fredrik Osterlind f916f2fe24 using loopback as default network interface 2012-05-29 11:55:24 +02:00
Fredrik Osterlind 86787df272 cleaned up more mote type visualizer code 2012-05-25 15:54:59 +02:00
Fredrik Osterlind 9e67306eee cleaned up the mote type visualizer code 2012-05-25 15:40:26 +02:00
Fredrik Osterlind ad56ac80ee added radio logger with 6lowpan filter 2012-05-25 14:50:45 +02:00
Fredrik Osterlind 4ea830ad45 cleaned up some unnecessary methods: empty mote constructors (created from mote type), setInterfaces/setMoteType methods 2012-05-24 14:06:09 +02:00
Fredrik Osterlind a437d06ba3 disable plugin menu items if not supported 2012-05-24 14:02:45 +02:00
Fredrik Osterlind 24aafe5554 disallowed starting plugins/visualizer skins for non-compatible motes/simulations 2012-05-24 13:58:12 +02:00
Niclas Finne e18cc3b6b9 Made the mote type information for MSPSim based platforms more compact 2012-05-23 17:03:45 +02:00
Niclas Finne 47d3425aab Made exception static and added constructor with exception cause 2012-05-23 15:49:25 +02:00
Niclas Finne bea1b8d3a1 Added simulation as argument to moteType.getConfigXML() instead of each MoteType storing a reference to the simulation. 2012-05-23 15:42:22 +02:00
Niclas Finne 3da733ac55 Throw exception for unknown mote type 2012-05-23 15:19:19 +02:00
Fredrik Osterlind 50caa3650c new experimental feature: possibility to change mote types when loading a simulation 
made compile dialogs only select mote interfaces specified in the loaded configuration
 2012-05-23 14:59:41 +02:00
Fredrik Osterlind c651604a4f default compiler set to mingw32-gcc (verified to work on version 4.5.2/4.6.2), removed obsolete -mno-cygwin flags when compiling under cygwin 
added default visualizer skins
 2012-05-23 12:28:24 +02:00
Fredrik Osterlind ddef6c6b76 improved debugging output 2012-05-23 12:27:37 +02:00
Fredrik Osterlind af62e48103 resizable dialog 2012-05-23 12:26:45 +02:00
Maxim Osipov f2f6a7bd53 Fix command line handling in tunslip6 
Signed-off-by: Maxim Osipov <maxim.osipov@gmail.com>
Signed-off-by: Mariano Alvira <mar@devl.org>
 2012-05-15 17:16:42 -04:00
Fredrik Osterlind 55ff294aef Demo simulation and nightly test of rpl border router and coap rest server, based on the simulation example in 
/examples/er-rest-example. Uses tunslip6, ping, wget, and dapaulid's open source JCoAP java library (download needed).
 2012-05-10 16:22:49 +02:00
Fredrik Osterlind a69b580778 Added new annonation with which Cooja components (e.g. mote plugins) can be activated 
or deactivated depending on the given argument (e.g. mote). This may for
example be used by a mote plugin that only accepts emulated motes, and that
consequently should be hidden in other non-emulated motes' plugin menues.

The new annotation is currently only used by the MspCodeWatcher and the DGRM visualizer skin.
 2012-05-09 13:47:03 +02:00
Fredrik Osterlind 8fd51cd889 bugfix: breakpoints should only trigger once 
updated watchpointmote method to return executable address, not wrapped in an object
 2012-05-09 13:04:35 +02:00
Fredrik Osterlind 85322ce03b removed debugging output 2012-05-09 09:47:07 +02:00
Moritz 'Morty' Strübe b3e7a4e8f7 Make the ScriptLog interface public. This is needed for OpenJDK 2012-05-08 14:02:02 +02:00
Niclas Finne b7c28a48b0 Makefile for Sky tools 2012-05-07 22:55:27 +02:00
Laurent Deru d40b1116f8 Fix for baudrate and ifconfig on MacOS X 2012-05-07 13:16:57 +02:00
Niclas Finne 40595ad5c7 Support for serialdump on MacOS X. Patch by Laurent Deru. 2012-05-07 13:16:27 +02:00
Laurent Deru cc863e7bd4 Sky motelist support for MacOS X 2012-05-07 11:18:09 +02:00
Fredrik Osterlind 99b17092e4 bugfixed race condition 2012-05-02 16:04:16 +02:00
Fredrik Osterlind 34e7de389c avoid exception when cooja runs in testmode 2012-05-02 14:07:44 +02:00
Fredrik Osterlind baa5e67ef1 added possibility to save default visualizer skins 2012-04-24 11:19:54 +02:00
Adam Dunkels cf9de6be25 Set executable flag on binaries 2012-04-22 20:53:10 +02:00
Niclas Finne f328a8a483 Stop the CPU when a breakpoint is triggered 2012-04-20 21:48:12 +02:00
Niclas Finne 7628652a9d Updated for new listener API in MSPSim 2012-04-20 21:48:10 +02:00
Niclas Finne 26e7698d32 Updates for latest MSPSim memory API 2012-04-20 21:48:07 +02:00
Niclas Finne 28f8467ab1 Updated MSPSim plugin for new memory model in MSPSim 2012-04-20 21:48:04 +02:00
Niclas Finne b79eb23851 Updated version of MSPSim - several bug fixes and new memory model 2012-04-20 21:47:25 +02:00
Moritz 'Morty' Strübe 74b2751072 Fix building of powertracker 2012-04-10 16:12:17 +02:00
Fredrik Osterlind 88eafcf479 example script demonstrating how to interface powertracker plugin 2012-04-10 13:52:12 +02:00
Fredrik Osterlind 6dd1c42e8d added powertracker plugin as default cooja plugin. the powertracker plugin was previously available via contiki projects. 2012-04-10 12:45:11 +02:00
David Kopf cac4e9a222 Add clock_delay_us and clock_set_seconds to clock.h. Modify clock_wait to use clock_time_t. 
Remove the troublesome avr/dev/delay.* files.
Add PLATFORM_NAME and combine the confusing *_REVISION defines into a single PLATFORM_TYPE
 2012-04-09 15:49:53 -04:00
Fredrik Osterlind 173f512f6c disable editor when no source code is showing 2012-03-28 14:53:45 +02:00
Fredrik Osterlind e3a12703da added temporary workaround that removes file duplicates, removed warning message 2012-03-28 14:52:30 +02:00
Fredrik Osterlind 4222d0adcd bugfixed parsing of files read from mspsim 2012-03-28 14:44:59 +02:00
Fredrik Osterlind 0c94b567b9 supporting multiple path substituion rules in mspcodewatcher 2012-03-28 12:29:54 +02:00
Fredrik Osterlind 65b5fd0dde documenting potential bug 2012-03-28 12:28:25 +02:00
Fredrik Osterlind 7c2b6238fe code style 2012-03-28 11:01:17 +02:00
Moritz 'Morty' Strübe 3c3610d9cc Allow setting a log4j config file 2012-03-28 10:55:01 +02:00
Fredrik Osterlind 21663c1033 removed debugging output 2012-03-28 10:45:12 +02:00
simonduq ea85cc1396 added motelist-linux for stm32w platforms 2012-03-26 23:00:42 +02:00
Fredrik Osterlind c78b5bad5c some bugfixes regarding timeouts in test scripts, with simplified code 2012-03-23 15:14:24 +01:00
Fredrik Osterlind a9e36b0365 quickfix to allow running in headless mode 2012-03-23 09:55:36 +01:00
Fredrik Osterlind 042c75e52c ensure mouse-triggered event popups are not outside screen, updated to use new watchpoint interface 2012-03-21 16:59:42 +01:00
Fredrik Osterlind dcd0460e0b using jsyntaxpane as javascript editor, added ui controls to link test scripts to a file on disk 2012-03-21 16:59:08 +01:00
Fredrik Osterlind 7cfa8e28d3 reworked MspCodeWatcher plugin: using jsyntaxpane to display Contiki code, using tabs instead of splitpanes, easier to 
configure watch-/breakpoints, lots of bug fixes and minor improvements
 2012-03-21 16:58:26 +01:00
Fredrik Osterlind 2e583c733e mspsim motes now implements new WatchpointMote interface, simplified code 2012-03-21 16:57:04 +01:00
Fredrik Osterlind 088f2e12a8 simplified usage of Watchpoint and WatchpointMote interfaces 2012-03-21 16:56:32 +01:00
Fredrik Osterlind 090d77c5a2 added jsyntaxpane library, to be used by MspCodeWatcher and the Contiki Test Editor plugins 2012-03-21 16:56:04 +01:00
Fredrik Osterlind 9b267036a4 send empty packet if node reboots during transmission 2012-03-12 14:34:06 +01:00
Fredrik Osterlind 512d757d59 added missing objcopy external paths config 2012-03-09 15:55:19 +01:00
Fredrik Osterlind 2c486aacd7 radio medium bugfix: a combination of changing channels while radio is off and with a nearby ongoing transmission, and 
then immediately turning on the radio caused it to incorrectly detect the ongoing transmission (bug reported by Beshr Al Nahas)
 2012-03-09 15:23:16 +01:00
Fredrik Osterlind babcc76757 rewrote code completely: 
lots of bugfixes and improved code
added support for monitoring pointers
added new integer buffer type
 2012-03-09 14:58:56 +01:00
Fredrik Osterlind bf39b411c9 added support for readonly memory sections 
updated to use new SectionMoteMemory with address space offset
code cleanup
 2012-03-09 14:58:43 +01:00
Fredrik Osterlind b49d1892f2 updated contiki mote compiler tests to again reflect contiki-cooja-main.c and the updated ContikiMoteType 2012-03-09 14:58:23 +01:00
Fredrik Osterlind eba1079991 added target to force running cooja in 64-bit mode 2012-03-09 14:58:04 +01:00
Fredrik Osterlind 295bb8b70f added memory monitor stubs to avr memory 2012-03-09 14:57:54 +01:00
Fredrik Osterlind f8134186da implemented memory monitor support (moved previous functionality from MspMote to MspMoteMemory) 2012-03-09 14:57:44 +01:00
Fredrik Osterlind e8294e8699 added objcopy external tools configuration 
changed nm command to sort numerically, and changed regexpressions to accept output from newer gcc versions
added more debugging info under help menu
 2012-03-09 14:57:21 +01:00
Fredrik Osterlind 902200f12a using memory monitor instead of previously used time events 2012-03-09 14:57:10 +01:00
Fredrik Osterlind 85323adc1e added support for mapping Cooja motes' and Contiki's address 
implemented poll-based memory monitor support
improved code
 2012-03-09 14:56:53 +01:00
Fredrik Osterlind 129a854b54 all mote memories now support symbol addresses 
added memory monitor methods (was previously only supported by emulated motes)
 2012-03-09 14:56:09 +01:00
Fredrik Osterlind ab39b84010 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-03-09 13:34:37 +01:00
Fredrik Osterlind 86a6d296fe added mote interface method to be called when add mote interfaces have been added. useful if the mote interfaces want to observe each 
other
 2012-03-06 14:33:14 +01:00
Fredrik Osterlind bef1a013f1 improved code: uses log mote interfaces observers directly, instead of going via the sim event central 2012-03-06 14:30:39 +01:00
Niclas Finne 5288ac12b5 Deferred mote height calculation until components are initialized 2012-03-06 12:47:53 +01:00
Fredrik Osterlind 1d13e93db7 capturing exceptions from radio logger - some packet analyzers seems to be buggy 2012-03-06 09:47:34 +01:00
Fredrik Osterlind 485ef0cd79 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-03-06 09:25:03 +01:00
Fredrik Osterlind e22bf837fc bugfix: mspsim may not have pc information, causing exception in buffer listener 
bugfix: mote interfaces were incorrectly initialized twice, causing an mote id error in tinyos
 2012-03-06 09:23:29 +01:00
Fredrik Osterlind ea42d590ea removed unnecessary overrided methods 2012-03-06 09:22:12 +01:00
Fredrik Osterlind a243dad433 minor bugfix: side panel height was wrong when plugin started 2012-03-06 09:18:44 +01:00
Fredrik Osterlind a84dc139ea avoid awt thread floods from mspsim cli output 2012-03-01 17:02:40 +01:00
Fredrik Osterlind 28bdc2fb50 bugfixed stacktrace tooltip 2012-03-01 16:37:26 +01:00
Fredrik Osterlind 656251a6af new mspsim.jar, supporting the recent changes in bufferlistener 2012-03-01 15:28:07 +01:00
Fredrik Osterlind 8229cb8982 using new mspsim cli api 2012-03-01 15:25:17 +01:00
Fredrik Osterlind 268608f7e3 improved mspsim-connected regarding command handlers and context, implemented stack track method 2012-03-01 15:24:32 +01:00
Fredrik Osterlind 681fe65c04 added stack trace method stub 2012-03-01 15:23:25 +01:00
Fredrik Osterlind fbb1a56c95 possibility to disable individual columns from auto-resize 2012-03-01 15:22:32 +01:00
Fredrik Osterlind 383d277277 improved source info, added optional stack trace tooltip 2012-03-01 15:21:06 +01:00
Joakim Eriksson 1637a807e2 fixed compilation error 2012-02-29 16:45:05 -08:00
David Kopf 358530e1d3 Add higher baud rates, option for link-local address assignment 2012-03-02 15:28:26 -05:00
Niclas Finne f891774c1f Deferred listening on memory until after mote id has been set 2012-03-06 15:35:16 +01:00
David Kopf 6e45dfe5ff PROGMEM changes needed for newer avr-gcc compiler 2012-02-21 11:10:57 -05:00
Nicholas J Humfrey aa67ad67cc Converted u8_t to uint8_t and u16_t to uint16_t in the docs and tools directories. 2012-02-21 08:33:25 -05:00
Fredrik Osterlind 2c9316c5fa more informative error messages at simulation error 2012-02-16 15:51:32 +01:00
Oliver Schmidt cb12d7b745 Minor formatting adjustment. 2012-02-10 18:56:40 +01:00
Oliver Schmidt f5debc9d42 Adjusted relative path to BREADBOX64 to work when 'contiki' and 'contikiprojects' are siblings. 2012-02-10 17:19:40 +01:00
Niclas Finne b56198dc3c Added option to read sensor data from TCP connection 2012-02-02 17:38:33 +01:00
Fredrik Osterlind 06d5d49e50 fix: test failed since shell echo no longer appends a newline 2012-01-31 12:58:07 +01:00
Fredrik Osterlind 02336c8826 new mspsim.jar with msp430x 2012-01-31 11:04:55 +01:00
Niclas Finne 784ca301f8 Updated for latest coffee-manager 2012-01-30 22:20:46 +01:00
nvt 66868253f0 Enable debug. 2012-01-28 03:34:41 +01:00
nvt 4c75a250e6 Refactoring. 2012-01-28 03:34:16 +01:00
Fredrik Osterlind a7e4fa3436 bleeding edge mspsim.jar 2012-01-26 16:21:56 +01:00
Fredrik Osterlind 4653778e8c minor bug fix to avoid need for updating filesystem twice initially 2012-01-26 16:19:01 +01:00
Fredrik Osterlind 4e1432af97 method for emptying simulation event queue 2012-01-26 16:18:13 +01:00
Fredrik Osterlind 3a02e43e09 save command history with configs 2012-01-26 16:16:02 +01:00
Fredrik Osterlind 207fddddf0 method that returns the next wakeup time 2012-01-26 16:14:20 +01:00
Fredrik Osterlind caade67d62 new watchpoint api, and method that allows for manipulating simulation time without affecting the 
mote
execution
 2012-01-26 16:10:11 +01:00
Fredrik Osterlind 5bcb6ad8a5 updated to mspsims new watchpoint api 2012-01-26 16:09:31 +01:00
Fredrik Osterlind 681b40c3c1 public clean method, and broke out add log messages method 2012-01-26 16:03:41 +01:00
Fredrik Osterlind 08ba0b83dc make clean method public 2012-01-26 16:03:01 +01:00
Fredrik Osterlind 2a86f7a5ad help method for converting from hex string to binary 2012-01-26 16:01:32 +01:00
Fredrik Osterlind c67954c773 activated exp5438 platform in cooja 2012-01-18 21:44:36 +01:00