deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
10809 commits 6 branches 13 tags 80 MiB
Commit graph

3 commits

Author SHA1 Message Date
Mariano Alvira f7d1d78ac9 disable pad keeper when using ADC pin; otherwise you'll see a 20k input 
impedance.
 2012-11-30 10:44:26 -05: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 59d7fad746 Merge remote branch 'libmc1322x/master' 2011-03-11 16:28:14 -05:00