1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Commit Graph

468 Commits

Author SHA1 Message Date
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
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
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
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
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
4d8783e023 use out parameter for vtimer_now 2013-06-13 10:23:47 +02:00
Oliver Hahm
6edc2a37a2 Merge remote-tracking branch 'origin/sixlowpan_fixes' 2013-06-10 18:45:34 +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
Oliver Hahm
6f92e1dae8 * changed transceiver_type_t to bit field
(fixing #47)
2013-06-10 12:40:59 +02:00
Christian Mehlis
8f74612762 main should always return int
this fixes some compiler warnings
2013-06-09 18:02:58 +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
5a4211598c Merge branch 'master' of github.com:RIOT-OS/RIOT 2013-06-07 17:24:04 +02:00
Oleg Hahm
b515c4b957 * added TODO comment 2013-06-07 17:22:22 +02:00
Milan Babel
df13d9e0fc Merge branch 'master' of github.com:overflowed/RIOT
Conflicts:
	drivers/cc110x_ng/Makefile
2013-06-06 08:41:30 +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
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
Ludwig Ortmann
49228c8353 fix signal handler, ringbuffer for native FreeBSD 2013-06-03 13:23:57 +02:00
Ludwig Ortmann
5795bd6810 Merge remote-tracking branch 'upstream/master' 2013-05-30 09:44:47 +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
Ludwig Ortmann
35f9062e37 inital OSX support for native port 2013-05-15 17:45:43 +02:00
Ludwig Ortmann
5cb68df9e2 add missing newline in debug output 2013-05-15 10:47:46 +02:00
Ludwig Ortmann
b36ddd7fd7 Merge remote-tracking branch 'upstream/master' 2013-05-15 10:18:08 +02:00
Thomas Eichinger
3dba62afa6 Merge branch 'mc1322x' of github.com:RIOT-OS/RIOT into mc1322x 2013-04-22 09:56:07 +02:00
Ludwig Ortmann
2d29a26b64 fix stack and interrupt bugs 2013-04-15 20:08:46 +02:00
Martin Lenders
07e8ac9c19 Remove swtimer
see #4
2013-04-11 15:24:15 +02:00
Oliver Hahm
b6f21700ce * clean up stuff (fix gcc warnings and added clean target for doc) 2013-04-02 02:02:58 +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
Oliver Hahm
e6177e811a * moved cpu and board specific parts to corresponding Makefiles
* introduced variable for cpu folder
2013-03-23 18:38:12 +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
Stephan Arndt
07a7f10798 changed buffer sizes for debugging 2013-03-19 14:04:23 +01:00
Stephan Arndt
5a2bc468c4 threads dont overflow anymore, still hangs at random counts of sent beacon packets 2013-03-18 19:22:07 +01:00
Ludwig Ortmann
dfeae74661 lose > before output, prompt when ready for input 2013-03-18 15:37:32 +01:00
Benjamin Valentin
4d73d17662 add Makefiles to sys/net 2013-03-16 17:27:27 +01:00
Stephan Arndt
adfc3306ab WARNING: BROKEN COMMIT added not working etx_beaconing into rpl, added small vtimer debug changes, changed cc1100 default mode 2013-03-15 17:48:13 +01:00
Oliver Hahm
0d06e1bc18 Merge branch 'master' of github.com:RIOT-OS/RIOT 2013-03-10 16:46:46 +01: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
2ed63bd5c6 * removed outdated (and probably confusing) FeuerWhere project as an author 2013-03-08 11:30:23 +01:00
Oleg Hahm
2277b366b2 * removed outdated occurrences of (u|µ)kleos and FeuerWare 2013-03-07 20:51:26 +01:00
Oleg Hahm
bae6d13bdc * fixed fileending 2013-03-07 19:29:13 +01:00
Benjamin Valentin
c5bd1fa8f1 make sendto() and accept() interfaces conform to POSIX, doesn't change anything as addrlen is unused anyway 2013-03-07 18:08:50 +01:00
Stephan Arndt
e8256783f4 added etx_beaconing files 2013-03-03 17:47:11 +01:00
Oleg Hahm
d31ee82518 * removed legacy projects folder and Jamfiles 2013-02-27 19:08:16 +01:00
Stephan Arndt
31b65059a8 preparing for changing how parent selection/updates work in rpl, since the way it is implemented now goes against the spec 2013-02-21 18:25:35 +01:00
Stephan Arndt
644d6de364 changed rank calculation in OF0 and some other things. WARNING: this commit might break the rpl implementation for now, if a rollback is needed, choose an earlier commit than this 2013-02-21 18:23:36 +01:00
Oliver Hahm
b834831818 * added missing include in hashtable 2013-02-21 17:32:55 +01:00
Oliver Hahm
9df46b3507 * fixed makefiles for msb-430h support 2013-02-15 22:17:42 +01:00
Stephan Arndt
e0a21b9ddd added comments onto structs for easier findings in RFC 2013-02-13 15:03:16 +01:00
Stephan Arndt
91b023df4b deleted fake rounting entries which had been commented out 2013-02-13 15:02:21 +01:00
Stephan Arndt
567be35fc4 startet implementation of objective function mrhof 2013-02-13 15:00:43 +01:00
Stephan Arndt
39482f7316 deleted empty files objective_functions.c/h 2013-02-13 14:59:15 +01:00
Oleg Hahm
72e3a500a7 Merge branch 'master' of github.com:RIOT-OS/RIOT 2013-02-08 19:11:59 +01:00
Oleg Hahm
0f5dcdae98 * fixed double cc110x_ng entry in drivers makefile
* tidied up sys directory
2013-02-08 19:10:33 +01:00
Oleg
03a2173589 Merge pull request #1 from benpicco/77d4095cf065858999ec6240945c14a33c9bfca8
Add inet_pton and inet_ntop (POSIX.1-2001)
2013-02-08 08:43:59 -08:00