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

1186 commits

Author SHA1 Message Date
Moritz 'Morty' Strübe 50fe1e7046 Also remove uninitialized motes 2014-03-20 14:51:05 +01:00
Fredrik Österlind 602928d948 Merge pull request #533 from g-oikonomou/cooja-pcap-timestamp-fix 
Fix Cooja PCAP packet header timestamps
 2014-02-21 13:41:15 +01:00
Fredrik Österlind 3fe2890ddf Merge pull request #565 from cmorty/pull/backwards 
Fix backwards compatibility (and docs)
 2014-02-21 13:35:09 +01:00
Fredrik Österlind 4fe17ef17f Merge pull request #568 from ejoerns/pull-req/cooja-udgmvis 
[Cooja] Made UDGMVisualizerSkin closable
 2014-02-21 13:01:23 +01:00
Fredrik Österlind 140b55d8f7 Merge pull request #567 from ejoerns/pull-req/vis-scroll 
[Cooja] Mouse wheel zooming for Visualizer
 2014-02-21 12:55:13 +01:00
Enrico Joerns 465b0ddfbe [cooja] pluings/skings/UDGMVisualizerSkin: Replaced unclosable Box implementation of JSpinner menus by JInternalFrame based variant. 2014-02-20 22:55:36 +01:00
Enrico Joerns 80b78ae6dd cooja: plugins/Visualizer: Implemented mouse wheel zooming with mouse coordinates as center 2014-02-20 16:56:49 +01:00
Enrico Joerns 90ab2e7051 cooja: interfaces/RimeAddress: renamed rimeaddr_node_addr to linkaddr_node_addr 2014-02-20 16:45:40 +01:00
Moritz 'Morty' Strübe 19e7611061 Fix backwards compatibility 2014-02-20 13:57:32 +01:00
Moritz 'Morty' Strübe 8dd4025248 Fix documentation 2014-02-20 13:57:22 +01:00
Sebastian Schinabeck c22f1ea6f1 Cooja: allow setting RSSI while sending and silence 
It is now possible to set the RSSI while the radio is sending or when
no radiodata is received. This is now supported by all radiomediums
exept MRM. This also includes a GUI to configure the values.
 2014-02-19 18:22:31 +01:00
George Oikonomou 10a73c9380 Fix PCAP packet header timestamp 2014-01-22 17:32:08 +00:00
Sebastian Schinabeck 86320d74ed Stopped to load plugins depending on simulations if there is no simulation 2014-01-21 15:02:46 +01:00
Laurent Deru 957be0a9be Allow user configuration of RadioLogger pcap file 2013-11-27 14:05:45 +01:00
Laurent Deru fa2dd5baec Allow configuration of pcap output file 2013-11-27 14:05:45 +01:00
Eugen Berlin a415c2bb1b Fix: preserving blank characters (tabulator and space) in Cooja serial output 2013-11-26 16:43:31 +01:00
Sébastien Dawans 700994ec1c Cooja Pcap export: Reverts PR #284 to fix #420 2013-11-25 16:36:49 +01:00
Sebastian Schinabeck 1ef80859ea start DGRMVisualizerSkin in cooja_default.config now 
instead of starting in DirectedGraphMedium
 2013-11-22 17:01:44 +01:00
Sebastian Schinabeck 123a7081f2 start DGRM plugin with cooja_default.config 
start the DGRMconfigurator within the cooja_default.config instead of starting in DirectedGraphMedium.java
 2013-11-22 17:01:44 +01:00
Fredrik Österlind c98b55b5e0 Merge pull request #338 from cmorty/Cooja-Make-updateGUIComponentState-public 
Cooja: Make updateGUIComponentState public.
 2013-11-22 02:30:11 -08:00
Sebastian Schinabeck 4deb687209 deleted unneeded if 
getStringArrayValue never returns null
 2013-11-21 15:25:52 +01:00
Moritz 'Morty' Strübe 3359a86d29 Move call to updateGUIComponentState from doAddMotes to addMote 2013-11-20 18:00:16 +01:00
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
Yvonne-Anne Pignolet 83ae37b48e Add access to LQI and RSSI to Contiki motes 2013-11-18 15:05:23 +01:00
Moritz 'Morty' Strübe 56afc6d437 Allow setting random seed as parameter 2013-11-06 17:41:53 +01: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 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 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 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 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
Laurent Deru d1f12638b4 Bugfix: Corrected wireshark bad FCS errors in COOJA Pcap export 2013-06-24 13:18:03 +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
Fredrik Österlind 150cb33b94 Merge pull request #16 from cmorty/COOJA_DGRM 
DGRM-Related Patches
 2012-11-21 02:44:13 -08: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
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
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 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 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
Adam Dunkels c330d8ca84 Updated imports 2012-06-04 17:23:54 +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