Commit graph

17 commits

Author SHA1 Message Date
kkrentz
4493783ce9 'free_packet' in csma.c conflicted with 'free_packet' in maca.c 2014-08-04 01:09:57 -07:00
Mariano Alvira
2c9a538582 Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into bump-libmc1322x
bump libmc1322x to 7bee48243c

Conflicts:
	cpu/mc1322x/board/Makefile.board
	cpu/mc1322x/lib/include/uart.h
	cpu/mc1322x/lib/uart1.c
	cpu/mc1322x/lib/uart2.c
	cpu/mc1322x/src/default_lowlevel.c
2012-11-18 18:27:39 -05:00
Mariano Alvira
e2d74fa0a5 Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into uart-upstream
Conflicts:
	cpu/mc1322x/lib/include/uart.h
	cpu/mc1322x/src/default_lowlevel.c
2011-07-08 19:21:15 -04:00
Mariano Alvira
11f5bca7c4 Merge remote branch 'libmc1322x/master'
Conflicts:
	cpu/mc1322x/board/redbee-econotag.h
2011-03-22 16:28:08 -04:00
Mariano Alvira
59d7fad746 Merge remote branch 'libmc1322x/master' 2011-03-11 16:28:14 -05:00
Mariano Alvira
fa08b09770 Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into update-lib 2011-03-07 12:37:26 -05:00
Mariano Alvira
07f77b02eb Merge remote branch 'libmc1322x/master' 2011-02-18 12:38:30 -05:00
Mariano Alvira
2e331b51e8 Merge remote branch 'libmc1322x/master' into update-libmc1322x
Conflicts:
	cpu/mc1322x/COPYING
2011-02-17 14:41:47 -05:00
Mariano Alvira
7cdfbb0947 remove cvs keywords from cpu/mc1322x 2011-02-17 14:36:55 -05:00
maralvira
d0227afbed cycle channel on keypress. 2011-01-17 15:46:27 +00:00
maralvira
fb8c08ca7c only use these stubs with linux toolchains 2011-01-17 15:42:24 +00:00
maralvira
f913cf728b modify flasher.c to not create a vaild boot magic number if the length
of the file is zero

modify mc1322x-load.pl to optionally send a zero length file with -z;
extra data on the command line is still written.

This allows you to burn the mac adress without flashing a vaild image.
2010-11-07 14:11:50 +00:00
maralvira
8b2ef2675d discard received packets --- this lets you run multiple rftest-tx's at
the same time.
2010-11-07 14:10:16 +00:00
maralvira
e886e83908 fix bug in print_packet
Thanks dean and jim.
2010-11-07 14:07:33 +00:00
maralvira
f1fede7090 get LQI of received packets 2010-11-07 14:06:57 +00:00
maralvira
eb0e3b7989 fix long standing bug where the last pages of NVM were not erased
properly.
2010-07-28 18:43:04 +00:00
maralvira
419906a769 initial mc1322x commit
based on commit aac3a355451d899f02737f2907af8c874ee4feba of

git://git.devl.org/git/malvira/contiki-mc1322x.git
2010-06-10 14:55:39 +00:00