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

51 Commits

Author SHA1 Message Date
Oleg Hahm
6d130a45ac updated license headers
(No code changes!)
2013-08-16 10:20:23 +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
Thomas Eichinger
4bc89bd458 added fixes for compilation for mc1322x 2013-07-24 15:50:16 +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
Christian Mehlis
69c526f44d removed redefined ENABLE_DEBUG 2013-07-16 15:27:19 +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
e2130fbd47 coding conventions for drivers 2013-06-21 22:36:48 +02:00
Christian Mehlis
3ab669578c do includes the right way (for riot includes) 2013-06-14 20:33:28 +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
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
f669f9a05b Merge remote-tracking branch 'upstream/master'
Conflicts:
	Makefile.dep
2013-04-08 17:43:39 +02:00
Oliver Hahm
3265910761 * renamed some struct members in cc110x driver to avoid naming conflicts with stm32f4discovery 2013-03-23 18:57:12 +01:00
Ludwig Ortmann
671cb6560f native cc110x_ng placebo 2013-03-21 17:08:41 +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
d31ee82518 * removed legacy projects folder and Jamfiles 2013-02-27 19:08:16 +01:00
Oliver Hahm
9df46b3507 * fixed makefiles for msb-430h support 2013-02-15 22:17:42 +01:00
Oleg Hahm
5df0bd0cc4 * updated and integrated makefiles
* added some auto dependencies
2013-02-08 17:37:02 +01:00
Oleg Hahm
3791039974 * integrated makefiles
* fixed some prototypes
* restructured sys
2013-02-06 13:20:21 +01:00
Oliver Hahm
0d6d3e2c43 [board msba2-common] [sys chardev_thread] [sys shell] [driver cc110x_ng] [core msg]
* some cosmetics and cleanups
2012-02-16 21:33:41 +01:00
Oliver
c94c03879e [drivers cc110x_ng]
- fixed DBG_IGNORE bugs

[sys net destiny]
- fixed a bug where UDP sockets were not closed correctly
2012-02-09 01:20:49 +01:00
Oliver Hahm
461fac8698 [cc110x_ng transceiver]
* added a ignore function for debugging purposes
2012-02-08 17:14:50 +01:00
Stephan Zeisberg
6a96de0d2f changed msg to msg_t 2011-03-08 10:54:40 +01:00
Oliver Hahm
c083928983 [board/chronos/drivers/display]
* cleaned up code and documentation

[drivers/cc110x_ng]
* fixed include pathes
2010-12-11 13:38:04 +01:00
Oliver Hahm
8f63b18b9f [drivers/cc110x_ng]
* moved all headers to include subfolder
2010-12-11 12:24:06 +01:00
Oliver Hahm
6be1cf2a76 [board/chronos board/msb-430h board/msba2-common drivers/cc110x_ng sys/shell
sys/transceiver]
* renamed all occurrences of cc1100 to cc110x as in fact all driver parts should
work for cc1100 and cc110x as well

[driver/cc110x_ng]
* added some documentation
* introduced a new register function to access rxfifo (fixing the of-by-one
problem on chronos platform
2010-12-11 12:09:20 +01:00
Oliver Hahm
ec6a794143 [cc110x_ng]
* fuxed transceiver driver for chronos
* some more stuff
2010-12-10 18:00:31 +01:00
Oliver Hahm
830f17246c [Chronos]
* changed display driver interface from uint8_t* to char*
* fixed hardware timer interrupt
* ported cc1100 driver
* added simple test application for radio

[msb430]
* fixex config and flashrom

[cc110x_ng]
* removed dependency from sysconfig
2010-12-09 13:24:24 +01:00
86a70393b4 * misc merge fixes 2010-12-06 17:15:00 +01:00
Oliver Hahm
e7372b21a9 [board config]
* made config optional
2010-12-06 13:19:31 +01:00
Oliver Hahm
2a1a10bd74 [board/eZ430-Chronos board/msba2 drivers/cc110x_ng]
* restructured interface functions for cc1100 access
2010-12-06 12:05:03 +01:00
Oliver Hahm
e1b3dcf40d [drivers/cc110x_ng]
* added register interface (it is now possible to communicate with cc1100 via SPI (e.g. on MSB boards) or directly via registers like on eZ430-Chronos
2010-12-06 11:22:15 +01:00
Oliver Hahm
fb1cb91c75 [board/msp-430-common board/msba2 core/]
* introduced dummy function for msp-430 config-save
* moved sysconfig from board to core

[sys/transceiver cpu/]
* moved some buffer size defines to cpu dependent parts

* some cleanups
2010-12-03 18:42:03 +01:00
Oliver Hahm
4a2c58bbba [drivers/cc110x_ng sys/transceiver]
* updated interface to switch transceiver off and back to rx mode
* removed some debugging stuff
2010-12-02 15:38:28 +01:00
Oliver Hahm
69a7fb1d76 * modified cc110x_ng driver to use sysconfig 2010-12-01 17:07:05 +01:00
Oliver Hahm
b522722ec6 [sys/transceiver projects/test_cc110x_ng]
' fixed buffer management
 ' introduced a message queue
2010-11-27 19:27:05 +01:00
Oliver Hahm
f5ab5c27bb [drivers/cc1100_ng sys/transceiver]
' added a monitor mode

[sys/shell projects/test_cc1100_ng]
 ' moved shell commands to get/set channel and address and sending a packet from
 userapp to default shell command set
2010-11-27 10:50:18 +01:00
Oliver Hahm
e6752c739b [drivers/cc110x_ng projects/test_cc110x_ng sys/transceiver]
* fixed length handling
 * more sophisticated sending function in userapp
2010-11-26 17:06:54 +01:00
Oliver Hahm
29cb64a37e * NOTE: simple packet exchange using cc110x_ng seems to work now
* added TX functions to cc110x_ng driver and transceiver module
* split up cc1100_ng functions to more files
* added address asignment and request functions to driver and transceiver module
2010-11-26 10:23:46 +01:00
Oliver Hahm
d378ee1930 * added getter and setter for the channel to transceiver
* receiving now seems to work...
2010-11-24 21:45:38 +01:00
Oliver Hahm
7b344c37c1 * see diff ;) 2010-11-24 14:23:32 +01:00
Oliver Hahm
4ebfaefce1 * additionally debug for transceiver receiving functions
* added set_channel function to cc110x_ng
2010-11-24 13:47:31 +01:00
Oliver Hahm
d950fbcf81 * CC1100_NG still not working!
* added some debugging stuff
* changed cc1100_ng <-> transceiver msg api
* revised test application
2010-11-24 11:20:27 +01:00
Oliver Hahm
8d5a4890e4 * revised buffer and messaging management of transceiver
* renamed cc1100_ng header
2010-11-23 11:37:13 +01:00
Oliver Hahm
d98545f378 * changed buffer format for cc110x_ng and transceiver
* added some documentation
* added support for more than one transceiver
2010-11-21 14:00:24 +01:00
Oliver Hahm
6a08a47902 * missing driver files from last commit 2010-11-19 20:12:35 +01:00