From f7bcb66e676df93ab3e5bbff5b71ed4200afaabb Mon Sep 17 00:00:00 2001 From: Robert Menes Date: Tue, 2 Nov 2010 03:29:16 +0000 Subject: Begin committing keymap plugins for the Philips GoGear HDD6330. Not all keymaps are completed, but I want to get some initial work I did under version control. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28442 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/battery_bench.c | 7 +++++++ apps/plugins/bounce.c | 8 ++++++++ apps/plugins/calculator.c | 11 +++++++++++ apps/plugins/calendar.c | 10 ++++++++++ apps/plugins/chessclock.c | 10 ++++++++++ apps/plugins/chopper.c | 6 ++++++ apps/plugins/clix.c | 8 ++++++++ apps/plugins/fireworks.c | 4 ++++ apps/plugins/oscilloscope.c | 11 +++++++++++ apps/plugins/solitaire.c | 28 +++++++++++++++++++++++----- apps/plugins/wormlet.c | 10 ++++++++++ apps/plugins/xobox.c | 9 +++++++++ 12 files changed, 117 insertions(+), 5 deletions(-) diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index b82e4f858c..be71701c6f 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c @@ -180,6 +180,13 @@ #define BATTERY_ON_TXT "MENU - start" #define BATTERY_OFF_TXT "POWER" +#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD + +#define BATTERY_ON BUTTON_MENU +#define BATTERY_OFF BUTTON_POWER +#define BATTERY_ON_TXT "MENU - start" +#define BATTERY_OFF_TXT "POWER" + #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD #define BATTERY_ON BUTTON_MENU diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index abc551ff0a..65d46b7522 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c @@ -170,6 +170,14 @@ #define BOUNCE_QUIT BUTTON_POWER #define BOUNCE_MODE BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD +#define BOUNCE_LEFT BUTTON_PREV +#define BOUNCE_RIGHT BUTTON_NEXT +#define BOUNCE_UP BUTTON_UP +#define BOUNCE_DOWN BUTTON_DOWN +#define BOUNCE_QUIT BUTTON_POWER +#define BOUNCE_MODE BUTTON_MENU + #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD #define BOUNCE_LEFT BUTTON_PREV #define BOUNCE_RIGHT BUTTON_NEXT diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 148f149726..749c4af698 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c @@ -336,6 +336,17 @@ F3: equal to "=" #define CALCULATOR_CALC BUTTON_MENU #define CALCULATOR_CLEAR BUTTON_VIEW +#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD + +#define CALCULATOR_LEFT BUTTON_PREV +#define CALCULATOR_RIGHT BUTTON_NEXT +#define CALCULATOR_UP BUTTON_UP +#define CALCULATOR_DOWN BUTTON_DOWN +#define CALCULATOR_QUIT BUTTON_POWER +#define CALCULATOR_INPUT BUTTON_PLAY +#define CALCULATOR_CALC BUTTON_MENU +#define CALCULATOR_CLEAR BUTTON_RIGHT + #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD #define CALCULATOR_LEFT BUTTON_PREV diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index 8f25a7adc7..adc73a3749 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c @@ -212,6 +212,16 @@ #define CALENDAR_NEXT_MONTH BUTTON_VOL_DOWN #define CALENDAR_PREV_MONTH BUTTON_VOL_UP +#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD +#define CALENDAR_QUIT BUTTON_POWER +#define CALENDAR_SELECT BUTTON_PLAY +#define CALENDAR_NEXT_WEEK BUTTON_DOWN +#define CALENDAR_PREV_WEEK BUTTON_UP +#define CALENDAR_NEXT_DAY BUTTON_NEXT +#define CALENDAR_PREV_DAY BUTTON_PREV +#define CALENDAR_NEXT_MONTH BUTTON_VOL_DOWN +#define CALENDAR_PREV_MONTH BUTTON_VOL_UP + #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD #define CALENDAR_QUIT BUTTON_POWER #define CALENDAR_SELECT BUTTON_PLAY diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 0ddfcb59fc..4e6965072a 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c @@ -234,6 +234,16 @@ #define CHC_SETTINGS_OK BUTTON_SELECT #define CHC_SETTINGS_CANCEL BUTTON_POWER +#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD +#define CHC_QUIT BUTTON_POWER +#define CHC_STARTSTOP BUTTON_PLAY +#define CHC_RESET BUTTON_RIGHT +#define CHC_MENU BUTTON_MENU +#define CHC_SETTINGS_INC BUTTON_NEXT +#define CHC_SETTINGS_DEC BUTTON_PREV +#define CHC_SETTINGS_OK BUTTON_PLAY +#define CHC_SETTINGS_CANCEL BUTTON_POWER + #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD #define CHC_QUIT BUTTON_POWER #define CHC_STARTSTOP BUTTON_PLAY diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index 86f1bfba5d..8712a58a4c 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c @@ -135,6 +135,12 @@ Still To do: #define ACTION2 BUTTON_SELECT #define ACTIONTEXT "MENU" +#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD +#define QUIT BUTTON_POWER +#define ACTION BUTTON_MENU +#define ACTION2 BUTTON_PLAY +#define ACTIONTEXT "MENU" + #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD #define QUIT BUTTON_POWER #define ACTION BUTTON_MENU diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c index 9eda97a1d9..0c928e008c 100644 --- a/apps/plugins/clix.c +++ b/apps/plugins/clix.c @@ -138,6 +138,14 @@ #define CLIX_BUTTON_UP BUTTON_UP #define CLIX_BUTTON_DOWN BUTTON_DOWN +#elif (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) +#define CLIX_BUTTON_QUIT BUTTON_POWER +#define CLIX_BUTTON_LEFT BUTTON_PREV +#define CLIX_BUTTON_RIGHT BUTTON_NEXT +#define CLIX_BUTTON_CLICK BUTTON_PLAY +#define CLIX_BUTTON_UP BUTTON_UP +#define CLIX_BUTTON_DOWN BUTTON_DOWN + #elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) #define CLIX_BUTTON_QUIT BUTTON_POWER #define CLIX_BUTTON_LEFT BUTTON_PREV diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c index 1954f19cac..077bd67167 100644 --- a/apps/plugins/fireworks.c +++ b/apps/plugins/fireworks.c @@ -99,6 +99,10 @@ #define BTN_MENU BUTTON_MENU #define BTN_FIRE BUTTON_SELECT +#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD +#define BTN_MENU BUTTON_MENU +#define BTN_FIRE BUTTON_PLAY + #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD #define BTN_MENU BUTTON_MENU #define BTN_FIRE BUTTON_PLAY diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 10966c9ebc..7c73ee6ce1 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c @@ -243,6 +243,17 @@ #define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN +#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD +#define OSCILLOSCOPE_QUIT BUTTON_POWER +#define OSCILLOSCOPE_DRAWMODE BUTTON_MENU +#define OSCILLOSCOPE_ADVMODE BUTTON_RIGHT +#define OSCILLOSCOPE_ORIENTATION BUTTON_UP +#define OSCILLOSCOPE_PAUSE BUTTON_PLAY +#define OSCILLOSCOPE_SPEED_UP BUTTON_NEXT +#define OSCILLOSCOPE_SPEED_DOWN BUTTON_PREV +#define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP +#define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN + #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD #define OSCILLOSCOPE_QUIT BUTTON_POWER #define OSCILLOSCOPE_DRAWMODE BUTTON_MENU diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index dc2bd79420..9c80cff272 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c @@ -385,11 +385,29 @@ # define SOL_REM2CUR (BUTTON_LEFT | BUTTON_VIEW) # define SOL_CUR2STACK (BUTTON_SELECT | BUTTON_REPEAT) # define SOL_REM2STACK (BUTTON_RIGHT | BUTTON_VIEW) -# define HK_MOVE "SELECT" -# define HK_DRAW "MENU" -# define HK_REM2CUR "VIEW+LEFT" -# define HK_CUR2STACK "SELECT.." -# define HK_REM2STACK "VIEW+RIGHT" +# define HK_MOVE "SELECT" +# define HK_DRAW "MENU" +# define HK_REM2CUR "VIEW+LEFT" +# define HK_CUR2STACK "SELECT.." +# define HK_REM2STACK "VIEW+RIGHT" + +#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD +# define SOL_QUIT BUTTON_POWER +# define SOL_UP BUTTON_UP +# define SOL_DOWN BUTTON_DOWN +# define SOL_LEFT BUTTON_PREV +# define SOL_RIGHT BUTTON_NEXT +# define SOL_MOVE_PRE BUTTON_PLAY +# define SOL_MOVE (BUTTON_PLAY | BUTTON_REL) +# define SOL_DRAW BUTTON_MENU +# define SOL_REM2CUR BUTTON_LEFT +# define SOL_CUR2STACK (BUTTON_PLAY | BUTTON_REPEAT) +# define SOL_REM2STACK BUTTON_RIGHT +# define HK_MOVE "PLAY" +# define HK_DRAW "MENU" +# define HK_REM2CUR "LEFT" +# define HK_CUR2STACK "PLAY.." +# define HK_REM2STACK "RIGHT" #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD # define SOL_QUIT BUTTON_POWER diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index 443ef4367e..0c4e6f9e7a 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c @@ -234,6 +234,16 @@ static long max_cycle; #define BTN_QUIT BUTTON_POWER #define BTN_STOPRESET BUTTON_VIEW +#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD + +#define BTN_DIR_UP BUTTON_UP +#define BTN_DIR_DOWN BUTTON_DOWN +#define BTN_DIR_LEFT BUTTON_PREV +#define BTN_DIR_RIGHT BUTTON_NEXT +#define BTN_STARTPAUSE BUTTON_MENU +#define BTN_QUIT BUTTON_POWER +#define BTN_STOPRESET BUTTON_RIGHT + #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD #define BTN_DIR_UP BUTTON_UP diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index e93a820b71..11b16d2755 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c @@ -199,6 +199,15 @@ #define DOWN BUTTON_DOWN #define PAUSE BUTTON_VIEW +#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD + +#define QUIT BUTTON_POWER +#define LEFT BUTTON_PREV +#define RIGHT BUTTON_NEXT +#define UP BUTTON_UP +#define DOWN BUTTON_DOWN +#define PAUSE BUTTON_MENU + #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD #define QUIT BUTTON_POWER -- cgit v1.2.3