From 8d0a32eb4b4fd7108b9ebae81f93b3909c3e477f Mon Sep 17 00:00:00 2001 From: Marcoen Hirschberg Date: Thu, 2 Mar 2006 13:28:24 +0000 Subject: gigabeat related changes git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8885 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/color_picker.c | 8 ++++++++ apps/plugins/Makefile | 4 ++-- apps/plugins/chessbox/chessbox.c | 10 ++++++++++ apps/plugins/fire.c | 7 +++++++ apps/plugins/rockboy/menu.c | 6 ++++++ apps/plugins/rockboy/rockboy.c | 7 +++++++ 6 files changed, 40 insertions(+), 2 deletions(-) (limited to 'apps') diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c index 8c7e1deb0b..efdbe1a0e3 100644 --- a/apps/gui/color_picker.c +++ b/apps/gui/color_picker.c @@ -46,6 +46,14 @@ #define SLIDER_RC_OK BUTTON_RC_ON #define SLIDER_RC_CANCEL BUTTON_RC_STOP +#elif (CONFIG_KEYPAD == GIGABEAT_PAD) +#define SLIDER_UP BUTTON_UP +#define SLIDER_DOWN BUTTON_DOWN +#define SLIDER_LEFT BUTTON_LEFT +#define SLIDER_RIGHT BUTTON_RIGHT +#define SLIDER_OK BUTTON_POWER +#define SLIDER_CANCEL BUTTON_A + #elif (CONFIG_KEYPAD == IPOD_4G_PAD) #define SLIDER_UP BUTTON_LEFT #define SLIDER_DOWN BUTTON_RIGHT diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index 32286a25df..8c72294709 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile @@ -63,7 +63,7 @@ DIRS = . SUBDIRS += searchengine databox #for any recorder, iRiver or iPod model -ifneq (,$(strip $(foreach tgt,RECORDER IRIVER IPOD_COLOR IPOD_VIDEO,$(findstring $(tgt),$(TARGET))))) +ifneq (,$(strip $(foreach tgt,RECORDER IRIVER IPOD_COLOR IPOD_VIDEO GIGABEAT,$(findstring $(tgt),$(TARGET))))) ifneq (-DIRIVER_IFP7XX,$(TARGET)) SUBDIRS += rockboy endif @@ -71,7 +71,7 @@ endif # chessbox is too big to fit in the 32KB Archos plugin buffer, so we only # build for IRIVER and IPOD targets -ifneq (,$(strip $(foreach tgt,RECORDER ONDIO IRIVER IPOD,$(findstring $(tgt),$(TARGET))))) +ifneq (,$(strip $(foreach tgt,RECORDER ONDIO IRIVER IPOD GIGABEAT,$(findstring $(tgt),$(TARGET))))) ifneq (-DIRIVER_IFP7XX,$(TARGET)) SUBDIRS += chessbox endif diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c index 092de1825a..161de45e90 100644 --- a/apps/plugins/chessbox/chessbox.c +++ b/apps/plugins/chessbox/chessbox.c @@ -100,6 +100,16 @@ PLUGIN_HEADER #define CB_LEVEL (BUTTON_MENU|BUTTON_OFF) #define CB_QUIT BUTTON_OFF +#elif (CONFIG_KEYPAD == GIGABEAT_PAD) +#define CB_SELECT BUTTON_SELECT +#define CB_UP BUTTON_UP +#define CB_DOWN BUTTON_DOWN +#define CB_LEFT BUTTON_LEFT +#define CB_RIGHT BUTTON_RIGHT +#define CB_PLAY BUTTON_POWER +#define CB_LEVEL BUTTON_MENU +#define CB_QUIT BUTTON_A + #else #error CHESSBOX: Unsupported keypad #endif diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c index a8d8d0afdb..64c9fa9371 100644 --- a/apps/plugins/fire.c +++ b/apps/plugins/fire.c @@ -77,6 +77,13 @@ static unsigned char draw_buffer[8*LCD_WIDTH]; #define FIRE_INCREASE_MULT BUTTON_UP #define FIRE_DECREASE_MULT BUTTON_DOWN +#elif (CONFIG_KEYPAD == GIGABEAT_PAD) +#define FIRE_QUIT BUTTON_A +#define FIRE_SWITCH_FLAMES_TYPE BUTTON_LEFT +#define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT +#define FIRE_INCREASE_MULT BUTTON_UP +#define FIRE_DECREASE_MULT BUTTON_DOWN + #endif #define MIN_FLAME_VALUE 0 diff --git a/apps/plugins/rockboy/menu.c b/apps/plugins/rockboy/menu.c index 84bfeaa3cb..15f34582a6 100644 --- a/apps/plugins/rockboy/menu.c +++ b/apps/plugins/rockboy/menu.c @@ -16,6 +16,12 @@ #define MENU_BUTTON_LEFT BUTTON_LEFT #define MENU_BUTTON_RIGHT BUTTON_RIGHT #define MENU_BUTTON_CANCEL BUTTON_MENU +#elif (CONFIG_KEYPAD == GIGABEAT_PAD) +#define MENU_BUTTON_UP BUTTON_UP +#define MENU_BUTTON_DOWN BUTTON_DOWN +#define MENU_BUTTON_LEFT BUTTON_LEFT +#define MENU_BUTTON_RIGHT BUTTON_RIGHT +#define MENU_BUTTON_CANCEL BUTTON_A #else #define MENU_BUTTON_UP BUTTON_UP #define MENU_BUTTON_DOWN BUTTON_DOWN diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index da1017748f..41f06557a5 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c @@ -126,6 +126,13 @@ void setoptions (void) { options.START=BUTTON_MODE; options.SELECT=(BUTTON_SELECT | BUTTON_REL); options.MENU=(BUTTON_SELECT | BUTTON_REPEAT); + +#elif CONFIG_KEYPAD == GIGABEAT_PAD + options.A=BUTTON_VOL_UP; + options.B=BUTTON_VOL_DOWN; + options.START=BUTTON_POWER; + options.SELECT=BUTTON_SELECT; + options.MENU=BUTTON_MENU; #endif options.maxskip=4; -- cgit v1.2.3