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

2212 commits

Author SHA1 Message Date
Laurent Deru
fa2dd5baec Allow configuration of pcap output file 2013-11-27 14:05:45 +01:00
Fredrik Österlind
c99a76747c Merge pull request #469 from eberlin/cooja-tab-char 
Fix: preserving blank characters (tabulator and space) in Cooja serial output
 2013-11-27 00:45:39 -08:00
Nicolas Tsiftes
db4cada4e7 Merge pull request #462 from adamdunkels/push/no-reserved-double-inclusion-defines 
Remove all leading double underscore inclusion #defines
 2013-11-26 14:26:37 -08: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
Adam Dunkels
bb2dcaa057 A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix 2013-11-24 20:20:11 +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
Fredrik Österlind
fb84f65ba2 Merge pull request #447 from darki2002/unneeded_if 
Cooja: deleted unneeded if in Visualizer.java
 2013-11-22 01:53:21 -08:00
Oliver Schmidt
737d5fd6dc Replaced web configurator with target-based ethconfig. 2013-11-21 21:57:42 +01: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
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