deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'untested'

Browse source
This commit is contained in:
Mariano Alvira 2009-04-22 16:12:02 -04:00
parent e510c078d8 f421cde7f8
commit ba2bf34b13
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/tmr.c
View file

@ -55,7 +55,7 @@ __attribute__ ((section ("startup")))
void main(void) {
/* pin direction */
reg32(GPIO_PAD_DIR0) = 0x00000400;
reg32(GPIO_PAD_DIR0) = 0x00000500;
/* timer setup */
/* CTRL */
@ -80,7 +80,7 @@ void main(void) {
while(1) {
/* blink on */
reg32(GPIO_DATA0) = 0x00000400;
reg32(GPIO_DATA0) = 0x00000500;
while((reg16(TMR0_SCTRL)>>15) == 0) { continue; }
reg16(TMR0_SCTRL) = 0; /*clear bit 15, and all the others --- should be ok, but clearly not "the right thing to do" */