RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity
861 Commits 40 Branches 189 Tags 262 MiB
e11ef8d0ac
Commit Graph

435 Commits

Author SHA1 Message Date
Oleg Hahm
e11ef8d0ac Merge pull request #80 from authmillenon/sixlowpan_refactor 
Refactoring and Fixing of sixlowpan module
 2013-08-03 19:21:27 -07:00
Martin Lenders
529333636e Prepare refactoring 2013-07-29 16:00:42 +02:00
Oleg Hahm
22c668529d Merge branch 'oleg-master' into mymaster 
Conflicts:
	cpu/Makefile.include
	cpu/arm_common/arm_cpu.c
 2013-07-29 01:36:24 +02:00
Oleg Hahm
f7ecc704a4 fixed includes and include pathes 2013-07-29 01:24:02 +02:00
Oleg Hahm
6d48859269 Merge branch 'master' of github.com:OlegHahm/RIOT 2013-07-29 01:11:42 +02:00
Oleg Hahm
ca53d9231d disabled DEBUG in auto_init 2013-07-25 21:55:49 +02:00
Oleg Hahm
f12d5628eb fixed transceiver for mc1322x 2013-07-24 23:53:23 +02:00
Oleg Hahm
19e4034ace Merge branch 'thomas-mc1322x' 
Conflicts:
	Makefile.modules
	core/kernel_init.c
	core/thread.c
	cpu/arm_common/arm_cpu.c
	cpu/arm_common/syscalls.c
	cpu/lpc_common/hwtimer_cpu.c
	cpu/lpc_common/iap.c
	sys/include/transceiver.h
	sys/net/sixlowpan/sixlowip.c
	sys/net/sixlowpan/sixlowmac.c
	sys/net/sixlowpan/sixlowmac.h
	sys/net/sixlowpan/sixlowpan.c
	sys/transceiver/Makefile
	sys/transceiver/transceiver.c
 2013-07-24 23:22:11 +02:00
Oleg Hahm
cce8f46e49 experimental sixlowpan fixes to eliminate multiple definitions 2013-07-24 22:23:21 +02:00
Thomas Eichinger
4bc89bd458 added fixes for compilation for mc1322x 2013-07-24 15:50:16 +02:00
Oleg Hahm
0ff8973ae7 Merge pull request #76 from benpicco/posix_compat 
add typedefs to socket.h to improve POSIX compatibility
 2013-07-24 01:31:40 -07:00
Benjamin Valentin
18ef96422f add typedefs to socket.h to improve POSIX compliance 2013-07-24 02:52:24 +02:00
Oleg Hahm
ca75d3c36c fixed some includes 2013-07-24 00:44:28 +02:00
Oleg Hahm
599e266b55 Revert "removed redefined ENABLE_DEBUG" 
This reverts commit 69c526f44d.

Instead of removing ENABLE_DEBUG, define it as zero and replacing the
ifdef preprocessor commands by a simple #if
 2013-07-24 00:38:43 +02:00
Oleg Hahm
615ddb1eaa some buffer adjustments 2013-07-24 00:02:44 +02:00
Thomas Eichinger
585f4f3698 embedded mc1322x radio API into transceiver.{c,h} 2013-07-23 15:27:12 +02:00
LudwigOrtmann
4d84098b23 Merge pull request #70 from LudwigOrtmann/issue_58 
fix #58, fix comments, printf/puts to DEBUG
 2013-07-17 11:56:07 -07:00
Christian Mehlis
b8176f4488 fixed printf patterns 2013-07-16 15:27:19 +02:00
Christian Mehlis
6652ecc87a remove static flag, it's not static 2013-07-16 15:27:19 +02:00
Christian Mehlis
69c526f44d removed redefined ENABLE_DEBUG 2013-07-16 15:27:19 +02:00
Ludwig Ortmann
b29dcc7e89 remove superfluous, commented out puts 2013-07-16 13:50:41 +02:00
Ludwig Ortmann
5c93ff4f65 change puts/printf to DEBUG 2013-07-16 13:50:11 +02:00
Ludwig Ortmann
71ca139be4 translate/fix comments 2013-07-16 13:41:23 +02:00
Oleg Hahm
c989d2147e collected all ICMP type definitions in one header 2013-07-05 09:38:38 +02:00
Oleg Hahm
267053042e moved buffer initialization from header to c files 
fixed file format
 2013-07-05 09:37:34 +02:00
Oleg Hahm
40b3078b7e made rpl a stand-alone module 2013-07-05 09:35:29 +02:00
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
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
Rene Kijewski
0212ab36a7 Use inttypes.h in sc_cc110x_ng.c 2013-06-18 17:46:18 +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
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