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

8892 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam Dunkels
9f2e233770 The RPL_PARENT_COUNT() macro doesn't exist anymore - use the uip_ds6_nbr_num() function instead 2013-11-24 15:17:53 +01:00
Adam Dunkels
b0460317b8 Moved variable declaration to the start of the function block 2013-11-24 15:17:52 +01:00
Adam Dunkels
faff1c2a7e Preliminary support for RPL node types. This change allows a node to be in any of three given types: 
* Mesh: this is the normal case. Nodes route data on behalf of others and the node can be reached via a DAO route.
* Leaf: the node does not route data on behalf of others, but others can route data to the node (it has a RPL DAO route).
* Feather: this is a new type of node. A feather node routes data on behalf of others, but does not install DAO routes in the network. Feather nodes allow having a larger number of nodes than the RPL network can sustain in terms of routing tables.

This commit introduces the RPL node types and the feather mode, but does not add support for the leaf node type.
 2013-11-24 15:17:52 +01:00
Adam Dunkels
af24d07848 Forward no-path DAOs up the tree to allow the root to repair the network if needed 2013-11-24 15:17:52 +01:00
Adam Dunkels
9039b0ecd8 Remove references to the now unused dag->parents list 2013-11-24 15:17:52 +01:00
Adam Dunkels
4e6fe7dda6 Add a neighbor table entry if a DAO is received from a node where we don't yet have a neighbor table entry. 2013-11-24 15:17:52 +01:00
Adam Dunkels
490791eaa4 Add a check for the case when the parent neighbor may have gone away to avoid using a NULL pointer 2013-11-24 15:17:52 +01:00
Adam Dunkels
0ed7db0f9b Slight improvements in debug messages 2013-11-24 15:17:52 +01:00
Adam Dunkels
fc1adec1b8 Made it a bit more clear what function that gets called when a neighbor is removed 2013-11-24 15:17:51 +01:00
Adam Dunkels
61ea7fbb1c RPL DAO timers and management: 
* Added a DAO lifetime timer that sends out a new DAO after half the lifetime of the DAO. This allows implementing DAO route soft state that avoids routing tables in the network keeping stale routes for ever.
* Added ways to schedule a new DAO transmission as well as cancelling an active DAO transmit timer, which makes it possible to do nodes that don't send DAOs.
 2013-11-24 15:17:51 +01:00
Adam Dunkels
e09ff3ff1e Merge pull request #438 from adamdunkels/push/cleanup-platforms 
Massive platform cleanup
 2013-11-24 01:59:53 -08:00
Fredrik Österlind
2133c1d777 Merge pull request #449 from darki2002/cooja_default.config 
Start DGRMConfigurator and DGRMVisualizerSkin in cooja_default.config
 2013-11-24 01:09:26 -08:00
George Oikonomou
f3f1b8c90d Merge pull request #458 from adamdunkels/push/cc2538-rf 
CC2538 RF core additions
 2013-11-23 07:13:06 -08:00
Adam Dunkels
1ab28e4668 Added missing argument declaration 2013-11-23 15:05:16 +01:00
Adam Dunkels
e95236b642 Added header declarations for cc2538_rf_read_rssi() and cc2538_rf_set_promiscous_mode() 2013-11-23 15:05:16 +01:00
Adam Dunkels
76f2a10c9a Added a function for setting promiscous mode on the CC2538 RF core 2013-11-23 15:05:15 +01:00
Adam Dunkels
473d519926 Added a way to obtain the RSSI from the CC2538 RF core 2013-11-23 15:05:15 +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
Adam Dunkels
27433244a9 The pc-6001 platform was the last z80 platform in the tree, so we'll remove the cpu/z80 directory too 2013-11-22 16:33:46 +01:00
Adam Dunkels
52a0b4594f Removed the old esb regression tests 2013-11-22 16:33:46 +01:00
Adam Dunkels
cb8fc35e25 Removed the redbee platforms 2013-11-22 16:33:06 +01:00
Adam Dunkels
eb99534c43 Removed the stk500/stk501 platforms 2013-11-22 16:33:06 +01:00
Adam Dunkels
d68ce09fd5 Removed the stepper-robot platform 2013-11-22 16:33:06 +01:00
Adam Dunkels
13117203e0 Removed pc-6001 platform 2013-11-22 16:33:05 +01:00
Adam Dunkels
44370be06f Removed old, unused msp430-based platforms 2013-11-22 16:33:05 +01:00
Adam Dunkels
5f7b75d660 Merge pull request #452 from AriZuu/uip6-udp-stats-twice-fix 
Received UDP packet was counted twice in statistics, first in udp_input ...
 2013-11-22 07:18:47 -08:00
Adam Dunkels
6265219775 Merge pull request #453 from adamdunkels/push/travis-fix 
Fix broken travis
 2013-11-22 02:36:09 -08: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
Adam Dunkels
df7c4131b5 After travis updated to jdk 1.7.0_45 we have to run java -Xshare:dump before running the Cooja tests 2013-11-22 11:07:26 +01: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
Ari Suutari
c1c64dd1cc Received UDP packet was counted twice in statistics, first in udp_input and then again in udp_found. 
Fix this to use same logic as in uip.c: valid packet is counted only in udp_found.
 2013-11-22 08:16:05 +02:00
Oliver Schmidt
dbe074bdaf Merge pull request #451 from oliverschmidt/master 
Replaced web configurator with target-based ethconfig.
 2013-11-21 13:08:58 -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
Adam Dunkels
b5f4588e56 Loaded the simulation files in Cooja and saved them again to avoid them having any non-backward-compatible constructs in them. 2013-11-20 23:03:50 +01:00
Oliver Schmidt
79f97981fb Merge pull request #446 from oliverschmidt/master 
Show current IP config on startup.
 2013-11-20 13:34:53 -08:00
Oliver Schmidt
3abd5d3d8d Show current IP config on startup. 2013-11-20 22:33:11 +01:00
Oliver Schmidt
0ac3e0f924 Merge pull request #445 from oliverschmidt/master 
Reduce travis overhead for testing 6502 ports.
 2013-11-20 12:38:24 -08:00
Oliver Schmidt
1f8fbbd161 Reduce travis overhead for testing 6502 ports. 
- build cc65 libraries only for target supported by Contiki
- instead of building all examples for all 6502 targets build
  - all examples for one target (c64)
  - the most demanding client example (webbrowser) for all 6502 targets
  - the most demanding server examples (webserver) for all 6502 targets
 2013-11-20 21:17:43 +01:00
Oliver Schmidt
e5a0f2d663 Merge pull request #444 from oliverschmidt/master 
Changed handling of predefined macros in cc65 allows for simplification.
 2013-11-20 11:59:55 -08:00
Oliver Schmidt
1fdeb4c788 Changed handling of predefined macros in cc65 allows for simplification. 2013-11-20 20:55:56 +01:00
Moritz 'Morty' Strübe
3359a86d29 Move call to updateGUIComponentState from doAddMotes to addMote 2013-11-20 18:00:16 +01:00
Adam Dunkels
2e257eff9b Merge pull request #439 from fros4943/feature-contiki-org-refactoring 
Cooja cleanup
 2013-11-20 08:25:13 -08: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
George Oikonomou
f13af20f12 Merge pull request #409 from ADVANSEE/cc2538-spi 
cc2538: spi: Bug fix and various improvements
 2013-11-20 06:51:26 -08:00
Oliver Schmidt
38e8d8bde0 Merge pull request #443 from g-oikonomou/6502-travis 
Add 6502 tests to travis
 2013-11-20 06:39:24 -08:00