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

9 Commits

Author SHA1 Message Date
Oleg Hahm
b64fb65935 Merge branch 'agilefox_clean' of https://github.com/AlaeddineWeslati/RIOT into AlaeddineWeslati-agilefox_clean
Conflicts:
	sys/include/transceiver.h
	sys/transceiver/transceiver.c

Additional changes:
* allow for multi-transceiver initialization
* change packet reception to old implementation
2013-08-15 19:07:14 +02:00
Martin Lenders
b944a48da9 Set up new directory structure 2013-08-14 00:33:11 +02:00
Alaeddine WESLATI
11bb09b7f8 started adding at86rf231 driver
at86rf231 TX and RX

driver is using vtimer instead of hwtimer_ functions, TO CHECK

vtimer debug function prototype fix
2013-08-12 15:17:22 +02:00
Oleg Hahm
956f0e8656 fix for #87, replacing - with _ in module protocol_multiplex 2013-08-04 03:17:31 +02:00
Oleg Hahm
f7ecc704a4 fixed includes and include pathes 2013-07-29 01:24:02 +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
e6177e811a * moved cpu and board specific parts to corresponding Makefiles
* introduced variable for cpu folder
2013-03-23 18:38:12 +01:00
Oliver Hahm
8a175a5702 * added dependency for cc110x_ng to transceiver 2013-03-19 17:46:24 +01:00
Oliver Hahm
5ffe5a9c27 * renamed makefiles to Makefile 2013-03-09 23:45:56 +01:00