RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity
785 Commits 40 Branches 189 Tags 262 MiB
9549c29ccb
Commit Graph

785 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Christian Mehlis
68d48ed8e3 use bitwise or here 2013-06-26 00:54:06 +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
5bae4f841d added one-time-initialization guard to transceiver 2013-06-24 22:12:57 +02:00
Oliver Hahm
79ff4f1cfc updated sixlowpan configuration and minor coding style 2013-06-24 22:12:04 +02:00
Oliver Hahm
f2ec1009af fixed some struct issues (broken by cc fixes) 2013-06-24 14:11:30 +02:00
Oliver Hahm
c1ec60eaf6 * removed rtc from sixlowpan 
* fixed some struct issues
 2013-06-24 14:10:53 +02:00
Oliver Hahm
1750d5ba0f fixed some struct issues (broken by cc fixes) 2013-06-24 14:09:33 +02:00
Oliver Hahm
167328d4b3 replaced printf formatter with generic macro 2013-06-24 14:08:40 +02:00
Oliver Hahm
d01fd9a508 final coding convention fixes 2013-06-22 17:58:19 +02:00
Oliver Hahm
5c52e1ce2e coding conventions for most of system libraries 2013-06-22 05:11:53 +02:00
Oliver Hahm
f359453083 fixed doxygen value 2013-06-21 22:37:14 +02:00
Oliver Hahm
e2130fbd47 coding conventions for drivers 2013-06-21 22:36:48 +02:00
Oliver Hahm
201f593641 more coding convention fixes 2013-06-21 04:00:45 +02:00
Oliver Hahm
5d70656343 fixed coding conventions (mostly by astyle) 2013-06-21 03:52:57 +02:00
Oliver Hahm
ffeb6f8523 fixed coding conventions (correctly this time) 2013-06-20 18:18:29 +02:00
Oliver Hahm
6ca6ae9811 Merge branch 'master' of github.com:RIOT-OS/RIOT 2013-06-20 15:03:34 +02:00
Oliver Hahm
c6ace1bdbb some coding style fixes for timex.c 2013-06-20 14:59:42 +02:00
Oliver Hahm
3d85573f9d add kernel headers to default include path 2013-06-20 14:53:20 +02:00
Oleg
7a28170927 Merge pull request #56 from Kijewski/printf-warnings 
Use inttypes.h in sc_cc110x_ng.c
 2013-06-20 05:48:41 -07:00
Rene Kijewski
0212ab36a7 Use inttypes.h in sc_cc110x_ng.c 2013-06-18 17:46:18 +02:00
Oliver Hahm
b571286574 * fixed typo 2013-06-18 17:26:53 +02:00
Oliver Hahm
ac10da4509 Merge branch 'fixes-06-14' of git://github.com/mehlis/RIOT into mehlis-fixes-06-14 2013-06-18 17:25:44 +02:00
Oliver Hahm
0d6d8390c0 * updated copyright and license headers in various files 2013-06-18 17:21:38 +02:00
Oliver Hahm
3d124ec6a7 * updated LICENSE file from GPL to LPGL 2013-06-18 17:19:53 +02:00
Christian Mehlis
608fb5582b fix printf patterns 2013-06-16 14:13:38 +02:00
Christian Mehlis
1fcc5c8ed8 fix bad vtimer_now call 2013-06-16 14:13:02 +02:00
Christian Mehlis
79d55760fd add missing spaces 2013-06-15 22:00:59 +02:00
Christian Mehlis
8faf6b77b6 add a print function for timex and vtimer 2013-06-14 20:38:27 +02:00
Christian Mehlis
d4ea8664ee add missing ; 2013-06-14 20:37:39 +02:00
Christian Mehlis
5d587e34eb fix sixlowpan includes 2013-06-14 20:37:07 +02:00
Christian Mehlis
a66a193f99 fix printf pattern 2013-06-14 20:36:31 +02:00
Christian Mehlis
3ab669578c do includes the right way (for riot includes) 2013-06-14 20:33:28 +02:00
Martin
d32b785816 fix inserted explicit typecasting to ucontext_t* at assignment 2013-06-14 20:21:22 +02:00
Martin
0dd314afbb fix multiple definition of TRANSCEIVER_STACK_SIZE for using with native cpu 2013-06-14 20:21:22 +02:00
Oliver Hahm
4eb05e24fe fixed debug line 2013-06-14 19:42:12 +02:00
Oliver Hahm
d640cf4298 fixed missing include 2013-06-14 19:41:48 +02:00
Oliver Hahm
fdd1d21e8d Merge branch 'master' into wsn430 2013-06-14 19:41:23 +02:00
Oleg
d477dca89a Merge pull request #50 from mehlis/master 
remove recursive include
 2013-06-13 13:10:57 -07:00
Oleg
c70426b57b Merge pull request #51 from mehlis/vtimer 
use out parameter for vtimer_now
 2013-06-13 13:04:11 -07:00
Oleg
284737faf5 Merge pull request #53 from mehlis/include 
Remove undefined variables from Makefiles
 2013-06-13 13:01:49 -07:00
Christian Mehlis
57e70a659c Remove undefined variables from Makefiles 
The following variables are included in various Makefiles but never
defined.

    $(BOARDINCLUDE)
    $(PROJECTINCLUDE)
    $(CPUINCLUDE)
 2013-06-13 21:41:24 +02:00
Christian Mehlis
67875ba29b fix indentation 2013-06-13 21:23:14 +02:00
Christian Mehlis
a57c25499b remove recursive include 2013-06-13 21:23:14 +02:00
Ludwig Ortmann
cad585e9dd remove context switch in native lpm_sleep 
quick fix for now
 2013-06-13 18:14:21 +02:00
Christian Mehlis
9a3c0ab6ec add missing & 2013-06-13 10:54:22 +02:00
Christian Mehlis
4d8783e023 use out parameter for vtimer_now 2013-06-13 10:23:47 +02:00
Oliver Hahm
b8f674f5b6 fix context switch in lpm_sleep 2013-06-12 16:18:32 +02:00