1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Commit Graph

11 Commits

Author SHA1 Message Date
Oliver Hahm
bf85e4902c Merge branch 'rpl' of ssh://ukleos.org:2222/home/git/ukleos
Conflicts:
	board/msba2-common/tools/src/control_2xxx.c
	drivers/cc110x/cc1100-interface.h
	projects/test_rpl/main.c
	sys/include/vtimer.h
	sys/net/sixlowpan/rpl/Jamfile
	sys/net/sixlowpan/rpl/objective_functions.c
	sys/net/sixlowpan/rpl/objective_functions.h
	sys/net/sixlowpan/rpl/of0.c
	sys/net/sixlowpan/rpl/of0.h
	sys/net/sixlowpan/rpl/rpl.c
	sys/net/sixlowpan/rpl/rpl_dodag.c
	sys/net/sixlowpan/rpl/rpl_structs.h
	sys/net/sixlowpan/rpl/trickle.c
	sys/net/sixlowpan/sixlowmac.c
	sys/vtimer/vtimer.c
2013-06-28 17:53:21 +02:00
Oliver Hahm
c8bee9e554 fixed coding style (space after most keywords) 2013-06-24 22:37:35 +02:00
Oliver Hahm
5c52e1ce2e coding conventions for most of system libraries 2013-06-22 05:11:53 +02:00
Martin
43255ff855 fix warnings due to unapropriate prototypes 2013-06-10 17:36:56 +02:00
Stephan Arndt
adfc3306ab WARNING: BROKEN COMMIT added not working etx_beaconing into rpl, added small vtimer debug changes, changed cc1100 default mode 2013-03-15 17:48:13 +01:00
Stephan Arndt
644d6de364 changed rank calculation in OF0 and some other things. WARNING: this commit might break the rpl implementation for now, if a rollback is needed, choose an earlier commit than this 2013-02-21 18:23:36 +01:00
Stephan Arndt
812dafde77 deleted unused 'old_main' function 2012-12-04 15:12:12 +01:00
Eric Engel
f85d1968c4 RPL Routing finished 2012-02-26 19:30:48 +01:00
Eric Engel
d766e41996 Joined nodes now send DIOs, some minor bugfixes, routing table stubs 2012-02-14 22:22:01 +01:00
Eric Engel
445fb4450f Corrected Jamfiles, no more direct call of rpl functions from sixlowip 2012-01-26 20:26:55 +01:00
Eric Engel
550c829f0d added incomplete rpl 2012-01-19 17:35:50 +01:00