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 |
|
Ludwig Ortmann
|
2d29a26b64
|
fix stack and interrupt bugs
|
2013-04-15 20:08:46 +02:00 |
|