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

892 Commits

Author SHA1 Message Date
Oleg Hahm
d3477fd747 Merge branch 'master' of github.com:OlegHahm/RIOT 2013-07-24 15:54:42 +02:00
Oliver Hahm
0432a3eaf2 * added testfile 2013-07-24 15:54:03 +02:00
Thomas Eichinger
4bc89bd458 added fixes for compilation for mc1322x 2013-07-24 15:50:16 +02:00
Oleg Hahm
4665207b6f Merge pull request #75 from benpicco/external_modules
Allow external modules to be added to a RIOT project
2013-07-24 01:32:08 -07: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
Oleg Hahm
222d34d8a5 added missing include to cc110x_ng 2013-07-24 00:00:03 +02:00
Benjamin Valentin
248267834d allow external modules to be added to a project 2013-07-23 18:50:26 +02:00
Thomas Eichinger
585f4f3698 embedded mc1322x radio API into transceiver.{c,h} 2013-07-23 15:27:12 +02:00
Oleg Hahm
33423cdadb redefining default stack sizes dependent on the use of printf 2013-07-23 13:42:58 +02:00
Oleg Hahm
37467de0d2 fixed printf formatter 2013-07-23 13:39:50 +02:00
Thomas Eichinger
92adb3e401 * added proper "struct TMR_struct*" in hwtimer_cpu.c
* removed dublicate definition of the UART structure in mc1322x.h
2013-07-23 10:36:16 +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
LudwigOrtmann
9246461c82 Merge pull request #71 from mehlis/master
rename kernel_intern.h
2013-07-17 11:55:29 -07:00
Christian Mehlis
837bad38eb rename kernel_intern.h
german "intern" to english "internal"
2013-07-16 16:36:37 +02:00
LudwigOrtmann
f1474e4d59 Merge pull request #67 from mehlis/master
Fixups: build with debug enabled
2013-07-16 07:16:27 -07:00
Christian Mehlis
b8176f4488 fixed printf patterns 2013-07-16 15:27:19 +02:00
Christian Mehlis
c5e62e238b add missing include 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
LudwigOrtmann
c5295357dd Merge pull request #69 from LudwigOrtmann/fix_python_shebang
fix python shebang
2013-07-15 14:57:57 -07:00
Ludwig Ortmann
5efa2eea8a fix python shebang 2013-07-15 21:17:09 +02:00
LudwigOrtmann
74d755f271 Merge pull request #68 from LudwigOrtmann/master
use proper native board include
2013-07-15 12:14:11 -07:00
Ludwig Ortmann
33dde8aba8 use proper native board include 2013-07-15 20:52:53 +02:00
LudwigOrtmann
603036208b Merge pull request #65 from mehlis/master
Add msg_try_receive
2013-07-15 10:58:26 -07:00
Christian Mehlis
190e24116d use int explicitly 2013-07-09 13:41:08 +02:00
Christian Mehlis
96cbf4019e make internal function static 2013-07-09 13:40:52 +02:00
Ludwig Ortmann
7dd9ac6be0 Add msg_try_receive 2013-07-05 23:32:07 +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
Oleg Hahm
5d2bc0fa3a added astyle options file for coding conventions 2013-07-02 13:41:46 +02:00
Oleg
2ada147adf Merge pull request #63 from mehlis/master
fix missing includes
2013-06-30 05:17:26 -07: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
Oliver Hahm
7a489465bf * added testfile 2013-06-26 19:16:20 +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