Christian Mehlis
|
9549c29ccb
|
fix missing includes
|
2013-06-30 01:53:53 +02:00 |
|
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
|
57cc002c67
|
Merge branch 'wsn430'
Conflicts:
core/include/queue.h
core/queue.c
cpu/msp430-common/hwtimer_cpu.c
cpu/msp430x16x/hwtimer_msp430.c
sys/lib/hashtable.c
sys/net/ieee802154/ieee802154_frame.c
sys/shell/commands/sc_cc110x_ng.c
sys/transceiver/transceiver.c
sys/vtimer/vtimer.c
|
2013-06-25 15:33:40 +02:00 |
|
Oliver Hahm
|
c8bee9e554
|
fixed coding style (space after most keywords)
|
2013-06-24 22:37:35 +02:00 |
|
Oliver Hahm
|
167328d4b3
|
replaced printf formatter with generic macro
|
2013-06-24 14:08:40 +02:00 |
|
Oliver Hahm
|
5c52e1ce2e
|
coding conventions for most of system libraries
|
2013-06-22 05:11:53 +02:00 |
|
Christian Mehlis
|
8faf6b77b6
|
add a print function for timex and vtimer
|
2013-06-14 20:38:27 +02:00 |
|
Oliver Hahm
|
4eb05e24fe
|
fixed debug line
|
2013-06-14 19:42:12 +02:00 |
|
Oliver Hahm
|
fdd1d21e8d
|
Merge branch 'master' into wsn430
|
2013-06-14 19:41:23 +02:00 |
|
Christian Mehlis
|
4d8783e023
|
use out parameter for vtimer_now
|
2013-06-13 10:23:47 +02:00 |
|
Oleg Hahm
|
545c786375
|
Merge branch 'master' of git://github.com/overflowed/RIOT into overflowed-master
|
2013-06-07 17:28:46 +02:00 |
|
Oleg Hahm
|
b515c4b957
|
* added TODO comment
|
2013-06-07 17:22:22 +02:00 |
|
Milan Babel
|
edb34b73c0
|
fixes for the wsn430
fixed vtimer for the msp430
added spi module for the wsn430 v1.3b
changed some variables to uintXX_t, fixes overflow on msp430
|
2013-06-06 08:35:17 +02:00 |
|
Oliver Hahm
|
7a4dec1830
|
* replaced new Makefile name in Makefiles
|
2013-03-09 23:47:21 +01:00 |
|
Oliver Hahm
|
5ffe5a9c27
|
* renamed makefiles to Makefile
|
2013-03-09 23:45:56 +01:00 |
|
Oleg Hahm
|
5df0bd0cc4
|
* updated and integrated makefiles
* added some auto dependencies
|
2013-02-08 17:37:02 +01:00 |
|