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

262 Commits

Author SHA1 Message Date
Oleg Hahm
f51a97c7e2 added debug output for sending IEEE802.15.4 frames 2013-08-04 03:05:09 +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
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
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
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
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
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
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
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
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
Christian Mehlis
67875ba29b fix indentation 2013-06-13 21:23:14 +02:00
Christian Mehlis
4d8783e023 use out parameter for vtimer_now 2013-06-13 10:23:47 +02:00
Martin
032ba13938 fix ICMP type is DIS 2013-06-10 17:39:11 +02:00
Martin
43255ff855 fix warnings due to unapropriate prototypes 2013-06-10 17:36:56 +02:00
Milan Babel
db1fc96ffe added driver for cc2420
also added cc2420 to transceiver and added cc2420 shell commands
2013-06-06 08:35:17 +02:00
Milan Babel
2f5ed66756 created own module for ieee802154
this is needed to include the ieee802154 in drivers without the hole sixlowpan
2013-06-06 08:35:17 +02:00
Martin Lenders
01f2cb2115 Add more destiny fixes 2013-05-22 16:57:20 +02:00
Martin Lenders
fbca6f8a30 Make include paths in destiny relative
* When included by other modules the absolute paths of destiny
   lead to problems
2013-05-22 16:27:28 +02:00
Stephan Arndt
d9c9f38c61 integrated ETX calculation with RPL, rpl messages seem to not get handled very often 2013-03-29 13:41:48 +01:00
Stephan Arndt
1fd9325d8c switched DEBUG mode off 2013-03-28 17:40:01 +01:00
Stephan Arndt
60c594b852 Deleted ETX structs in rpl_structs and added them in etx_beaconing.h
changed packet size sent to be fix and not variable
changed some array sizes if debug is enabled
2013-03-28 17:11:12 +01:00
Stephan Arndt
b22e80b806 Fixed ETX calculations 2013-03-28 15:27:30 +01:00
Stephan Arndt
7e54f7ea5f improved handling of etx-messages 2013-03-24 20:03:18 +01:00
Stephan Arndt
2ae2d85b10 changed some buffer sizes and other minimal stuff 2013-03-24 15:57:52 +01:00
Stephan Arndt
85211f8408 changed some of the ETX constants to be more easily understandable 2013-03-22 18:37:00 +01:00
Stephan Arndt
dccc377f83 Changed value for maximum candidate neighbors to 40
Replaced lots of different constants written as numbers  by proberply defined constant-variables
 Changed usage of fixed values for the hwtimer_wait in send_beacon to customizable constants
2013-03-22 17:40:36 +01:00
Stephan Arndt
c161b43d78 changed some printf statements into puts 2013-03-19 14:07:31 +01:00