From 91022738ee412fda01088fcef44d4eaee946513f Mon Sep 17 00:00:00 2001 From: Marcoen Hirschberg Date: Wed, 9 Aug 2006 13:25:43 +0000 Subject: fix button mappings for the gigabeat git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10502 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/mpegplayer/mpegplayer.c | 4 ++++ apps/plugins/rockpaint.c | 11 +++++++++++ apps/recorder/keyboard.c | 13 +++++++------ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 17695f4a6f..7a5bff4d6c 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -63,6 +63,10 @@ extern vo_open_t vo_rockbox_open; #define MPEG_STOP BUTTON_POWER #define MPEG_PAUSE BUTTON_PLAY +#elif CONFIG_KEYPAD == GIGABEAT_PAD +#define MPEG_STOP BUTTON_A +#define MPEG_PAUSE BUTTON_SELECT + #else #error MPEGPLAYER: Unsupported keypad #endif diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 95c1a0c253..c7ec5755b9 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c @@ -70,6 +70,17 @@ PLUGIN_HEADER #define ROCKPAINT_LEFT BUTTON_LEFT #define ROCKPAINT_RIGHT BUTTON_RIGHT +#elif CONFIG_KEYPAD == GIGABEAT_PAD +#define ROCKPAINT_QUIT BUTTON_A +#define ROCKPAINT_DRAW BUTTON_SELECT +#define ROCKPAINT_MENU BUTTON_MENU +#define ROCKPAINT_TOOLBAR BUTTON_POWER +#define ROCKPAINT_TOOLBAR2 ( BUTTON_POWER | BUTTON_LEFT ) +#define ROCKPAINT_UP BUTTON_UP +#define ROCKPAINT_DOWN BUTTON_DOWN +#define ROCKPAINT_LEFT BUTTON_LEFT +#define ROCKPAINT_RIGHT BUTTON_RIGHT + #elif ( CONFIG_KEYPAD == IRIVER_H10_PAD ) #define ROCKPAINT_QUIT BUTTON_POWER #define ROCKPAINT_DRAW BUTTON_FF diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index 23a1102c3d..8f35b12d4b 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c @@ -162,13 +162,14 @@ #elif CONFIG_KEYPAD == GIGABEAT_PAD -/* TODO: Check keyboard mappings */ - -#define KBD_MODES /* Gigabeat uses 2 modes, picker and line edit */ -#define KBD_SELECT (BUTTON_MENU | BUTTON_REL) /* backspace in line edit */ -#define KBD_SELECT_PRE BUTTON_MENU -#define KBD_DONE BUTTON_POWER +#define KBD_CURSOR_RIGHT (BUTTON_POWER | BUTTON_RIGHT) +#define KBD_CURSOR_LEFT (BUTTON_POWER | BUTTON_LEFT) +#define KBD_SELECT BUTTON_SELECT +#define KBD_PAGE_FLIP (BUTTON_POWER | BUTTON_MENU) +#define KBD_DONE_PRE BUTTON_POWER +#define KBD_DONE (BUTTON_POWER | BUTTON_REL) #define KBD_ABORT BUTTON_A +#define KBD_BACKSPACE BUTTON_MENU #define KBD_LEFT BUTTON_LEFT #define KBD_RIGHT BUTTON_RIGHT #define KBD_UP BUTTON_UP -- cgit v1.2.3