From 2490262eee17c3dcff0a39fb4011662dfdfc4478 Mon Sep 17 00:00:00 2001 From: Mark Arigo Date: Sat, 24 Jan 2009 22:41:55 +0000 Subject: Plugins for the Philips HDD1630. The keymaps are largely untested on the device (patches welcome). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19846 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/battery_bench.c | 7 +++++++ apps/plugins/blackjack.c | 15 +++++++++++++++ apps/plugins/bounce.c | 8 ++++++++ apps/plugins/brickmania.c | 9 +++++++++ apps/plugins/calculator.c | 11 +++++++++++ apps/plugins/calendar.c | 10 ++++++++++ apps/plugins/chessbox/chessbox_pgn.h | 15 +++++++++++++++ apps/plugins/chessclock.c | 10 ++++++++++ apps/plugins/chip8.c | 12 ++++++++++++ apps/plugins/chopper.c | 6 ++++++ apps/plugins/cube.c | 9 +++++++++ apps/plugins/dict.c | 2 ++ apps/plugins/doom/i_video.c | 11 +++++++++++ apps/plugins/fireworks.c | 23 +++++++++++++++++++++-- apps/plugins/flipit.c | 12 ++++++++++++ apps/plugins/jewels.c | 8 ++++++++ apps/plugins/jpeg/jpeg.h | 11 +++++++++++ apps/plugins/lamp.c | 4 ++++ apps/plugins/lib/pluginlib_actions.c | 9 +++++++++ apps/plugins/logo.c | 7 +++++++ apps/plugins/mandelbrot.c | 12 ++++++++++++ apps/plugins/matrix.c | 19 +++++++++++++++++++ apps/plugins/midi/midiplay.c | 8 ++++++++ apps/plugins/minesweeper.c | 10 ++++++++++ apps/plugins/mosaique.c | 5 +++++ apps/plugins/mp3_encoder.c | 23 ++++++++++++++++++++--- apps/plugins/mpegplayer/mpeg_settings.c | 10 ++++++++++ apps/plugins/mpegplayer/mpegplayer.c | 9 +++++++++ apps/plugins/oscilloscope.c | 11 +++++++++++ apps/plugins/pacbox/pacbox.h | 11 +++++++++++ apps/plugins/pegbox.c | 17 +++++++++++++++++ apps/plugins/plasma.c | 6 ++++++ apps/plugins/pong.c | 8 ++++++++ apps/plugins/reversi/reversi-gui.h | 9 +++++++++ apps/plugins/rockblox.c | 12 ++++++++++++ apps/plugins/rockblox1d.c | 4 ++++ apps/plugins/rockboy/rockboy.c | 10 ++++++++++ apps/plugins/rockpaint.c | 11 +++++++++++ apps/plugins/sliding_puzzle.c | 9 +++++++++ apps/plugins/snake.c | 8 ++++++++ apps/plugins/snake2.c | 14 ++++++++++++++ apps/plugins/snow.c | 2 ++ apps/plugins/sokoban.c | 15 +++++++++++++++ apps/plugins/solitaire.c | 18 ++++++++++++++++++ apps/plugins/spacerocks.c | 13 +++++++++++++ apps/plugins/star.c | 13 +++++++++++++ apps/plugins/starfield.c | 26 ++++++++++++++++++++++---- apps/plugins/stats.c | 3 +++ apps/plugins/stopwatch.c | 24 +++++++++++++++++++++++- apps/plugins/sudoku/sudoku.h | 10 ++++++++++ apps/plugins/viewer.c | 10 ++++++++++ apps/plugins/vu_meter.c | 13 +++++++++++++ apps/plugins/wormlet.c | 14 ++++++++++++++ apps/plugins/xobox.c | 9 +++++++++ apps/plugins/zxbox/keymaps.h | 9 +++++++++ apps/plugins/zxbox/zxbox_keyb.c | 9 +++++++++ 56 files changed, 603 insertions(+), 10 deletions(-) (limited to 'apps/plugins') diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 7c66c5234a..2df55106c6 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c @@ -169,6 +169,13 @@ PLUGIN_HEADER #define BATTERY_OFF BUTTON_BACK #define BATTERY_OFF_TXT "BACK" +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD + +#define BATTERY_ON BUTTON_MENU +#define BATTERY_OFF BUTTON_POWER +#define BATTERY_ON_TXT "MENU - start" +#define BATTERY_OFF_TXT "POWER" + #else #error No keymap defined! #endif diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 4c7d51fad7..222181f71a 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c @@ -318,6 +318,21 @@ PLUGIN_HEADER #define BJACK_RIGHT BUTTON_RIGHT #define BJACK_LEFT BUTTON_LEFT +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define BJACK_START BUTTON_MENU +#define BJACK_QUIT BUTTON_POWER +#define BJACK_MAX BUTTON_VOL_UP +#define BJACK_MIN BUTTON_VOL_DOWN +#define BJACK_HIT BUTTON_VOL_UP +#define BJACK_STAY BUTTON_VOL_DOWN +#define BJACK_DOUBLEDOWN BUTTON_SELECT +#define BJACK_SCORES BUTTON_RIGHT +#define BJACK_RESUME BUTTON_VIEW +#define BJACK_UP BUTTON_UP +#define BJACK_DOWN BUTTON_DOWN +#define BJACK_RIGHT BUTTON_RIGHT +#define BJACK_LEFT BUTTON_LEFT + #else #error No keymap defined! #endif diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index e932a0ebb9..e7e88cc876 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c @@ -155,6 +155,14 @@ PLUGIN_HEADER #define BOUNCE_QUIT BUTTON_BACK #define BOUNCE_MODE BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define BOUNCE_LEFT BUTTON_LEFT +#define BOUNCE_RIGHT BUTTON_RIGHT +#define BOUNCE_UP BUTTON_UP +#define BOUNCE_DOWN BUTTON_DOWN +#define BOUNCE_QUIT BUTTON_POWER +#define BOUNCE_MODE BUTTON_MENU + #else #error No keymap defined! #endif diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 5c915c92f2..15c1641e3f 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c @@ -181,6 +181,15 @@ CONFIG_KEYPAD == SANSA_M200_PAD #define UP BUTTON_UP #define DOWN BUTTON_DOWN +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD + +#define QUIT BUTTON_POWER +#define LEFT BUTTON_LEFT +#define RIGHT BUTTON_RIGHT +#define SELECT BUTTON_SELECT +#define UP BUTTON_UP +#define DOWN BUTTON_DOWN + #else #error No keymap defined! #endif diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 434f0482b7..f8c73ad49a 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c @@ -313,6 +313,17 @@ PLUGIN_HEADER #define CALCULATOR_CALC BUTTON_MENU #define CALCULATOR_CLEAR BUTTON_PLAY +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD + +#define CALCULATOR_LEFT BUTTON_LEFT +#define CALCULATOR_RIGHT BUTTON_RIGHT +#define CALCULATOR_UP BUTTON_UP +#define CALCULATOR_DOWN BUTTON_DOWN +#define CALCULATOR_QUIT BUTTON_POWER +#define CALCULATOR_INPUT BUTTON_SELECT +#define CALCULATOR_CALC BUTTON_MENU +#define CALCULATOR_CLEAR BUTTON_VIEW + #else #error No keymap defined! #endif diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index 07934b06a6..de27012a26 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c @@ -163,6 +163,16 @@ CONFIG_KEYPAD == SANSA_M200_PAD #define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT #define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define CALENDAR_QUIT BUTTON_POWER +#define CALENDAR_SELECT BUTTON_SELECT +#define CALENDAR_NEXT_WEEK BUTTON_DOWN +#define CALENDAR_PREV_WEEK BUTTON_UP +#define CALENDAR_NEXT_DAY BUTTON_RIGHT +#define CALENDAR_PREV_DAY BUTTON_LEFT +#define CALENDAR_NEXT_MONTH BUTTON_VOL_DOWN +#define CALENDAR_PREV_MONTH BUTTON_VOL_UP + #else #error "No keypad setting." #endif diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 24830a5f48..85b21a551b 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h @@ -326,6 +326,21 @@ #define CB_LEVEL BUTTON_CUSTOM #define CB_MENU BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_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_VIEW +#define CB_LEVEL BUTTON_PLAYLIST +#define CB_MENU BUTTON_MENU + +#define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) +#define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) +#define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) +#define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) + #else #error No keymap defined! #endif diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index f8c7a2c64e..1ed9ecdb20 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c @@ -214,6 +214,16 @@ PLUGIN_HEADER #define CHC_SETTINGS_OK BUTTON_SELECT #define CHC_SETTINGS_CANCEL BUTTON_BACK +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define CHC_QUIT BUTTON_POWER +#define CHC_STARTSTOP BUTTON_SELECT +#define CHC_RESET BUTTON_VIEW +#define CHC_MENU BUTTON_MENU +#define CHC_SETTINGS_INC BUTTON_RIGHT +#define CHC_SETTINGS_DEC BUTTON_LEFT +#define CHC_SETTINGS_OK BUTTON_SELECT +#define CHC_SETTINGS_CANCEL BUTTON_POWER + #else #error No keymap defined! #endif diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 9452b72fb4..ecd40f687b 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c @@ -1093,6 +1093,18 @@ CONFIG_KEYPAD == SANSA_M200_PAD #define CHIP8_KEY6 BUTTON_RIGHT #define CHIP8_KEY8 BUTTON_DOWN +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define CHIP8_OFF BUTTON_POWER +#define CHIP8_KEY1 BUTTON_MENU +#define CHIP8_KEY2 BUTTON_UP +#define CHIP8_KEY3 BUTTON_VOL_DOWN +#define CHIP8_KEY4 BUTTON_LEFT +#define CHIP8_KEY5 BUTTON_SELECT +#define CHIP8_KEY6 BUTTON_RIGHT +#define CHIP8_KEY7 BUTTON_VOL_UP +#define CHIP8_KEY8 BUTTON_DOWN +#define CHIP8_KEY9 BUTTON_VIEW + #else #error No keymap defined! #endif diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index 594c4e48bd..67fec2ed38 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c @@ -123,6 +123,12 @@ Still To do: #define ACTION2 BUTTON_MENU #define ACTIONTEXT "UP" +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define QUIT BUTTON_POWER +#define ACTION BUTTON_MENU +#define ACTION2 BUTTON_SELECT +#define ACTIONTEXT "MENU" + #else #error No keymap defined! #endif diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 9ba7a70385..2ad25508da 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c @@ -228,6 +228,15 @@ PLUGIN_HEADER #define CUBE_PAUSE BUTTON_PLAY #define CUBE_HIGHSPEED BUTTON_SELECT +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define CUBE_QUIT BUTTON_POWER +#define CUBE_NEXT BUTTON_RIGHT +#define CUBE_PREV BUTTON_LEFT +#define CUBE_INC BUTTON_UP +#define CUBE_DEC BUTTON_DOWN +#define CUBE_MODE BUTTON_MENU +#define CUBE_PAUSE BUTTON_SELECT +#define CUBE_HIGHSPEED BUTTON_VIEW #else #error No keymap defined! #endif diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index 34b762f3b0..2018d8cb47 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c @@ -139,6 +139,8 @@ long reverse (long N) { #define LP_QUIT BUTTON_POWER #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define LP_QUIT BUTTON_BACK +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define LP_QUIT BUTTON_POWER #else #define LP_QUIT BUTTON_OFF #endif diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 23872c221c..dae2e48069 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c @@ -301,6 +301,17 @@ void I_ShutdownGraphics(void) #define DOOMBUTTON_ENTER BUTTON_PLAY #define DOOMBUTTON_WEAPON BUTTON_MENU #define DOOMBUTTON_MAP BUTTON_CUSTOM +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define DOOMBUTTON_UP BUTTON_UP +#define DOOMBUTTON_DOWN BUTTON_DOWN +#define DOOMBUTTON_LEFT BUTTON_LEFT +#define DOOMBUTTON_RIGHT BUTTON_RIGHT +#define DOOMBUTTON_SHOOT BUTTON_PLAYLIST +#define DOOMBUTTON_OPEN BUTTON_MENU +#define DOOMBUTTON_ESC BUTTON_POWER +#define DOOMBUTTON_ENTER BUTTON_VIEW +#define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN +#define DOOMBUTTON_MAP BUTTON_VOL_UP #else #error Keymap not defined! #endif diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c index 80e31a0e20..a33d0494f9 100644 --- a/apps/plugins/fireworks.c +++ b/apps/plugins/fireworks.c @@ -35,51 +35,70 @@ PLUGIN_HEADER #if (CONFIG_KEYPAD == IRIVER_H300_PAD) || (CONFIG_KEYPAD == IRIVER_H100_PAD) #define BTN_MENU BUTTON_OFF #define BTN_FIRE BUTTON_SELECT + #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define BTN_MENU BUTTON_MENU #define BTN_FIRE BUTTON_SELECT + #elif (CONFIG_KEYPAD == RECORDER_PAD) #define BTN_MENU BUTTON_OFF #define BTN_FIRE BUTTON_PLAY + #elif (CONFIG_KEYPAD == ARCHOS_AV300_PAD) #define BTN_MENU BUTTON_OFF #define BTN_FIRE BUTTON_SELECT + #elif (CONFIG_KEYPAD == ONDIO_PAD) #define BTN_MENU BUTTON_MENU #define BTN_FIRE BUTTON_UP + #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) #define BTN_MENU BUTTON_POWER #define BTN_FIRE BUTTON_SELECT + #elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) #define BTN_MENU BUTTON_MODE #define BTN_FIRE BUTTON_SELECT + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) || \ -(CONFIG_KEYPAD == GIGABEAT_S_PAD) || \ -(CONFIG_KEYPAD == MROBE100_PAD) + (CONFIG_KEYPAD == GIGABEAT_S_PAD) || \ + (CONFIG_KEYPAD == MROBE100_PAD) #define BTN_MENU BUTTON_MENU #define BTN_FIRE BUTTON_SELECT + #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) #define BTN_MENU BUTTON_POWER #define BTN_FIRE BUTTON_SELECT + #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) #define BTN_MENU BUTTON_DOWN #define BTN_FIRE BUTTON_SELECT + #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) #define BTN_MENU BUTTON_POWER #define BTN_FIRE BUTTON_PLAY + #elif CONFIG_KEYPAD == IAUDIO_M3_PAD #define BTN_MENU BUTTON_RC_REC #define BTN_FIRE BUTTON_RC_PLAY + #elif (CONFIG_KEYPAD == COWOND2_PAD) #define BTN_MENU (BUTTON_MENU|BUTTON_REL) + #elif CONFIG_KEYPAD == IAUDIO67_PAD #define BTN_MENU BUTTON_MENU #define BTN_FIRE BUTTON_PLAY + #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define BTN_MENU BUTTON_MENU #define BTN_FIRE BUTTON_SELECT + +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define BTN_MENU BUTTON_MENU +#define BTN_FIRE BUTTON_SELECT + #else #error No keymap defined! #endif diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index fe97a6a068..ae0b1dbaf5 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c @@ -264,6 +264,18 @@ PLUGIN_HEADER #define FLIPIT_STEP_BY_STEP BUTTON_MENU #define FLIPIT_TOGGLE BUTTON_SELECT +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD + +#define FLIPIT_LEFT BUTTON_LEFT +#define FLIPIT_RIGHT BUTTON_RIGHT +#define FLIPIT_UP BUTTON_UP +#define FLIPIT_DOWN BUTTON_DOWN +#define FLIPIT_QUIT BUTTON_POWER +#define FLIPIT_SHUFFLE BUTTON_MENU +#define FLIPIT_SOLVE BUTTON_VIEW +#define FLIPIT_STEP_BY_STEP BUTTON_PLAYLIST +#define FLIPIT_TOGGLE BUTTON_SELECT + #else #error No keymap defined! #endif diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 7b45e554e2..0c66f04656 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c @@ -172,6 +172,14 @@ CONFIG_KEYPAD == SANSA_M200_PAD #define JEWELS_SELECT BUTTON_SELECT #define JEWELS_CANCEL BUTTON_BACK +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define JEWELS_UP BUTTON_UP +#define JEWELS_DOWN BUTTON_DOWN +#define JEWELS_LEFT BUTTON_LEFT +#define JEWELS_RIGHT BUTTON_RIGHT +#define JEWELS_SELECT BUTTON_SELECT +#define JEWELS_CANCEL BUTTON_POWER + #else #error No keymap defined! #endif diff --git a/apps/plugins/jpeg/jpeg.h b/apps/plugins/jpeg/jpeg.h index a33812e2a6..4cbbc272d7 100644 --- a/apps/plugins/jpeg/jpeg.h +++ b/apps/plugins/jpeg/jpeg.h @@ -274,6 +274,17 @@ #define JPEG_NEXT BUTTON_SELECT #define JPEG_PREVIOUS BUTTON_BACK +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define JPEG_ZOOM_IN BUTTON_VOL_UP +#define JPEG_ZOOM_OUT BUTTON_VOL_DOWN +#define JPEG_UP BUTTON_UP +#define JPEG_DOWN BUTTON_DOWN +#define JPEG_LEFT BUTTON_LEFT +#define JPEG_RIGHT BUTTON_RIGHT +#define JPEG_MENU BUTTON_MENU +#define JPEG_NEXT BUTTON_VIEW +#define JPEG_PREVIOUS BUTTON_PLAYLIST + #else #error No keymap defined! #endif diff --git a/apps/plugins/lamp.c b/apps/plugins/lamp.c index 1d99ef64d3..9a91a15e66 100644 --- a/apps/plugins/lamp.c +++ b/apps/plugins/lamp.c @@ -79,6 +79,10 @@ PLUGIN_HEADER # define LAMP_LEFT BUTTON_LEFT # define LAMP_RIGHT BUTTON_RIGHT +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +# define LAMP_LEFT BUTTON_LEFT +# define LAMP_RIGHT BUTTON_RIGHT + #else # error Missing key definitions for this keypad #endif diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 8e2f1253c0..4ae1b1d894 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c @@ -88,6 +88,7 @@ const struct button_mapping generic_directions[] = || (CONFIG_KEYPAD == GIGABEAT_S_PAD) \ || (CONFIG_KEYPAD == MROBE100_PAD) \ || (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) \ + || (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) \ || (CONFIG_KEYPAD == SANSA_CLIP_PAD) \ || (CONFIG_KEYPAD == CREATIVEZVM_PAD) \ || (CONFIG_KEYPAD == SANSA_M200_PAD) @@ -191,6 +192,7 @@ const struct button_mapping generic_left_right_fire[] = || (CONFIG_KEYPAD == GIGABEAT_S_PAD) \ || (CONFIG_KEYPAD == MROBE100_PAD) \ || (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) \ + || (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) \ || (CONFIG_KEYPAD == SANSA_CLIP_PAD) \ || (CONFIG_KEYPAD == SANSA_M200_PAD) { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, @@ -431,6 +433,12 @@ const struct button_mapping generic_actions[] = {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD + {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, + {PLA_START, BUTTON_VIEW, BUTTON_NONE}, + {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, + {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, + {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, #else #error pluginlib_actions: Unsupported keypad #endif @@ -456,6 +464,7 @@ const struct button_mapping generic_increase_decrease[] = || (CONFIG_KEYPAD == GIGABEAT_S_PAD) \ || (CONFIG_KEYPAD == MROBE100_PAD) \ || (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) \ + || (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) \ || (CONFIG_KEYPAD == SANSA_CLIP_PAD) \ || (CONFIG_KEYPAD == CREATIVEZVM_PAD) \ || (CONFIG_KEYPAD == SANSA_M200_PAD) diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index f0d53215ce..8dc5db50e0 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c @@ -158,6 +158,13 @@ const unsigned char rockbox16x7[] = { #define LP_DEC_Y BUTTON_DOWN #define LP_INC_Y BUTTON_UP +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define LP_QUIT BUTTON_POWER +#define LP_DEC_X BUTTON_LEFT +#define LP_INC_X BUTTON_RIGHT +#define LP_DEC_Y BUTTON_DOWN +#define LP_INC_Y BUTTON_UP + #else #define LP_QUIT BUTTON_OFF #define LP_DEC_X BUTTON_LEFT diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c index a763dffa29..c69d5de125 100644 --- a/apps/plugins/mandelbrot.c +++ b/apps/plugins/mandelbrot.c @@ -271,6 +271,18 @@ PLUGIN_HEADER #define MANDELBROT_MAXITER_DEC (BUTTON_DOWN | BUTTON_CUSTOM) #define MANDELBROT_RESET BUTTON_SELECT +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define MANDELBROT_QUIT BUTTON_POWER +#define MANDELBROT_UP BUTTON_UP +#define MANDELBROT_DOWN BUTTON_DOWN +#define MANDELBROT_LEFT BUTTON_LEFT +#define MANDELBROT_RIGHT BUTTON_RIGHT +#define MANDELBROT_ZOOM_IN BUTTON_VIEW +#define MANDELBROT_ZOOM_OUT BUTTON_PLAYLIST +#define MANDELBROT_MAXITER_INC BUTTON_VOL_UP +#define MANDELBROT_MAXITER_DEC BUTTON_VOL_DOWN +#define MANDELBROT_RESET BUTTON_MENU + #else #error No keymap defined! #endif diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c index d7d2469b07..c446665894 100644 --- a/apps/plugins/matrix.c +++ b/apps/plugins/matrix.c @@ -56,64 +56,83 @@ extern const fb_data matrix_normal[]; #define MATRIX_SLEEP_MORE BUTTON_SCROLL_BACK|BUTTON_REPEAT #define MATRIX_SLEEP_LESS BUTTON_SCROLL_FWD|BUTTON_REPEAT #define MATRIX_PAUSE BUTTON_PLAY + #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ (CONFIG_KEYPAD == IRIVER_H300_PAD) #define MATRIX_EXIT BUTTON_OFF #define MATRIX_SLEEP_MORE BUTTON_UP #define MATRIX_SLEEP_LESS BUTTON_DOWN #define MATRIX_PAUSE BUTTON_SELECT + #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) #define MATRIX_EXIT BUTTON_POWER #define MATRIX_SLEEP_MORE BUTTON_SCROLL_UP|BUTTON_REPEAT #define MATRIX_SLEEP_LESS BUTTON_SCROLL_DOWN|BUTTON_REPEAT #define MATRIX_PAUSE BUTTON_PLAY + #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) #define MATRIX_EXIT BUTTON_POWER #define MATRIX_SLEEP_MORE BUTTON_UP #define MATRIX_SLEEP_LESS BUTTON_DOWN #define MATRIX_PAUSE BUTTON_PLAY + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) #define MATRIX_EXIT BUTTON_POWER #define MATRIX_SLEEP_MORE BUTTON_UP #define MATRIX_SLEEP_LESS BUTTON_DOWN #define MATRIX_PAUSE BUTTON_SELECT + #elif CONFIG_KEYPAD == SANSA_E200_PAD #define MATRIX_EXIT BUTTON_POWER #define MATRIX_SLEEP_MORE BUTTON_SCROLL_BACK|BUTTON_REPEAT #define MATRIX_SLEEP_LESS BUTTON_SCROLL_FWD|BUTTON_REPEAT #define MATRIX_PAUSE BUTTON_SELECT + #elif CONFIG_KEYPAD == SANSA_FUZE_PAD #define MATRIX_EXIT BUTTON_DOWN #define MATRIX_SLEEP_MORE BUTTON_SCROLL_BACK|BUTTON_REPEAT #define MATRIX_SLEEP_LESS BUTTON_SCROLL_FWD|BUTTON_REPEAT #define MATRIX_PAUSE BUTTON_SELECT + #elif CONFIG_KEYPAD == SANSA_C200_PAD #define MATRIX_EXIT BUTTON_POWER #define MATRIX_SLEEP_MORE BUTTON_UP #define MATRIX_SLEEP_LESS BUTTON_DOWN #define MATRIX_PAUSE BUTTON_SELECT + #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) #define MATRIX_EXIT BUTTON_BACK #define MATRIX_SLEEP_MORE BUTTON_UP #define MATRIX_SLEEP_LESS BUTTON_DOWN #define MATRIX_PAUSE BUTTON_SELECT + #elif CONFIG_KEYPAD == IAUDIO_M3_PAD #define MATRIX_EXIT BUTTON_RC_REC #define MATRIX_SLEEP_MORE BUTTON_RC_VOL_UP #define MATRIX_SLEEP_LESS BUTTON_RC_VOL_DOWN #define MATRIX_PAUSE BUTTON_RC_PLAY + #elif (CONFIG_KEYPAD == COWOND2_PAD) #define MATRIX_EXIT BUTTON_POWER + #elif CONFIG_KEYPAD == IAUDIO67_PAD #define MATRIX_EXIT BUTTON_POWER #define MATRIX_SLEEP_MORE BUTTON_VOLUP #define MATRIX_SLEEP_LESS BUTTON_VOLDOWN #define MATRIX_PAUSE BUTTON_PLAY + #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define MATRIX_EXIT BUTTON_BACK #define MATRIX_SLEEP_MORE BUTTON_UP #define MATRIX_SLEEP_LESS BUTTON_DOWN #define MATRIX_PAUSE BUTTON_PLAY + +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define MATRIX_EXIT BUTTON_POWER +#define MATRIX_SLEEP_MORE BUTTON_UP +#define MATRIX_SLEEP_LESS BUTTON_DOWN +#define MATRIX_PAUSE BUTTON_SELECT + #else #error Unsupported keypad #endif diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index b506b680fd..ac23187686 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c @@ -168,6 +168,14 @@ PLUGIN_IRAM_DECLARE #define BTN_DOWN BUTTON_DOWN #define BTN_PLAY BUTTON_PLAY +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define BTN_QUIT BUTTON_POWER +#define BTN_RIGHT BUTTON_RIGHT +#define BTN_LEFT BUTTON_LEFT +#define BTN_UP BUTTON_UP +#define BTN_DOWN BUTTON_DOWN +#define BTN_PLAY BUTTON_MENU + #else #error No keymap defined! #endif diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 7cffdaf230..4adfc07d0e 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c @@ -212,6 +212,16 @@ enum minesweeper_status { # define MINESWP_DISCOVER BUTTON_PLAY # define MINESWP_INFO BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +# define MINESWP_LEFT BUTTON_LEFT +# define MINESWP_RIGHT BUTTON_RIGHT +# define MINESWP_UP BUTTON_UP +# define MINESWP_DOWN BUTTON_DOWN +# define MINESWP_QUIT BUTTON_POWER +# define MINESWP_TOGGLE BUTTON_VIEW +# define MINESWP_DISCOVER BUTTON_SELECT +# define MINESWP_INFO BUTTON_MENU + #else #error No keymap defined! #endif diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index 81b79c73ac..1bb0044c07 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c @@ -140,6 +140,11 @@ PLUGIN_HEADER #define MOSAIQUE_SPEED BUTTON_SELECT #define MOSAIQUE_RESTART BUTTON_PLAY +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define MOSAIQUE_QUIT BUTTON_POWER +#define MOSAIQUE_SPEED BUTTON_VIEW +#define MOSAIQUE_RESTART BUTTON_MENU + #else #error No keymap defined! #endif diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index 93de53edac..bbba5ab2f9 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c @@ -2411,26 +2411,30 @@ void get_mp3_filename(const char *wav_name) #define MP3ENC_NEXT BUTTON_DOWN #define MP3ENC_DONE BUTTON_OFF #define MP3ENC_SELECT BUTTON_SELECT + #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define MP3ENC_PREV BUTTON_SCROLL_BACK #define MP3ENC_NEXT BUTTON_SCROLL_FWD #define MP3ENC_DONE BUTTON_MENU #define MP3ENC_SELECT BUTTON_SELECT + #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD #define MP3ENC_PREV BUTTON_UP #define MP3ENC_NEXT BUTTON_DOWN #define MP3ENC_DONE BUTTON_POWER #define MP3ENC_SELECT BUTTON_SELECT + #elif CONFIG_KEYPAD == GIGABEAT_PAD #define MP3ENC_PREV BUTTON_UP #define MP3ENC_NEXT BUTTON_DOWN #define MP3ENC_DONE BUTTON_POWER #define MP3ENC_SELECT BUTTON_SELECT + #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ -(CONFIG_KEYPAD == SANSA_C200_PAD) || \ -(CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ -(CONFIG_KEYPAD == SANSA_M200_PAD) + (CONFIG_KEYPAD == SANSA_C200_PAD) || \ + (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ + (CONFIG_KEYPAD == SANSA_M200_PAD) #define MP3ENC_PREV BUTTON_UP #define MP3ENC_NEXT BUTTON_DOWN #define MP3ENC_DONE BUTTON_POWER @@ -2447,33 +2451,46 @@ void get_mp3_filename(const char *wav_name) #define MP3ENC_NEXT BUTTON_SCROLL_DOWN #define MP3ENC_DONE BUTTON_POWER #define MP3ENC_SELECT BUTTON_PLAY + #elif CONFIG_KEYPAD == GIGABEAT_S_PAD #define MP3ENC_PREV BUTTON_UP #define MP3ENC_NEXT BUTTON_DOWN #define MP3ENC_DONE BUTTON_BACK #define MP3ENC_SELECT BUTTON_SELECT + #elif CONFIG_KEYPAD == MROBE100_PAD #define MP3ENC_PREV BUTTON_UP #define MP3ENC_NEXT BUTTON_DOWN #define MP3ENC_DONE BUTTON_POWER #define MP3ENC_SELECT BUTTON_SELECT + #elif CONFIG_KEYPAD == IAUDIO_M3_PAD #define MP3ENC_PREV BUTTON_RC_VOL_UP #define MP3ENC_NEXT BUTTON_RC_VOL_DOWN #define MP3ENC_DONE BUTTON_RC_REC #define MP3ENC_SELECT BUTTON_RC_FF + #elif CONFIG_KEYPAD == COWOND2_PAD #define MP3ENC_DONE BUTTON_POWER + #elif CONFIG_KEYPAD == IAUDIO67_PAD #define MP3ENC_PREV BUTTON_LEFT #define MP3ENC_NEXT BUTTON_RIGHT #define MP3ENC_DONE BUTTON_POWER #define MP3ENC_SELECT BUTTON_PLAY + #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define MP3ENC_PREV BUTTON_UP #define MP3ENC_NEXT BUTTON_DOWN #define MP3ENC_DONE BUTTON_BACK #define MP3ENC_SELECT BUTTON_SELECT + +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define MP3ENC_PREV BUTTON_UP +#define MP3ENC_NEXT BUTTON_DOWN +#define MP3ENC_DONE BUTTON_POWER +#define MP3ENC_SELECT BUTTON_SELECT + #else #error No keymap defined! #endif diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 4b77518f54..f9f31fa88f 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c @@ -145,6 +145,16 @@ struct mpeg_settings settings; #define MPEG_START_TIME_DOWN BUTTON_DOWN #define MPEG_START_TIME_EXIT BUTTON_BACK +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define MPEG_START_TIME_SELECT BUTTON_SELECT +#define MPEG_START_TIME_LEFT BUTTON_LEFT +#define MPEG_START_TIME_RIGHT BUTTON_RIGHT +#define MPEG_START_TIME_UP BUTTON_UP +#define MPEG_START_TIME_DOWN BUTTON_DOWN +#define MPEG_START_TIME_SCROLL_DOWN BUTTON_VOL_DOWN +#define MPEG_START_TIME_SCROLL_UP BUTTON_VOL_UP +#define MPEG_START_TIME_EXIT BUTTON_POWER + #else #error No keymap defined! #endif diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index fbd3dc6b2c..66c647ff00 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -252,6 +252,15 @@ CONFIG_KEYPAD == SANSA_M200_PAD #define MPEG_RW BUTTON_LEFT #define MPEG_FF BUTTON_RIGHT +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define MPEG_MENU BUTTON_MENU +#define MPEG_STOP BUTTON_POWER +#define MPEG_PAUSE BUTTON_SELECT +#define MPEG_VOLDOWN BUTTON_VOL_DOWN +#define MPEG_VOLUP BUTTON_VOL_UP +#define MPEG_RW BUTTON_LEFT +#define MPEG_FF BUTTON_RIGHT + #else #error No keymap defined! #endif diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 9401c62d1f..5d55bb43b9 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c @@ -232,6 +232,17 @@ PLUGIN_HEADER #define OSCILLOSCOPE_VOL_UP BUTTON_UP #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define OSCILLOSCOPE_QUIT BUTTON_POWER +#define OSCILLOSCOPE_DRAWMODE BUTTON_MENU +#define OSCILLOSCOPE_ADVMODE BUTTON_VIEW +#define OSCILLOSCOPE_ORIENTATION BUTTON_UP +#define OSCILLOSCOPE_PAUSE BUTTON_SELECT +#define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT +#define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT +#define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP +#define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN + #else #error No keymap defined! #endif diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index 2d559fd6df..d91e8cf98f 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h @@ -181,6 +181,17 @@ #define PACMAN_COIN BUTTON_SELECT #define PACMAN_MENU BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD + +#define PACMAN_UP BUTTON_UP +#define PACMAN_DOWN BUTTON_DOWN +#define PACMAN_LEFT BUTTON_LEFT +#define PACMAN_RIGHT BUTTON_RIGHT +#define PACMAN_1UP BUTTON_VOL_UP +#define PACMAN_2UP BUTTON_VOL_DOWN +#define PACMAN_COIN BUTTON_VIEW +#define PACMAN_MENU BUTTON_MENU + #else #error Keymap not defined! diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index cc4d3aa7ab..514b92ebb6 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c @@ -353,6 +353,23 @@ PLUGIN_HEADER #define LVL_UP_TEXT "SELECT" #define LVL_DOWN_TEXT "MENU" +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define PEGBOX_SAVE BUTTON_VIEW +#define PEGBOX_QUIT BUTTON_POWER +#define PEGBOX_RESTART BUTTON_MENU +#define PEGBOX_LVL_UP BUTTON_VOL_UP +#define PEGBOX_LVL_DOWN BUTTON_VOL_DOWN +#define PEGBOX_UP BUTTON_UP +#define PEGBOX_DOWN BUTTON_DOWN +#define PEGBOX_RIGHT BUTTON_RIGHT +#define PEGBOX_LEFT BUTTON_LEFT + +#define SAVE_TEXT "VIEW" +#define QUIT_TEXT "POWER" +#define RESTART_TEXT "MENU" +#define LVL_UP_TEXT "VOL+" +#define LVL_DOWN_TEXT "VOL-" + #else #error Unsupported keymap! #endif diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index 1d3dd6c432..a172372da4 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c @@ -117,6 +117,12 @@ static int plasma_frequency; #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN #define PLASMA_REGEN_COLORS BUTTON_SELECT +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define PLASMA_QUIT BUTTON_POWER +#define PLASMA_INCREASE_FREQUENCY BUTTON_UP +#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN +#define PLASMA_REGEN_COLORS BUTTON_SELECT + #endif #ifdef HAVE_TOUCHSCREEN diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 905e7689f8..148f1a1a1e 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c @@ -169,6 +169,14 @@ PLUGIN_HEADER #define PONG_RIGHT_UP BUTTON_PLAY #define PONG_RIGHT_DOWN BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define PONG_QUIT BUTTON_POWER +#define PONG_PAUSE BUTTON_MENU +#define PONG_LEFT_UP BUTTON_UP +#define PONG_LEFT_DOWN BUTTON_DOWN +#define PONG_RIGHT_UP BUTTON_VOL_UP +#define PONG_RIGHT_DOWN BUTTON_VOL_DOWN + #else #error No keymap defined! #endif diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index 50effc03a7..ccd67aaa18 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h @@ -168,6 +168,15 @@ #define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT #define REVERSI_BUTTON_MENU BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define REVERSI_BUTTON_QUIT BUTTON_POWER +#define REVERSI_BUTTON_UP BUTTON_UP +#define REVERSI_BUTTON_DOWN BUTTON_DOWN +#define REVERSI_BUTTON_LEFT BUTTON_LEFT +#define REVERSI_BUTTON_RIGHT BUTTON_RIGHT +#define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT +#define REVERSI_BUTTON_MENU BUTTON_MENU + #else #error No keymap defined! #endif diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index a68df25f2a..0526bd5d46 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c @@ -276,6 +276,18 @@ PLUGIN_HEADER #define ROCKBLOX_DROP BUTTON_SELECT #define ROCKBLOX_RESTART BUTTON_CUSTOM +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD + +#define ROCKBLOX_OFF BUTTON_POWER +#define ROCKBLOX_ROTATE_RIGHT BUTTON_VOL_DOWN +#define ROCKBLOX_ROTATE_LEFT BUTTON_VOL_UP +#define ROCKBLOX_ROTATE BUTTON_UP +#define ROCKBLOX_DOWN BUTTON_DOWN +#define ROCKBLOX_LEFT BUTTON_LEFT +#define ROCKBLOX_RIGHT BUTTON_RIGHT +#define ROCKBLOX_DROP BUTTON_SELECT +#define ROCKBLOX_RESTART BUTTON_MENU + #else #error No keymap defined! #endif diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c index 38126d2239..d7779fadd6 100644 --- a/apps/plugins/rockblox1d.c +++ b/apps/plugins/rockblox1d.c @@ -94,6 +94,10 @@ PLUGIN_HEADER #define ONEDROCKBLOX_DOWN BUTTON_SELECT #define ONEDROCKBLOX_QUIT BUTTON_BACK +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define ONEDROCKBLOX_DOWN BUTTON_SELECT +#define ONEDROCKBLOX_QUIT BUTTON_POWER + #else #error No keymap defined! #endif diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index ae0d218ccb..84dcc33ef0 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c @@ -235,6 +235,16 @@ static void setoptions (void) options.START=BUTTON_BACK; options.SELECT=BUTTON_SELECT; options.MENU=BUTTON_MENU; + +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD + options.UP=BUTTON_UP; + options.DOWN=BUTTON_DOWN; + + options.A=BUTTON_VOL_UP; + options.B=BUTTON_VOL_DOWN; + options.START=BUTTON_VIEW; + options.SELECT=BUTTON_SELECT; + options.MENU=BUTTON_MENU; #else #error No Keymap Defined! #endif diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 9cfbf7c915..7423d75ebd 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c @@ -146,6 +146,17 @@ PLUGIN_HEADER #define ROCKPAINT_LEFT BUTTON_LEFT #define ROCKPAINT_RIGHT BUTTON_RIGHT +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define ROCKPAINT_QUIT BUTTON_POWER +#define ROCKPAINT_DRAW BUTTON_SELECT +#define ROCKPAINT_MENU BUTTON_MENU +#define ROCKPAINT_TOOLBAR BUTTON_VIEW +#define ROCKPAINT_TOOLBAR2 BUTTON_PLAYLIST +#define ROCKPAINT_UP BUTTON_UP +#define ROCKPAINT_DOWN BUTTON_DOWN +#define ROCKPAINT_LEFT BUTTON_LEFT +#define ROCKPAINT_RIGHT BUTTON_RIGHT + #else #error "Please define keys for this keypad" #endif diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 9a46dac664..c5c8c67d25 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c @@ -181,6 +181,15 @@ PLUGIN_HEADER #define PUZZLE_SHUFFLE BUTTON_PLAY #define PUZZLE_PICTURE BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define PUZZLE_QUIT BUTTON_POWER +#define PUZZLE_LEFT BUTTON_LEFT +#define PUZZLE_RIGHT BUTTON_RIGHT +#define PUZZLE_UP BUTTON_UP +#define PUZZLE_DOWN BUTTON_DOWN +#define PUZZLE_SHUFFLE BUTTON_VIEW +#define PUZZLE_PICTURE BUTTON_MENU + #else #error No keymap defined! #endif diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index 6d1277564b..ef179c6654 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c @@ -156,6 +156,14 @@ PLUGIN_HEADER #define SNAKE_DOWN BUTTON_DOWN #define SNAKE_PLAYPAUSE BUTTON_PLAY +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define SNAKE_QUIT BUTTON_POWER +#define SNAKE_LEFT BUTTON_LEFT +#define SNAKE_RIGHT BUTTON_RIGHT +#define SNAKE_UP BUTTON_UP +#define SNAKE_DOWN BUTTON_DOWN +#define SNAKE_PLAYPAUSE BUTTON_MENU + #else #error No keymap defined! #endif diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 8cd8794057..d5ffc9f6d2 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c @@ -336,6 +336,20 @@ PLUGIN_HEADER #define SNAKE2_PLAYPAUSE BUTTON_PLAY #define SNAKE2_PLAYPAUSE_TEXT "Play" +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define SNAKE2_LEFT BUTTON_LEFT +#define SNAKE2_RIGHT BUTTON_RIGHT +#define SNAKE2_UP BUTTON_UP +#define SNAKE2_DOWN BUTTON_DOWN +#define SNAKE2_QUIT BUTTON_POWER +#define SNAKE2_LEVEL_UP BUTTON_UP +#define SNAKE2_LEVEL_DOWN BUTTON_DOWN +#define SNAKE2_MAZE_NEXT BUTTON_RIGHT +#define SNAKE2_MAZE_LAST BUTTON_LEFT +#define SNAKE2_SELECT_TYPE BUTTON_MENU +#define SNAKE2_PLAYPAUSE BUTTON_VIEW +#define SNAKE2_PLAYPAUSE_TEXT "View" + #else #error No keymap defined! #endif diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 1cfc3345ab..3df2c0a016 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c @@ -72,6 +72,8 @@ PLUGIN_HEADER #define SNOW_QUIT BUTTON_POWER #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define SNOW_QUIT BUTTON_BACK +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define SNOW_QUIT BUTTON_POWER #else #define SNOW_QUIT BUTTON_OFF #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 96dc17591c..931a802920 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c @@ -361,6 +361,21 @@ PLUGIN_HEADER #define BUTTON_SAVE BUTTON_CUSTOM #define BUTTON_SAVE_NAME "CUSTOM" +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define SOKOBAN_LEFT BUTTON_LEFT +#define SOKOBAN_RIGHT BUTTON_RIGHT +#define SOKOBAN_UP BUTTON_UP +#define SOKOBAN_DOWN BUTTON_DOWN +#define SOKOBAN_MENU BUTTON_MENU +#define SOKOBAN_UNDO BUTTON_VIEW +#define SOKOBAN_REDO (BUTTON_SELECT | BUTTON_VIEW) +#define SOKOBAN_LEVEL_DOWN BUTTON_VOL_DOWN +#define SOKOBAN_LEVEL_REPEAT BUTTON_POWER +#define SOKOBAN_LEVEL_UP BUTTON_VOL_UP +#define SOKOBAN_PAUSE BUTTON_SELECT +#define BUTTON_SAVE BUTTON_PLAYLIST +#define BUTTON_SAVE_NAME "PLAYLIST" + #else #error No keymap defined! #endif diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index bbf7c11291..c6cf6f0b0c 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c @@ -380,6 +380,24 @@ PLUGIN_HEADER # define HK_CUR2STACK "PLAY.." # define HK_REM2STACK "PLAY+RIGHT" +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +# define SOL_QUIT BUTTON_POWER +# define SOL_UP BUTTON_UP +# define SOL_DOWN BUTTON_DOWN +# define SOL_LEFT BUTTON_LEFT +# define SOL_RIGHT BUTTON_RIGHT +# define SOL_MOVE_PRE BUTTON_SELECT +# define SOL_MOVE (BUTTON_SELECT | BUTTON_REL) +# define SOL_DRAW BUTTON_MENU +# 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" + #else #error No keymap defined! #endif diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index b4cddd9a12..0891906b12 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c @@ -254,6 +254,19 @@ PLUGIN_HEADER #define AST_FIRE BUTTON_SELECT #define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT) +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define AST_PAUSE BUTTON_VIEW +#define AST_QUIT BUTTON_POWER +#define AST_THRUST_REP (BUTTON_UP | BUTTON_REPEAT) +#define AST_THRUST BUTTON_UP +#define AST_HYPERSPACE BUTTON_DOWN +#define AST_LEFT BUTTON_LEFT +#define AST_LEFT_REP (BUTTON_LEFT | BUTTON_REPEAT) +#define AST_RIGHT BUTTON_RIGHT +#define AST_RIGHT_REP (BUTTON_RIGHT | BUTTON_REPEAT) +#define AST_FIRE BUTTON_PLAYLIST +#define AST_FIRE_REP (BUTTON_PLAYLIST | BUTTON_REPEAT) + #else #error No keymap defined! #endif diff --git a/apps/plugins/star.c b/apps/plugins/star.c index fd727fa34b..931161308a 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c @@ -249,6 +249,19 @@ PLUGIN_HEADER #define STAR_LEVEL_REPEAT (BUTTON_CUSTOM | BUTTON_RIGHT) #define STAR_MENU_RUN BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD + +#define STAR_QUIT BUTTON_POWER +#define STAR_LEFT BUTTON_LEFT +#define STAR_RIGHT BUTTON_RIGHT +#define STAR_UP BUTTON_UP +#define STAR_DOWN BUTTON_DOWN +#define STAR_TOGGLE_CONTROL BUTTON_SELECT +#define STAR_LEVEL_UP BUTTON_VOL_UP +#define STAR_LEVEL_DOWN BUTTON_VOL_DOWN +#define STAR_LEVEL_REPEAT BUTTON_VIEW +#define STAR_MENU_RUN BUTTON_MENU + #else #error No keymap defined! #endif diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index bd75df3835..8b5c64d8d7 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c @@ -36,6 +36,7 @@ PLUGIN_HEADER #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT #define STARFIELD_TOGGLE_COLOR BUTTON_PLAY + #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) #define STARFIELD_QUIT BUTTON_POWER #define STARFIELD_INCREASE_ZMOVE BUTTON_UP @@ -43,6 +44,7 @@ PLUGIN_HEADER #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT #define STARFIELD_TOGGLE_COLOR BUTTON_PLAY + #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) #define STARFIELD_QUIT BUTTON_POWER #define STARFIELD_INCREASE_ZMOVE BUTTON_SCROLL_UP @@ -50,6 +52,7 @@ PLUGIN_HEADER #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT #define STARFIELD_TOGGLE_COLOR BUTTON_PLAY + #elif (CONFIG_KEYPAD == GIGABEAT_PAD) #define STARFIELD_QUIT BUTTON_POWER #define STARFIELD_INCREASE_ZMOVE BUTTON_UP @@ -57,17 +60,19 @@ PLUGIN_HEADER #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT #define STARFIELD_TOGGLE_COLOR BUTTON_SELECT + #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ -(CONFIG_KEYPAD == SANSA_C200_PAD) || \ -(CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ -(CONFIG_KEYPAD == SANSA_M200_PAD) || \ -(CONFIG_KEYPAD == SANSA_FUZE_PAD) + (CONFIG_KEYPAD == SANSA_C200_PAD) || \ + (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ + (CONFIG_KEYPAD == SANSA_M200_PAD) || \ + (CONFIG_KEYPAD == SANSA_FUZE_PAD) #define STARFIELD_QUIT BUTTON_POWER #define STARFIELD_INCREASE_ZMOVE BUTTON_UP #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT #define STARFIELD_TOGGLE_COLOR BUTTON_SELECT + #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) #define STARFIELD_QUIT BUTTON_BACK #define STARFIELD_INCREASE_ZMOVE BUTTON_UP @@ -75,6 +80,7 @@ PLUGIN_HEADER #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT #define STARFIELD_TOGGLE_COLOR BUTTON_SELECT + #elif (CONFIG_KEYPAD == MROBE100_PAD) #define STARFIELD_QUIT BUTTON_POWER #define STARFIELD_INCREASE_ZMOVE BUTTON_UP @@ -82,6 +88,7 @@ PLUGIN_HEADER #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT #define STARFIELD_TOGGLE_COLOR BUTTON_SELECT + #elif CONFIG_KEYPAD == IAUDIO_M3_PAD #define STARFIELD_QUIT BUTTON_RC_REC #define STARFIELD_INCREASE_ZMOVE BUTTON_RC_VOL_UP @@ -89,6 +96,7 @@ PLUGIN_HEADER #define STARFIELD_INCREASE_NB_STARS BUTTON_RC_FF #define STARFIELD_DECREASE_NB_STARS BUTTON_RC_REW #define STARFIELD_TOGGLE_COLOR BUTTON_RC_MODE + #elif CONFIG_KEYPAD == IAUDIO67_PAD #define STARFIELD_QUIT BUTTON_POWER #define STARFIELD_INCREASE_ZMOVE BUTTON_STOP @@ -96,8 +104,10 @@ PLUGIN_HEADER #define STARFIELD_INCREASE_NB_STARS BUTTON_LEFT #define STARFIELD_DECREASE_NB_STARS BUTTON_RIGHT #define STARFIELD_TOGGLE_COLOR BUTTON_MENU + #elif (CONFIG_KEYPAD == COWOND2_PAD) #define STARFIELD_QUIT BUTTON_POWER + #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define STARFIELD_QUIT BUTTON_BACK #define STARFIELD_INCREASE_ZMOVE BUTTON_UP @@ -105,6 +115,14 @@ PLUGIN_HEADER #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT #define STARFIELD_TOGGLE_COLOR BUTTON_SELECT + +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define STARFIELD_QUIT BUTTON_POWER +#define STARFIELD_INCREASE_ZMOVE BUTTON_UP +#define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN +#define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT +#define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT +#define STARFIELD_TOGGLE_COLOR BUTTON_SELECT #endif #ifdef HAVE_TOUCHSCREEN diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index 0219d0fb0d..346d4206c2 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c @@ -90,6 +90,9 @@ static bool abort; #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define STATS_STOP BUTTON_BACK +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define STATS_STOP BUTTON_POWER + #else #error No keymap defined! #endif diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index 0de01287cd..4cba167738 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c @@ -42,6 +42,7 @@ PLUGIN_HEADER #define STOPWATCH_LAP_TIMER BUTTON_ON #define STOPWATCH_SCROLL_UP BUTTON_UP #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN + #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD #define STOPWATCH_QUIT BUTTON_OFF #define STOPWATCH_START_STOP BUTTON_SELECT @@ -49,6 +50,7 @@ PLUGIN_HEADER #define STOPWATCH_LAP_TIMER BUTTON_ON #define STOPWATCH_SCROLL_UP BUTTON_UP #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN + #elif CONFIG_KEYPAD == ONDIO_PAD #define STOPWATCH_QUIT BUTTON_OFF #define STOPWATCH_START_STOP BUTTON_RIGHT @@ -56,6 +58,7 @@ PLUGIN_HEADER #define STOPWATCH_LAP_TIMER BUTTON_MENU #define STOPWATCH_SCROLL_UP BUTTON_UP #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN + #elif CONFIG_KEYPAD == PLAYER_PAD #define STOPWATCH_QUIT BUTTON_MENU #define STOPWATCH_START_STOP BUTTON_PLAY @@ -63,6 +66,7 @@ PLUGIN_HEADER #define STOPWATCH_LAP_TIMER BUTTON_ON #define STOPWATCH_SCROLL_UP BUTTON_RIGHT #define STOPWATCH_SCROLL_DOWN BUTTON_LEFT + #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ (CONFIG_KEYPAD == IRIVER_H300_PAD) #define STOPWATCH_QUIT BUTTON_OFF @@ -71,7 +75,6 @@ PLUGIN_HEADER #define STOPWATCH_LAP_TIMER BUTTON_ON #define STOPWATCH_SCROLL_UP BUTTON_RIGHT #define STOPWATCH_SCROLL_DOWN BUTTON_LEFT - #define STOPWATCH_RC_QUIT BUTTON_RC_STOP #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ @@ -83,6 +86,7 @@ PLUGIN_HEADER #define STOPWATCH_LAP_TIMER BUTTON_RIGHT #define STOPWATCH_SCROLL_UP BUTTON_SCROLL_FWD #define STOPWATCH_SCROLL_DOWN BUTTON_SCROLL_BACK + #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD #define STOPWATCH_QUIT BUTTON_PLAY #define STOPWATCH_START_STOP BUTTON_MODE @@ -90,6 +94,7 @@ PLUGIN_HEADER #define STOPWATCH_LAP_TIMER BUTTON_SELECT #define STOPWATCH_SCROLL_UP BUTTON_UP #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN + #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD #define STOPWATCH_QUIT BUTTON_POWER #define STOPWATCH_START_STOP BUTTON_PLAY @@ -97,6 +102,7 @@ PLUGIN_HEADER #define STOPWATCH_LAP_TIMER BUTTON_SELECT #define STOPWATCH_SCROLL_UP BUTTON_UP #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN + #elif CONFIG_KEYPAD == GIGABEAT_PAD #define STOPWATCH_QUIT BUTTON_POWER #define STOPWATCH_START_STOP BUTTON_SELECT @@ -131,6 +137,7 @@ PLUGIN_HEADER #define STOPWATCH_LAP_TIMER BUTTON_FF #define STOPWATCH_SCROLL_UP BUTTON_SCROLL_UP #define STOPWATCH_SCROLL_DOWN BUTTON_SCROLL_DOWN + #elif CONFIG_KEYPAD == MROBE500_PAD #define STOPWATCH_QUIT BUTTON_POWER #define STOPWATCH_START_STOP BUTTON_RC_HEART @@ -138,6 +145,7 @@ PLUGIN_HEADER #define STOPWATCH_LAP_TIMER BUTTON_RC_PLAY #define STOPWATCH_SCROLL_UP BUTTON_RIGHT #define STOPWATCH_SCROLL_DOWN BUTTON_LEFT + #elif CONFIG_KEYPAD == GIGABEAT_S_PAD #define STOPWATCH_QUIT BUTTON_BACK #define STOPWATCH_START_STOP BUTTON_PLAY @@ -145,6 +153,7 @@ PLUGIN_HEADER #define STOPWATCH_LAP_TIMER BUTTON_SELECT #define STOPWATCH_SCROLL_UP BUTTON_UP #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN + #elif CONFIG_KEYPAD == MROBE100_PAD #define STOPWATCH_QUIT BUTTON_POWER #define STOPWATCH_START_STOP BUTTON_SELECT @@ -152,6 +161,7 @@ PLUGIN_HEADER #define STOPWATCH_LAP_TIMER BUTTON_MENU #define STOPWATCH_SCROLL_UP BUTTON_UP #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN + #elif CONFIG_KEYPAD == IAUDIO_M3_PAD #define STOPWATCH_QUIT BUTTON_RC_REC #define STOPWATCH_START_STOP BUTTON_RC_PLAY @@ -160,8 +170,10 @@ PLUGIN_HEADER #define STOPWATCH_SCROLL_UP BUTTON_RC_VOL_UP #define STOPWATCH_SCROLL_DOWN BUTTON_RC_VOL_DOWN #define STOPWATCH_RC_QUIT BUTTON_REC + #elif CONFIG_KEYPAD == COWOND2_PAD #define STOPWATCH_QUIT BUTTON_POWER + #elif CONFIG_KEYPAD == IAUDIO67_PAD #define STOPWATCH_QUIT BUTTON_MENU #define STOPWATCH_START_STOP BUTTON_PLAY @@ -170,6 +182,7 @@ PLUGIN_HEADER #define STOPWATCH_SCROLL_UP BUTTON_VOLUP #define STOPWATCH_SCROLL_DOWN BUTTON_VOLDOWN #define STOPWATCH_RC_QUIT BUTTON_POWER + #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define STOPWATCH_QUIT BUTTON_BACK #define STOPWATCH_START_STOP BUTTON_PLAY @@ -177,6 +190,15 @@ PLUGIN_HEADER #define STOPWATCH_LAP_TIMER BUTTON_CUSTOM #define STOPWATCH_SCROLL_UP BUTTON_UP #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN + +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define STOPWATCH_QUIT BUTTON_POWER +#define STOPWATCH_START_STOP BUTTON_SELECT +#define STOPWATCH_RESET_TIMER BUTTON_MENU +#define STOPWATCH_LAP_TIMER BUTTON_VIEW +#define STOPWATCH_SCROLL_UP BUTTON_UP +#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN + #else #error No keymap defined! #endif diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 2b3e18f401..1191f37db5 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h @@ -245,6 +245,16 @@ #define SUDOKU_BUTTON_MENU BUTTON_MENU #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define SUDOKU_BUTTON_QUIT BUTTON_POWER +#define SUDOKU_BUTTON_UP BUTTON_UP +#define SUDOKU_BUTTON_DOWN BUTTON_DOWN +#define SUDOKU_BUTTON_LEFT BUTTON_LEFT +#define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT +#define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT +#define SUDOKU_BUTTON_MENU BUTTON_MENU +#define SUDOKU_BUTTON_POSSIBLE BUTTON_VIEW + #else #error No keymap defined! #endif diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index 7e03c559f4..f01afbba8c 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c @@ -314,6 +314,16 @@ PLUGIN_HEADER #define VIEWER_MENU BUTTON_MENU #define VIEWER_AUTOSCROLL BUTTON_SELECT +/* Philips HDD1630 keys */ +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define VIEWER_QUIT BUTTON_POWER +#define VIEWER_PAGE_UP BUTTON_UP +#define VIEWER_PAGE_DOWN BUTTON_DOWN +#define VIEWER_SCREEN_LEFT BUTTON_LEFT +#define VIEWER_SCREEN_RIGHT BUTTON_RIGHT +#define VIEWER_MENU BUTTON_MENU +#define VIEWER_AUTOSCROLL BUTTON_VIEW + #else #error No keymap defined! #endif diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 007be361b2..77d2924ebb 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c @@ -262,6 +262,19 @@ PLUGIN_HEADER #define LABEL_MENU "MENU" #define LABEL_VOLUME "UP/DOWN" +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define VUMETER_QUIT BUTTON_POWER +#define VUMETER_HELP BUTTON_VIEW +#define VUMETER_MENU BUTTON_MENU +#define VUMETER_MENU_EXIT BUTTON_MENU +#define VUMETER_MENU_EXIT2 BUTTON_POWER +#define VUMETER_UP BUTTON_UP +#define VUMETER_DOWN BUTTON_DOWN +#define LABEL_HELP "VIEW" +#define LABEL_QUIT "POWER" +#define LABEL_MENU "MENU" +#define LABEL_VOLUME "UP/DOWN" + #else #error No keymap defined! #endif diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index ee8046275f..63eb43f258 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c @@ -260,6 +260,20 @@ PLUGIN_HEADER #define PLAYERS_TEXT "Up/Down" #define WORMS_TEXT "Left/Right" + +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD + +#define BTN_DIR_UP BUTTON_UP +#define BTN_DIR_DOWN BUTTON_DOWN +#define BTN_DIR_LEFT BUTTON_LEFT +#define BTN_DIR_RIGHT BUTTON_RIGHT +#define BTN_STARTPAUSE BUTTON_MENU +#define BTN_QUIT BUTTON_POWER +#define BTN_STOPRESET BUTTON_VIEW + +#define PLAYERS_TEXT "Up/Down" +#define WORMS_TEXT "Left/Right" + #else #error No keymap defined! #endif diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index 260728cb63..76644e520d 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c @@ -182,6 +182,15 @@ PLUGIN_HEADER #define DOWN BUTTON_DOWN #define PAUSE BUTTON_PLAY +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD + +#define QUIT BUTTON_POWER +#define LEFT BUTTON_LEFT +#define RIGHT BUTTON_RIGHT +#define UP BUTTON_UP +#define DOWN BUTTON_DOWN +#define PAUSE BUTTON_VIEW + #else #error No keymap defined! #endif diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 9262c856cd..fee6e35530 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h @@ -141,6 +141,15 @@ #define ZX_SELECT BUTTON_SELECT #define ZX_MENU BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD + +#define ZX_UP BUTTON_UP +#define ZX_DOWN BUTTON_DOWN +#define ZX_LEFT BUTTON_LEFT +#define ZX_RIGHT BUTTON_RIGHT +#define ZX_SELECT BUTTON_SELECT +#define ZX_MENU BUTTON_MENU + #else #error Keymap not defined! diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 253ab63655..7464f2eaa3 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c @@ -157,6 +157,15 @@ #define KBD_UP BUTTON_UP #define KBD_DOWN BUTTON_DOWN +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD + +#define KBD_SELECT BUTTON_MENU +#define KBD_ABORT BUTTON_POWER +#define KBD_LEFT BUTTON_LEFT +#define KBD_RIGHT BUTTON_RIGHT +#define KBD_UP BUTTON_UP +#define KBD_DOWN BUTTON_DOWN + #endif #ifdef HAVE_TOUCHSCREEN -- cgit v1.2.3