RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity
886 Commits 40 Branches 189 Tags 262 MiB
63146190b3
Commit Graph

106 Commits

Author SHA1 Message Date
Oleg Hahm
39a4dc684e fixes for #62: eliminate unused parameter warnings 
NOTE: this commit introduces a kernel API change for mutex_unlock
 2013-08-04 04:10:33 +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
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
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
d01fd9a508 final coding convention fixes 2013-06-22 17:58:19 +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
Oliver Hahm
fdd1d21e8d Merge branch 'master' into wsn430 2013-06-14 19:41:23 +02:00
Christian Mehlis
9a3c0ab6ec add missing & 2013-06-13 10:54:22 +02:00
Christian Mehlis
4d8783e023 use out parameter for vtimer_now 2013-06-13 10:23:47 +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
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
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
Ludwig Ortmann
175300e58c add native cpu doxygen documentation, 
also fix and improve some of the existing
 2013-03-13 21:56:56 +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
0f5dcdae98 * fixed double cc110x_ng entry in drivers makefile 
* tidied up sys directory
 2013-02-08 19:10:33 +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
92281753ad Merge branch 'stable' 
Conflicts:
	core/sched.c
	sys/auto_init.c
 2012-11-05 19:15:57 -05:00
Oliver Hahm
62635e20a9 [drivers cc110x] 
* fixed typos
 2012-11-05 16:06:46 -05:00
Oliver Hahm
a5238784ae [drivers cc110x cc1100-interface] 
* setting default radio mode to permanent RX
 2012-11-05 14:56:50 -05:00
Oliver Hahm
e0deea2d78 [driver cc110x cc1100_phy] 
* added a todo regarding WOR problem with non-full packets
 2012-11-05 14:17:00 -05:00
Oliver Hahm
db9f6b3fcf [board msba2-common tools pseudoterm] 
* comments for preparing pseudoterm to use with node without DTR line

[drivers cc110x]

* changed default behavior to WOR mode
* fixed a bug that let CC1100 never return to WOR mode, when receiving a
  packet during sending
 2012-08-01 17:00:48 +02:00
Oliver Hahm
30fc52452c [drivers cc110x] 
* switched from swtimer to vtimer in Jamfile
 2012-03-06 21:15:51 +01:00
Eric Engel
6dbec3b0ae various changes 2012-03-02 20:22:22 +01:00
Oliver Hahm
f978260656 [drivers cc110x] [sys shell] [sys transceiver] 
* cretaed transceiver interface for old cc1100 driver (with csma/ca)
 2012-03-01 22:12:25 +01:00
Oliver Hahm
802e9edf91 Merge branch 'master' of ssh://ukleos/home/git/ukleos 2012-02-16 22:15:24 +01:00
Oliver Hahm
b051659d71 [drivers adc] 
* added lpc2387 adc driver and generic interface
 2012-02-16 22:14:47 +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
Oliver Hahm
c3d24e2057 core/ 2011-12-28 11:37:05 +01:00
Oliver Hahm
7b1b145b4f [cpu lpc2387] 
* added mci driver

[sys shell]

* added commands for memory card access
 2011-12-12 17:50:22 +01:00