From c2d7656a1e903339a46056a620be9e2864bcc2fd Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Fri, 5 Aug 2011 00:24:50 +0200 Subject: [PATCH] Make getInputWaitTimeout use microseconds --- firmware/basic/keyin.c | 2 +- firmware/basic/menu.c | 2 +- firmware/l0dable/invaders.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/firmware/basic/keyin.c b/firmware/basic/keyin.c index cc4cecb..fc51ac5 100644 --- a/firmware/basic/keyin.c +++ b/firmware/basic/keyin.c @@ -54,7 +54,7 @@ uint8_t getInputWaitTimeout(int timeout) { uint8_t key; if(timeout==0) return getInputWait(); - int end=_timectr+timeout*(1000/SYSTICKSPEED); + int end=_timectr+timeout/SYSTICKSPEED; while ((key=getInputRaw())==BTN_NONE){ if(_timectr>end) break; diff --git a/firmware/basic/menu.c b/firmware/basic/menu.c index b4824f0..fc1fe48 100644 --- a/firmware/basic/menu.c +++ b/firmware/basic/menu.c @@ -46,7 +46,7 @@ void handleMenu(const struct MENU *the_menu) { } lcdRefresh(); - switch (getInputWaitTimeout((menuflags&MENU_TIMEOUT)?15:0)) { + switch (getInputWaitTimeout((menuflags&MENU_TIMEOUT)?15000:0)) { case BTN_UP: menuselection--; if (menuselection < current_offset) { diff --git a/firmware/l0dable/invaders.c b/firmware/l0dable/invaders.c index c2f6062..e405664 100644 --- a/firmware/l0dable/invaders.c +++ b/firmware/l0dable/invaders.c @@ -127,7 +127,7 @@ static bool screen_intro() { DoString (0, 9, highnick); lcdDisplay(); step = !step; - key=getInputWaitTimeout(1); + key=getInputWaitTimeout(1000); } return !(key==BTN_LEFT); } @@ -142,7 +142,7 @@ static bool screen_gameover() { if (highscore_set(game.score, GLOBAL(nickname))) DoString (0,9,"HIGHSCORE!"); lcdDisplay(); - key=getInputWaitTimeout(5); + key=getInputWaitTimeout(5000); } return !(key==BTN_LEFT); }