Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Sansa Clip: build plugins (FS#9578)

Browse source 
Use unmodified C200 keymap when possible, variation of it when not
Use Archos bitmaps when possible

Current problems:
- Pegbox plugin shows display corruption (corruption is different in the simulator)
- Bubbles plugin misses 1 or 2 bottom lines, but if we gain back these lines it occupies a too small area of the screen
- Splitted screen (yellow/blue) is a bit weird in most plugins

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19252 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2008-11-28 00:37:28 +00:00
parent ddaa878097
commit 5656f8245f
59 changed files with 338 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/plugins/battery_bench.c
View file

@ -98,7 +98,8 @@ PLUGIN_HEADER
#define BATTERY_OFF_TXT "PLAY" #define BATTERY_OFF_TXT "PLAY"
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) (CONFIG_KEYPAD == SANSA_C200_PAD) || \
(CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define BATTERY_ON BUTTON_SELECT #define BATTERY_ON BUTTON_SELECT
#define BATTERY_OFF BUTTON_POWER #define BATTERY_OFF BUTTON_POWER
#define BATTERY_ON_TXT "SELECT - start" #define BATTERY_ON_TXT "SELECT - start"

2
apps/plugins/bitmaps/mono/SOURCES
View file

@ -3,6 +3,8 @@
/* Bubbles */ /* Bubbles */
#if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) #if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64)
bubbles_bubble.112x64x1.bmp bubbles_bubble.112x64x1.bmp
#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 64)
bubbles_bubble.128x64x1.bmp
#elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80)
bubbles_bubble.132x80x16.bmp bubbles_bubble.132x80x16.bmp
#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96)

BIN
apps/plugins/bitmaps/mono/bubbles_bubble.128x64x1.bmp Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 222 B

4
apps/plugins/bitmaps/native/SOURCES
View file

@ -118,6 +118,8 @@ bubbles_emblem.160x128x2.bmp
bubbles_emblem.138x110x2.bmp bubbles_emblem.138x110x2.bmp
#elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 96) #elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 96)
bubbles_emblem.128x96x2.bmp bubbles_emblem.128x96x2.bmp
#elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 64)
bubbles_emblem.112x64x1.bmp /* use the same emblems than Archos */
#elif (LCD_WIDTH >= 112) && (LCD_HEIGHT >= 64) #elif (LCD_WIDTH >= 112) && (LCD_HEIGHT >= 64)
bubbles_emblem.112x64x1.bmp bubbles_emblem.112x64x1.bmp
#endif #endif
@ -586,7 +588,7 @@ star_tiles.6x7x1.bmp
/* Sudoku */ /* Sudoku */
#if LCD_WIDTH >= LCD_HEIGHT #if LCD_WIDTH >= LCD_HEIGHT
#if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) && (LCD_DEPTH == 1) #if (LCD_WIDTH == 112 || LCD_WIDTH == 128) && (LCD_HEIGHT == 64) && (LCD_DEPTH == 1)
sudoku_start.112x64x1.bmp sudoku_start.112x64x1.bmp
sudoku_normal.112x64x1.bmp sudoku_normal.112x64x1.bmp
sudoku_inverse.112x64x1.bmp sudoku_inverse.112x64x1.bmp

15
apps/plugins/blackjack.c
View file

@ -190,6 +190,21 @@ PLUGIN_HEADER
#define BJACK_RIGHT BUTTON_RIGHT #define BJACK_RIGHT BUTTON_RIGHT
#define BJACK_LEFT BUTTON_LEFT #define BJACK_LEFT BUTTON_LEFT
#elif CONFIG_KEYPAD == SANSA_CLIP_PAD
#define BJACK_START BUTTON_SELECT
#define BJACK_QUIT BUTTON_POWER
#define BJACK_MAX BUTTON_VOL_UP
#define BJACK_MIN BUTTON_VOL_DOWN
#define BJACK_HIT BUTTON_SELECT
#define BJACK_STAY BUTTON_RIGHT
#define BJACK_DOUBLEDOWN BUTTON_LEFT
#define BJACK_SCORES BUTTON_HOME
#define BJACK_RESUME BUTTON_DOWN
#define BJACK_UP BUTTON_UP
#define BJACK_DOWN BUTTON_DOWN
#define BJACK_RIGHT BUTTON_RIGHT
#define BJACK_LEFT BUTTON_LEFT
#elif CONFIG_KEYPAD == ELIO_TPJ1022_PAD #elif CONFIG_KEYPAD == ELIO_TPJ1022_PAD
#define BJACK_START BUTTON_MAIN #define BJACK_START BUTTON_MAIN
#define BJACK_QUIT BUTTON_POWER #define BJACK_QUIT BUTTON_POWER

2
apps/plugins/bounce.c
View file

@ -100,7 +100,7 @@ PLUGIN_HEADER
#define BOUNCE_QUIT BUTTON_POWER #define BOUNCE_QUIT BUTTON_POWER
#define BOUNCE_MODE BUTTON_SELECT #define BOUNCE_MODE BUTTON_SELECT
#elif CONFIG_KEYPAD == SANSA_C200_PAD #elif CONFIG_KEYPAD == SANSA_C200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD
#define BOUNCE_LEFT BUTTON_LEFT #define BOUNCE_LEFT BUTTON_LEFT
#define BOUNCE_RIGHT BUTTON_RIGHT #define BOUNCE_RIGHT BUTTON_RIGHT
#define BOUNCE_UP BUTTON_UP #define BOUNCE_UP BUTTON_UP

6
apps/plugins/brickmania.c
View file

@ -116,7 +116,7 @@ PLUGIN_HEADER
#define SCROLL_BACK(x) ((x) & BUTTON_SCROLL_BACK) #define SCROLL_BACK(x) ((x) & BUTTON_SCROLL_BACK)
#elif CONFIG_KEYPAD == SANSA_C200_PAD #elif CONFIG_KEYPAD == SANSA_C200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD
#define QUIT BUTTON_POWER #define QUIT BUTTON_POWER
#define LEFT BUTTON_LEFT #define LEFT BUTTON_LEFT
@ -386,8 +386,8 @@ enum menu_items {
#define STRINGPOS_NAVI 44 #define STRINGPOS_NAVI 44
#define STRINGPOS_FLIP 44 #define STRINGPOS_FLIP 44
/* Archos */ /* Archos / Sansa Clip / Sansa m200 */
#elif (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) #elif ((LCD_WIDTH == 112) | (LCD_WIDTH == 128)) && (LCD_HEIGHT == 64)
/* The time (in ms) for one iteration through the game loop - decrease this /* The time (in ms) for one iteration through the game loop - decrease this
to speed up the game - note that current_tick is (currently) only accurate to speed up the game - note that current_tick is (currently) only accurate
to 10ms. to 10ms.

11
apps/plugins/bubbles.c
View file

@ -167,12 +167,19 @@ PLUGIN_HEADER
#define MAX_FPS 30 #define MAX_FPS 30
/* 8x8 bubbles (Sansa C200) */ /* 8x8 bubbles (Sansa C200) */
#elif (LCD_HEIGHT == 80) && (LCD_WIDTH == 132) #elif ((LCD_HEIGHT == 80) && (LCD_WIDTH == 132))
#define XOFS 45 #define XOFS 45
#define ROW_HEIGHT 6 #define ROW_HEIGHT 6
#define ROW_INDENT 4 #define ROW_INDENT 4
#define MAX_FPS 30 #define MAX_FPS 30
/* 7x7 bubbles (Sansa Clip/m200) */
#elif (LCD_HEIGHT == 64 && LCD_WIDTH == 128)
#define XOFS 33
#define ROW_HEIGHT 5
#define ROW_INDENT 4
#define MAX_FPS 30
/* 8x7 bubbles (Archos recorder, Ondio) */ /* 8x7 bubbles (Archos recorder, Ondio) */
#elif (LCD_HEIGHT == 64) && (LCD_WIDTH == 112) #elif (LCD_HEIGHT == 64) && (LCD_WIDTH == 112)
#define XOFS 33 #define XOFS 33
@ -2445,7 +2452,7 @@ static int bubbles(struct game_context* bb) {
rb->lcd_puts(0, 6, " and show high scores"); rb->lcd_puts(0, 6, " and show high scores");
rb->lcd_puts(0, 7, "SCROLL to aim"); rb->lcd_puts(0, 7, "SCROLL to aim");
rb->lcd_puts(0, 8, " and change level"); rb->lcd_puts(0, 8, " and change level");
#elif CONFIG_KEYPAD == SANSA_C200_PAD #elif CONFIG_KEYPAD == SANSA_C200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD
rb->lcd_puts(0, 2, "PLAY to start/pause"); rb->lcd_puts(0, 2, "PLAY to start/pause");
rb->lcd_puts(0, 3, "SUBMENU to save/resume"); rb->lcd_puts(0, 3, "SUBMENU to save/resume");
rb->lcd_puts(0, 4, "POWER to exit"); rb->lcd_puts(0, 4, "POWER to exit");

11
apps/plugins/calculator.c
View file

@ -209,6 +209,17 @@ PLUGIN_HEADER
#define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) #define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT)
#define CALCULATOR_CLEAR BUTTON_REC #define CALCULATOR_CLEAR BUTTON_REC
#elif (CONFIG_KEYPAD == SANSA_CLIP_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_CALC_PRE BUTTON_SELECT
#define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL)
#define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT)
#define CALCULATOR_CLEAR BUTTON_HOME
#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) #elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
#define CALCULATOR_LEFT BUTTON_LEFT #define CALCULATOR_LEFT BUTTON_LEFT

2
apps/plugins/calendar.c
View file

@ -100,7 +100,7 @@ PLUGIN_HEADER
#define CALENDAR_NEXT_MONTH BUTTON_DOWN #define CALENDAR_NEXT_MONTH BUTTON_DOWN
#define CALENDAR_PREV_MONTH BUTTON_UP #define CALENDAR_PREV_MONTH BUTTON_UP
#elif CONFIG_KEYPAD == SANSA_C200_PAD #elif CONFIG_KEYPAD == SANSA_C200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD
#define CALENDAR_QUIT BUTTON_POWER #define CALENDAR_QUIT BUTTON_POWER
#define CALENDAR_SELECT BUTTON_SELECT #define CALENDAR_SELECT BUTTON_SELECT
#define CALENDAR_NEXT_WEEK BUTTON_DOWN #define CALENDAR_NEXT_WEEK BUTTON_DOWN

15
apps/plugins/chessbox/chessbox_pgn.h
View file

@ -201,6 +201,21 @@
#define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT)
#define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT)
#elif CONFIG_KEYPAD == SANSA_CLIP_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_VOL_UP
#define CB_LEVEL BUTTON_HOME
#define CB_MENU BUTTON_POWER
#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)
#elif CONFIG_KEYPAD == SANSA_C200_PAD #elif CONFIG_KEYPAD == SANSA_C200_PAD
#define CB_SELECT BUTTON_SELECT #define CB_SELECT BUTTON_SELECT
#define CB_UP BUTTON_UP #define CB_UP BUTTON_UP

3
apps/plugins/chessclock.c
View file

@ -122,7 +122,8 @@ PLUGIN_HEADER
#define CHC_SETTINGS_CANCEL BUTTON_POWER #define CHC_SETTINGS_CANCEL BUTTON_POWER
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) (CONFIG_KEYPAD == SANSA_C200_PAD) || \
(CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define CHC_QUIT BUTTON_POWER #define CHC_QUIT BUTTON_POWER
#define CHC_STARTSTOP BUTTON_SELECT #define CHC_STARTSTOP BUTTON_SELECT
#define CHC_RESET BUTTON_DOWN #define CHC_RESET BUTTON_DOWN

2
apps/plugins/chip8.c
View file

@ -1030,7 +1030,7 @@ STATIC void chip8 (void)
#define CHIP8_KEY6 BUTTON_RIGHT #define CHIP8_KEY6 BUTTON_RIGHT
#define CHIP8_KEY8 BUTTON_SCROLL_FWD #define CHIP8_KEY8 BUTTON_SCROLL_FWD
#elif CONFIG_KEYPAD == SANSA_C200_PAD #elif CONFIG_KEYPAD == SANSA_C200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD
#define CHIP8_OFF BUTTON_POWER #define CHIP8_OFF BUTTON_POWER
#define CHIP8_KEY2 BUTTON_VOL_UP #define CHIP8_KEY2 BUTTON_VOL_UP
#define CHIP8_KEY4 BUTTON_LEFT #define CHIP8_KEY4 BUTTON_LEFT

2
apps/plugins/chopper.c
View file

@ -67,7 +67,7 @@ Still To do:
#define ACTIONTEXT "RIGHT" #define ACTIONTEXT "RIGHT"
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) (CONFIG_KEYPAD == SANSA_C200_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define QUIT BUTTON_POWER #define QUIT BUTTON_POWER
#define ACTION BUTTON_SELECT #define ACTION BUTTON_SELECT
#define ACTIONTEXT "SELECT" #define ACTIONTEXT "SELECT"

2
apps/plugins/cube.c
View file

@ -140,7 +140,7 @@ PLUGIN_HEADER
#define CUBE_PAUSE BUTTON_UP #define CUBE_PAUSE BUTTON_UP
#define CUBE_HIGHSPEED BUTTON_SELECT #define CUBE_HIGHSPEED BUTTON_SELECT
#elif (CONFIG_KEYPAD == SANSA_C200_PAD) #elif (CONFIG_KEYPAD == SANSA_C200_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define CUBE_QUIT BUTTON_POWER #define CUBE_QUIT BUTTON_POWER
#define CUBE_NEXT BUTTON_RIGHT #define CUBE_NEXT BUTTON_RIGHT
#define CUBE_PREV BUTTON_LEFT #define CUBE_PREV BUTTON_LEFT

3
apps/plugins/dict.c
View file

@ -118,7 +118,8 @@ long reverse (long N) {
#elif CONFIG_KEYPAD == GIGABEAT_PAD #elif CONFIG_KEYPAD == GIGABEAT_PAD
#define LP_QUIT BUTTON_POWER #define LP_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) (CONFIG_KEYPAD == SANSA_C200_PAD) || \
(CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define LP_QUIT BUTTON_POWER #define LP_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == IRIVER_H10_PAD #elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define LP_QUIT BUTTON_POWER #define LP_QUIT BUTTON_POWER

12
apps/plugins/flipit.c
View file

@ -155,6 +155,18 @@ PLUGIN_HEADER
#define FLIPIT_STEP_BY_STEP (BUTTON_REC | BUTTON_SELECT) #define FLIPIT_STEP_BY_STEP (BUTTON_REC | BUTTON_SELECT)
#define FLIPIT_TOGGLE BUTTON_SELECT #define FLIPIT_TOGGLE BUTTON_SELECT
#elif CONFIG_KEYPAD == SANSA_CLIP_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_HOME | BUTTON_LEFT)
#define FLIPIT_SOLVE (BUTTON_HOME | BUTTON_RIGHT)
#define FLIPIT_STEP_BY_STEP (BUTTON_HOME | BUTTON_SELECT)
#define FLIPIT_TOGGLE BUTTON_SELECT
#elif CONFIG_KEYPAD == IRIVER_H10_PAD #elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define FLIPIT_LEFT BUTTON_LEFT #define FLIPIT_LEFT BUTTON_LEFT

4
apps/plugins/jewels.c
View file

@ -108,7 +108,7 @@ PLUGIN_HEADER
#define JEWELS_SELECT BUTTON_SELECT #define JEWELS_SELECT BUTTON_SELECT
#define JEWELS_CANCEL BUTTON_POWER #define JEWELS_CANCEL BUTTON_POWER
#elif CONFIG_KEYPAD == SANSA_C200_PAD #elif CONFIG_KEYPAD == SANSA_C200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD
#define JEWELS_UP BUTTON_UP #define JEWELS_UP BUTTON_UP
#define JEWELS_DOWN BUTTON_DOWN #define JEWELS_DOWN BUTTON_DOWN
#define JEWELS_LEFT BUTTON_LEFT #define JEWELS_LEFT BUTTON_LEFT
@ -1570,7 +1570,7 @@ static int jewels_main(struct game_context* bj) {
rb->lcd_puts(0, 10, "Long SELECT to show menu"); rb->lcd_puts(0, 10, "Long SELECT to show menu");
rb->lcd_puts(0, 11, "POWER to cancel"); rb->lcd_puts(0, 11, "POWER to cancel");
#elif CONFIG_KEYPAD == SANSA_E200_PAD \ #elif CONFIG_KEYPAD == SANSA_E200_PAD \
|| CONFIG_KEYPAD == SANSA_C200_PAD || CONFIG_KEYPAD == SANSA_C200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD
rb->lcd_puts(0, 2, "Swap pairs of jewels to"); rb->lcd_puts(0, 2, "Swap pairs of jewels to");
rb->lcd_puts(0, 3, "form connected segments"); rb->lcd_puts(0, 3, "form connected segments");
rb->lcd_puts(0, 4, "of three or more of the"); rb->lcd_puts(0, 4, "of three or more of the");

15
apps/plugins/jpeg/jpeg.h
View file

@ -148,6 +148,21 @@
#define JPEG_PREVIOUS BUTTON_VOL_DOWN #define JPEG_PREVIOUS BUTTON_VOL_DOWN
#define JPEG_PREVIOUS_REPEAT (BUTTON_VOL_DOWN|BUTTON_REPEAT) #define JPEG_PREVIOUS_REPEAT (BUTTON_VOL_DOWN|BUTTON_REPEAT)
#elif CONFIG_KEYPAD == SANSA_CLIP_PAD
#define JPEG_ZOOM_PRE BUTTON_SELECT
#define JPEG_ZOOM_IN (BUTTON_SELECT | BUTTON_REL)
#define JPEG_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT)
#define JPEG_UP BUTTON_UP
#define JPEG_DOWN BUTTON_DOWN
#define JPEG_LEFT BUTTON_LEFT
#define JPEG_RIGHT BUTTON_RIGHT
#define JPEG_MENU BUTTON_POWER
#define JPEG_SLIDE_SHOW BUTTON_HOME
#define JPEG_NEXT BUTTON_VOL_UP
#define JPEG_NEXT_REPEAT (BUTTON_VOL_UP|BUTTON_REPEAT)
#define JPEG_PREVIOUS BUTTON_VOL_DOWN
#define JPEG_PREVIOUS_REPEAT (BUTTON_VOL_DOWN|BUTTON_REPEAT)
#elif CONFIG_KEYPAD == IRIVER_H10_PAD #elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define JPEG_ZOOM_PRE BUTTON_PLAY #define JPEG_ZOOM_PRE BUTTON_PLAY
#define JPEG_ZOOM_IN (BUTTON_PLAY | BUTTON_REL) #define JPEG_ZOOM_IN (BUTTON_PLAY | BUTTON_REL)

3
apps/plugins/lamp.c
View file

@ -140,8 +140,9 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame
#endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */ #endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */
#ifdef HAVE_LCD_INVERT #ifdef HAVE_LCD_INVERT
#ifdef MROBE_100 #if defined(MROBE_100) || defined(SANSA_CLIP)
/* mrobe-100 has inverted display so invert it for max brightness */ /* mrobe-100 has inverted display so invert it for max brightness */
/* sansa clip has no real backlight so we need to enable all pixels */
rb->lcd_set_invert_display(true); rb->lcd_set_invert_display(true);
#else #else
rb->lcd_set_invert_display(false); rb->lcd_set_invert_display(false);

2
apps/plugins/logo.c
View file

@ -96,7 +96,7 @@ const unsigned char rockbox16x7[] = {
#define LP_INC_Y BUTTON_UP #define LP_INC_Y BUTTON_UP
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) (CONFIG_KEYPAD == SANSA_C200_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define LP_QUIT BUTTON_POWER #define LP_QUIT BUTTON_POWER
#define LP_DEC_X BUTTON_LEFT #define LP_DEC_X BUTTON_LEFT
#define LP_INC_X BUTTON_RIGHT #define LP_INC_X BUTTON_RIGHT

12
apps/plugins/mandelbrot.c
View file

@ -150,6 +150,18 @@ PLUGIN_HEADER
#define MANDELBROT_MAXITER_DEC (BUTTON_SELECT | BUTTON_LEFT) #define MANDELBROT_MAXITER_DEC (BUTTON_SELECT | BUTTON_LEFT)
#define MANDELBROT_RESET BUTTON_REC #define MANDELBROT_RESET BUTTON_REC
#elif CONFIG_KEYPAD == SANSA_CLIP_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_VOL_UP
#define MANDELBROT_ZOOM_OUT BUTTON_VOL_DOWN
#define MANDELBROT_MAXITER_INC (BUTTON_SELECT | BUTTON_RIGHT)
#define MANDELBROT_MAXITER_DEC (BUTTON_SELECT | BUTTON_LEFT)
#define MANDELBROT_RESET BUTTON_HOME
#elif CONFIG_KEYPAD == IRIVER_H10_PAD #elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define MANDELBROT_QUIT BUTTON_POWER #define MANDELBROT_QUIT BUTTON_POWER
#define MANDELBROT_UP BUTTON_SCROLL_UP #define MANDELBROT_UP BUTTON_SCROLL_UP

2
apps/plugins/midi/midiplay.c
View file

@ -92,7 +92,7 @@ PLUGIN_IRAM_DECLARE
#define BTN_PLAY BUTTON_UP #define BTN_PLAY BUTTON_UP
#elif (CONFIG_KEYPAD == SANSA_C200_PAD) #elif (CONFIG_KEYPAD == SANSA_C200_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define BTN_QUIT BUTTON_POWER #define BTN_QUIT BUTTON_POWER
#define BTN_RIGHT BUTTON_RIGHT #define BTN_RIGHT BUTTON_RIGHT
#define BTN_LEFT BUTTON_LEFT #define BTN_LEFT BUTTON_LEFT

4
apps/plugins/minesweeper.c
View file

@ -132,7 +132,7 @@ enum minesweeper_status {
# define MINESWP_DISCOVER BUTTON_SELECT # define MINESWP_DISCOVER BUTTON_SELECT
# define MINESWP_INFO (BUTTON_REC|BUTTON_REPEAT) # define MINESWP_INFO (BUTTON_REC|BUTTON_REPEAT)
#elif (CONFIG_KEYPAD == SANSA_C200_PAD) #elif (CONFIG_KEYPAD == SANSA_C200_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD)
# define MINESWP_LEFT BUTTON_LEFT # define MINESWP_LEFT BUTTON_LEFT
# define MINESWP_RIGHT BUTTON_RIGHT # define MINESWP_RIGHT BUTTON_RIGHT
# define MINESWP_UP BUTTON_UP # define MINESWP_UP BUTTON_UP
@ -143,7 +143,7 @@ enum minesweeper_status {
# define MINESWP_TOGGLE2 BUTTON_VOL_DOWN # define MINESWP_TOGGLE2 BUTTON_VOL_DOWN
# define MINESWP_DISCOVER (BUTTON_SELECT | BUTTON_REPEAT) # define MINESWP_DISCOVER (BUTTON_SELECT | BUTTON_REPEAT)
# define MINESWP_DISCOVER2 BUTTON_VOL_UP # define MINESWP_DISCOVER2 BUTTON_VOL_UP
# define MINESWP_INFO BUTTON_REC # define MINESWP_INFO (BUTTON_SELECT | BUTTON_UP)
#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) #elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
# define MINESWP_LEFT BUTTON_LEFT # define MINESWP_LEFT BUTTON_LEFT

2
apps/plugins/mosaique.c
View file

@ -94,7 +94,7 @@ PLUGIN_HEADER
#define MOSAIQUE_RESTART BUTTON_SELECT #define MOSAIQUE_RESTART BUTTON_SELECT
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) (CONFIG_KEYPAD == SANSA_C200_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define MOSAIQUE_QUIT BUTTON_POWER #define MOSAIQUE_QUIT BUTTON_POWER
#define MOSAIQUE_SPEED BUTTON_DOWN #define MOSAIQUE_SPEED BUTTON_DOWN
#define MOSAIQUE_RESTART BUTTON_SELECT #define MOSAIQUE_RESTART BUTTON_SELECT

2
apps/plugins/mp3_encoder.c
View file

@ -2430,7 +2430,7 @@ void get_mp3_filename(const char *wav_name)
#define MP3ENC_DONE BUTTON_POWER #define MP3ENC_DONE BUTTON_POWER
#define MP3ENC_SELECT BUTTON_SELECT #define MP3ENC_SELECT BUTTON_SELECT
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) (CONFIG_KEYPAD == SANSA_C200_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define MP3ENC_PREV BUTTON_UP #define MP3ENC_PREV BUTTON_UP
#define MP3ENC_NEXT BUTTON_DOWN #define MP3ENC_NEXT BUTTON_DOWN
#define MP3ENC_DONE BUTTON_POWER #define MP3ENC_DONE BUTTON_POWER

4
apps/plugins/mpegplayer/mpeg_settings.c
View file

@ -83,7 +83,7 @@ struct mpeg_settings settings;
#define MPEG_START_TIME_DOWN BUTTON_DOWN #define MPEG_START_TIME_DOWN BUTTON_DOWN
#define MPEG_START_TIME_EXIT BUTTON_POWER #define MPEG_START_TIME_EXIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SANSA_C200_PAD) #elif (CONFIG_KEYPAD == SANSA_C200_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define MPEG_START_TIME_SELECT BUTTON_SELECT #define MPEG_START_TIME_SELECT BUTTON_SELECT
#define MPEG_START_TIME_SCROLL_UP BUTTON_VOL_UP #define MPEG_START_TIME_SCROLL_UP BUTTON_VOL_UP
#define MPEG_START_TIME_SCROLL_DOWN BUTTON_VOL_DOWN #define MPEG_START_TIME_SCROLL_DOWN BUTTON_VOL_DOWN
@ -551,7 +551,7 @@ static uint32_t increment_time(uint32_t val, int32_t amount, uint32_t range)
return val; return val;
} }
#ifdef HAVE_LCD_ENABLE #if defined(HAVE_LCD_ENABLE) && defined(HAVE_LCD_COLOR)
static void get_start_time_lcd_enable_hook(void) static void get_start_time_lcd_enable_hook(void)
{ {
rb->queue_post(rb->button_queue, LCD_ENABLE_EVENT_0, 0); rb->queue_post(rb->button_queue, LCD_ENABLE_EVENT_0, 0);

4
apps/plugins/mpegplayer/mpegplayer.c
View file

@ -189,7 +189,7 @@ PLUGIN_IRAM_DECLARE
#define MPEG_RW BUTTON_LEFT #define MPEG_RW BUTTON_LEFT
#define MPEG_FF BUTTON_RIGHT #define MPEG_FF BUTTON_RIGHT
#elif CONFIG_KEYPAD == SANSA_C200_PAD #elif CONFIG_KEYPAD == SANSA_C200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD
#define MPEG_MENU BUTTON_SELECT #define MPEG_MENU BUTTON_SELECT
#define MPEG_STOP BUTTON_POWER #define MPEG_STOP BUTTON_POWER
#define MPEG_PAUSE BUTTON_UP #define MPEG_PAUSE BUTTON_UP
@ -598,7 +598,7 @@ static void draw_putsxy_oriented(int x, int y, const char *str)
} }
#endif /* LCD_PORTRAIT */ #endif /* LCD_PORTRAIT */
#ifdef HAVE_LCD_ENABLE #if defined(HAVE_LCD_ENABLE) && defined(HAVE_LCD_COLOR)
/* So we can refresh the overlay */ /* So we can refresh the overlay */
static void wvs_lcd_enable_hook(void) static void wvs_lcd_enable_hook(void)
{ {

11
apps/plugins/oscilloscope.c
View file

@ -122,6 +122,17 @@ PLUGIN_HEADER
#define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP #define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP
#define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN
#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define OSCILLOSCOPE_QUIT BUTTON_POWER
#define OSCILLOSCOPE_DRAWMODE BUTTON_SELECT
#define OSCILLOSCOPE_ADVMODE BUTTON_DOWN
#define OSCILLOSCOPE_ORIENTATION BUTTON_UP
#define OSCILLOSCOPE_PAUSE BUTTON_HOME
#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
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define OSCILLOSCOPE_QUIT BUTTON_POWER #define OSCILLOSCOPE_QUIT BUTTON_POWER
#define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_SELECT #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_SELECT

22
apps/plugins/pegbox.c
View file

@ -262,6 +262,23 @@ PLUGIN_HEADER
#define LVL_UP_TEXT "VOL+" #define LVL_UP_TEXT "VOL+"
#define LVL_DOWN_TEXT "VOL-" #define LVL_DOWN_TEXT "VOL-"
#elif CONFIG_KEYPAD == SANSA_CLIP_PAD
#define PEGBOX_SAVE BUTTON_SELECT
#define PEGBOX_QUIT BUTTON_POWER
#define PEGBOX_RESTART BUTTON_HOME
#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 "SELECT"
#define QUIT_TEXT "POWER"
#define RESTART_TEXT "HOME"
#define LVL_UP_TEXT "VOL+"
#define LVL_DOWN_TEXT "VOL-"
#elif CONFIG_KEYPAD == IAUDIO_M3_PAD #elif CONFIG_KEYPAD == IAUDIO_M3_PAD
#define PEGBOX_SAVE BUTTON_RC_PLAY #define PEGBOX_SAVE BUTTON_RC_PLAY
#define PEGBOX_QUIT BUTTON_RC_REC #define PEGBOX_QUIT BUTTON_RC_REC
@ -342,6 +359,7 @@ PLUGIN_HEADER
#define PIECE_WIDTH 50 #define PIECE_WIDTH 50
#define PIECE_HEIGHT 10 #define PIECE_HEIGHT 10
#endif #endif
#define BOARD_WIDTH (12*PIECE_WIDTH) #define BOARD_WIDTH (12*PIECE_WIDTH)
#define BOARD_HEIGHT (8*PIECE_HEIGHT) #define BOARD_HEIGHT (8*PIECE_HEIGHT)
@ -370,6 +388,10 @@ PLUGIN_HEADER
#define TEXT_X 116 #define TEXT_X 116
#define LEVEL_TEXT_Y 14 #define LEVEL_TEXT_Y 14
#define PEGS_TEXT_Y 58 #define PEGS_TEXT_Y 58
#elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 64)
#define TEXT_X 114
#define LEVEL_TEXT_Y 14
#define PEGS_TEXT_Y 58
#else #else
#error "Unsupported screen size" #error "Unsupported screen size"
#endif #endif

2
apps/plugins/plasma.c
View file

@ -68,7 +68,7 @@ static int plasma_frequency;
#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) (CONFIG_KEYPAD == SANSA_C200_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define PLASMA_QUIT BUTTON_POWER #define PLASMA_QUIT BUTTON_POWER
#define PLASMA_INCREASE_FREQUENCY BUTTON_UP #define PLASMA_INCREASE_FREQUENCY BUTTON_UP
#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN

2
apps/plugins/pong.c
View file

@ -102,7 +102,7 @@ PLUGIN_HEADER
#define PONG_RIGHT_UP BUTTON_VOL_UP #define PONG_RIGHT_UP BUTTON_VOL_UP
#define PONG_RIGHT_DOWN BUTTON_VOL_DOWN #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define PONG_QUIT BUTTON_POWER #define PONG_QUIT BUTTON_POWER
#define PONG_PAUSE BUTTON_SELECT #define PONG_PAUSE BUTTON_SELECT
#define PONG_LEFT_UP BUTTON_LEFT #define PONG_LEFT_UP BUTTON_LEFT

8
apps/plugins/reversi/reversi-gui.c
View file

@ -69,6 +69,14 @@ static const struct plugin_api* rb;
#define CELL_HEIGHT 6 #define CELL_HEIGHT 6
#define SMALL_BOARD #define SMALL_BOARD
#elif (LCD_HEIGHT==64) && (LCD_WIDTH==128)
/* Sansa Clip and M200 - 128x64, 8 cells @ 9x9 with 9 border lines */
/* Internal dimensions of a cell */
#define CELL_WIDTH 6
#define CELL_HEIGHT 6
#define SMALL_BOARD
#elif (LCD_HEIGHT==80) && (LCD_WIDTH==132) #elif (LCD_HEIGHT==80) && (LCD_WIDTH==132)
/* Sansa C200 - 132x80, 8 cells @ 9x9 with 9 border lines */ /* Sansa C200 - 132x80, 8 cells @ 9x9 with 9 border lines */

2
apps/plugins/reversi/reversi-gui.h
View file

@ -107,7 +107,7 @@
#define REVERSI_BUTTON_MENU BUTTON_PLAY #define REVERSI_BUTTON_MENU BUTTON_PLAY
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) (CONFIG_KEYPAD == SANSA_C200_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define REVERSI_BUTTON_QUIT BUTTON_POWER #define REVERSI_BUTTON_QUIT BUTTON_POWER
#define REVERSI_BUTTON_UP BUTTON_UP #define REVERSI_BUTTON_UP BUTTON_UP
#define REVERSI_BUTTON_DOWN BUTTON_DOWN #define REVERSI_BUTTON_DOWN BUTTON_DOWN

12
apps/plugins/rockblox.c
View file

@ -135,6 +135,18 @@ PLUGIN_HEADER
#define ROCKBLOX_DROP BUTTON_SELECT #define ROCKBLOX_DROP BUTTON_SELECT
#define ROCKBLOX_RESTART BUTTON_REC #define ROCKBLOX_RESTART BUTTON_REC
#elif CONFIG_KEYPAD == SANSA_CLIP_PAD
#define ROCKBLOX_OFF BUTTON_POWER
#define ROCKBLOX_ROTATE_RIGHT BUTTON_UP
#define ROCKBLOX_ROTATE_RIGHT2 BUTTON_VOL_DOWN
#define ROCKBLOX_ROTATE_LEFT BUTTON_VOL_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_HOME
#elif CONFIG_KEYPAD == IRIVER_H10_PAD #elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define ROCKBLOX_OFF BUTTON_POWER #define ROCKBLOX_OFF BUTTON_POWER

4
apps/plugins/rockblox1d.c
View file

@ -57,8 +57,8 @@ PLUGIN_HEADER
#define ONEDROCKBLOX_DOWN BUTTON_SELECT #define ONEDROCKBLOX_DOWN BUTTON_SELECT
#define ONEDROCKBLOX_QUIT BUTTON_POWER #define ONEDROCKBLOX_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif CONFIG_KEYPAD == SANSA_E200_PAD || CONFIG_KEYPAD == SANSA_C200_PAD || \
(CONFIG_KEYPAD == SANSA_C200_PAD) CONFIG_KEYPAD == SANSA_CLIP_PAD
#define ONEDROCKBLOX_DOWN BUTTON_SELECT #define ONEDROCKBLOX_DOWN BUTTON_SELECT
#define ONEDROCKBLOX_QUIT BUTTON_POWER #define ONEDROCKBLOX_QUIT BUTTON_POWER

9
apps/plugins/sliding_puzzle.c
View file

@ -104,6 +104,15 @@ PLUGIN_HEADER
#define PUZZLE_SHUFFLE BUTTON_REC #define PUZZLE_SHUFFLE BUTTON_REC
#define PUZZLE_PICTURE BUTTON_SELECT #define PUZZLE_PICTURE BUTTON_SELECT
#elif (CONFIG_KEYPAD == SANSA_CLIP_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_HOME
#define PUZZLE_PICTURE BUTTON_SELECT
#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) #elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
#define PUZZLE_QUIT BUTTON_POWER #define PUZZLE_QUIT BUTTON_POWER
#define PUZZLE_LEFT BUTTON_LEFT #define PUZZLE_LEFT BUTTON_LEFT

3
apps/plugins/snake.c
View file

@ -100,7 +100,8 @@ PLUGIN_HEADER
#define SNAKE_PLAYPAUSE BUTTON_SELECT #define SNAKE_PLAYPAUSE BUTTON_SELECT
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) (CONFIG_KEYPAD == SANSA_C200_PAD) || \
(CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define SNAKE_QUIT BUTTON_POWER #define SNAKE_QUIT BUTTON_POWER
#define SNAKE_LEFT BUTTON_LEFT #define SNAKE_LEFT BUTTON_LEFT
#define SNAKE_RIGHT BUTTON_RIGHT #define SNAKE_RIGHT BUTTON_RIGHT

14
apps/plugins/snake2.c
View file

@ -234,6 +234,20 @@ PLUGIN_HEADER
#define SNAKE2_PLAYPAUSE BUTTON_SELECT #define SNAKE2_PLAYPAUSE BUTTON_SELECT
#define SNAKE2_PLAYPAUSE_TEXT "Select" #define SNAKE2_PLAYPAUSE_TEXT "Select"
#elif (CONFIG_KEYPAD == SANSA_CLIP_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_VOL_UP
#define SNAKE2_PLAYPAUSE BUTTON_SELECT
#define SNAKE2_PLAYPAUSE_TEXT "Select"
#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) #elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
#define SNAKE2_LEFT BUTTON_LEFT #define SNAKE2_LEFT BUTTON_LEFT
#define SNAKE2_RIGHT BUTTON_RIGHT #define SNAKE2_RIGHT BUTTON_RIGHT

2
apps/plugins/snow.c
View file

@ -49,7 +49,7 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == GIGABEAT_PAD #elif CONFIG_KEYPAD == GIGABEAT_PAD
#define SNOW_QUIT BUTTON_POWER #define SNOW_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) (CONFIG_KEYPAD == SANSA_C200_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define SNOW_QUIT BUTTON_POWER #define SNOW_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == IRIVER_H10_PAD #elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define SNOW_QUIT BUTTON_POWER #define SNOW_QUIT BUTTON_POWER

16
apps/plugins/sokoban.c
View file

@ -236,6 +236,22 @@ PLUGIN_HEADER
#define BUTTON_SAVE BUTTON_SELECT #define BUTTON_SAVE BUTTON_SELECT
#define BUTTON_SAVE_NAME "SELECT" #define BUTTON_SAVE_NAME "SELECT"
#elif CONFIG_KEYPAD == SANSA_CLIP_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_POWER
#define SOKOBAN_UNDO_PRE BUTTON_SELECT
#define SOKOBAN_UNDO (BUTTON_SELECT | BUTTON_REL)
#define SOKOBAN_REDO BUTTON_HOME
#define SOKOBAN_LEVEL_DOWN BUTTON_VOL_DOWN
#define SOKOBAN_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_RIGHT)
#define SOKOBAN_LEVEL_UP BUTTON_VOL_UP
#define SOKOBAN_PAUSE BUTTON_SELECT
#define BUTTON_SAVE BUTTON_SELECT
#define BUTTON_SAVE_NAME "SELECT"
#elif CONFIG_KEYPAD == GIGABEAT_S_PAD #elif CONFIG_KEYPAD == GIGABEAT_S_PAD
#define SOKOBAN_LEFT BUTTON_LEFT #define SOKOBAN_LEFT BUTTON_LEFT
#define SOKOBAN_RIGHT BUTTON_RIGHT #define SOKOBAN_RIGHT BUTTON_RIGHT

19
apps/plugins/solitaire.c
View file

@ -220,6 +220,25 @@ static const struct plugin_api* rb;
# define HK_CUR2STACK "DOUBLE SELECT" # define HK_CUR2STACK "DOUBLE SELECT"
# define HK_REM2STACK "RIGHT" # define HK_REM2STACK "RIGHT"
#elif CONFIG_KEYPAD == SANSA_CLIP_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_HOME
# define SOL_REM2CUR BUTTON_VOL_DOWN
# define SOL_CUR2STACK_PRE BUTTON_SELECT
# define SOL_CUR2STACK (BUTTON_SELECT | BUTTON_REPEAT)
# define SOL_REM2STACK BUTTON_VOL_UP
# define HK_MOVE "SELECT"
# define HK_DRAW "HOME"
# define HK_REM2CUR "LEFT"
# define HK_CUR2STACK "DOUBLE SELECT"
# define HK_REM2STACK "RIGHT"
#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) #elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
# define SOL_QUIT BUTTON_POWER # define SOL_QUIT BUTTON_POWER
# define SOL_UP BUTTON_SCROLL_UP # define SOL_UP BUTTON_SCROLL_UP

13
apps/plugins/spacerocks.c
View file

@ -148,6 +148,19 @@ static const struct plugin_api* rb; /* global api struct pointer */
#define AST_FIRE BUTTON_SELECT #define AST_FIRE BUTTON_SELECT
#define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT) #define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT)
#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define AST_PAUSE BUTTON_HOME
#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_SELECT
#define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT)
#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) #elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
#define AST_PAUSE BUTTON_PLAY #define AST_PAUSE BUTTON_PLAY
#define AST_QUIT BUTTON_POWER #define AST_QUIT BUTTON_POWER

2
apps/plugins/star.c
View file

@ -161,7 +161,7 @@ PLUGIN_HEADER
#define STAR_MENU_RUN BUTTON_SELECT #define STAR_MENU_RUN BUTTON_SELECT
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) (CONFIG_KEYPAD == SANSA_C200_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define STAR_QUIT BUTTON_POWER #define STAR_QUIT BUTTON_POWER
#define STAR_LEFT BUTTON_LEFT #define STAR_LEFT BUTTON_LEFT

3
apps/plugins/starfield.c
View file

@ -60,7 +60,8 @@ static const struct plugin_api* rb; /* global api struct pointer */
#define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT
#define STARFIELD_TOGGLE_COLOR BUTTON_SELECT #define STARFIELD_TOGGLE_COLOR BUTTON_SELECT
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) (CONFIG_KEYPAD == SANSA_C200_PAD) || \
(CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define STARFIELD_QUIT BUTTON_POWER #define STARFIELD_QUIT BUTTON_POWER
#define STARFIELD_INCREASE_ZMOVE BUTTON_UP #define STARFIELD_INCREASE_ZMOVE BUTTON_UP
#define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN

2
apps/plugins/stats.c
View file

@ -56,7 +56,7 @@ static bool abort;
#define STATS_STOP BUTTON_POWER #define STATS_STOP BUTTON_POWER
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) (CONFIG_KEYPAD == SANSA_C200_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define STATS_STOP BUTTON_POWER #define STATS_STOP BUTTON_POWER
#elif CONFIG_KEYPAD == IRIVER_H10_PAD #elif CONFIG_KEYPAD == IRIVER_H10_PAD

2
apps/plugins/stopwatch.c
View file

@ -105,7 +105,7 @@ PLUGIN_HEADER
#define STOPWATCH_SCROLL_UP BUTTON_UP #define STOPWATCH_SCROLL_UP BUTTON_UP
#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) (CONFIG_KEYPAD == SANSA_C200_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define STOPWATCH_QUIT BUTTON_POWER #define STOPWATCH_QUIT BUTTON_POWER
#define STOPWATCH_START_STOP BUTTON_RIGHT #define STOPWATCH_START_STOP BUTTON_RIGHT
#define STOPWATCH_RESET_TIMER BUTTON_LEFT #define STOPWATCH_RESET_TIMER BUTTON_LEFT

2
apps/plugins/sudoku/sudoku.c
View file

@ -102,7 +102,7 @@ static const char default_game[9][9] =
#if LCD_HEIGHT <= LCD_WIDTH /* Horizontal layout, scratchpad at the left */ #if LCD_HEIGHT <= LCD_WIDTH /* Horizontal layout, scratchpad at the left */
#if (LCD_HEIGHT==64) && (LCD_WIDTH==112) #if (LCD_HEIGHT==64) && (LCD_WIDTH==112 || LCD_WIDTH==128)
/* Archos Recorders and Ondios - 112x64, 9 cells @ 8x6 with 10 border lines */ /* Archos Recorders and Ondios - 112x64, 9 cells @ 8x6 with 10 border lines */
/* Internal dimensions of a cell */ /* Internal dimensions of a cell */

14
apps/plugins/sudoku/sudoku.h
View file

@ -148,6 +148,20 @@
#define SUDOKU_BUTTON_MENU (BUTTON_POWER | BUTTON_REL) #define SUDOKU_BUTTON_MENU (BUTTON_POWER | BUTTON_REL)
#define SUDOKU_BUTTON_POSSIBLE BUTTON_REC #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC
#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define SUDOKU_BUTTON_QUIT_PRE BUTTON_POWER
#define SUDOKU_BUTTON_QUIT (BUTTON_POWER | BUTTON_REPEAT)
#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_TOGGLEBACK BUTTON_VOL_DOWN
#define SUDOKU_BUTTON_TOGGLE BUTTON_VOL_UP
#define SUDOKU_BUTTON_ALTTOGGLE BUTTON_SELECT
#define SUDOKU_BUTTON_MENU_PRE BUTTON_POWER
#define SUDOKU_BUTTON_MENU (BUTTON_POWER | BUTTON_REL)
#define SUDOKU_BUTTON_POSSIBLE BUTTON_HOME
#elif CONFIG_KEYPAD == MROBE500_PAD #elif CONFIG_KEYPAD == MROBE500_PAD
#define SUDOKU_BUTTON_QUIT_PRE BUTTON_POWER #define SUDOKU_BUTTON_QUIT_PRE BUTTON_POWER
#define SUDOKU_BUTTON_QUIT (BUTTON_POWER | BUTTON_REPEAT) #define SUDOKU_BUTTON_QUIT (BUTTON_POWER | BUTTON_REPEAT)

3
apps/plugins/test_grey.c
View file

@ -58,7 +58,8 @@ PLUGIN_HEADER
#define GREY_DOWN BUTTON_DOWN #define GREY_DOWN BUTTON_DOWN
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \
|| (CONFIG_KEYPAD == MROBE100_PAD) || (CONFIG_KEYPAD == MROBE100_PAD) \
|| (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define GREY_QUIT BUTTON_POWER #define GREY_QUIT BUTTON_POWER
#define GREY_OK BUTTON_SELECT #define GREY_OK BUTTON_SELECT
#define GREY_PREV BUTTON_LEFT #define GREY_PREV BUTTON_LEFT

5
apps/plugins/test_scanrate.c
View file

@ -34,7 +34,8 @@ PLUGIN_HEADER
#define SCANRATE_DEC BUTTON_LEFT #define SCANRATE_DEC BUTTON_LEFT
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \
|| (CONFIG_KEYPAD == MROBE100_PAD) || (CONFIG_KEYPAD == MROBE100_PAD) \
|| (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define SCANRATE_DONE BUTTON_POWER #define SCANRATE_DONE BUTTON_POWER
#define SCANRATE_FASTINC BUTTON_UP #define SCANRATE_FASTINC BUTTON_UP
#define SCANRATE_FASTDEC BUTTON_DOWN #define SCANRATE_FASTDEC BUTTON_DOWN
@ -76,6 +77,8 @@ PLUGIN_HEADER
#define DEFAULT_SCAN_RATE 870 #define DEFAULT_SCAN_RATE 870
#elif defined IRIVER_H100_SERIES #elif defined IRIVER_H100_SERIES
#define DEFAULT_SCAN_RATE 700 #define DEFAULT_SCAN_RATE 700
#elif defined SANSA_CLIP
#define DEFAULT_SCAN_RATE 780
#else #else
#define DEFAULT_SCAN_RATE 700 #define DEFAULT_SCAN_RATE 700
#warning Generic default scanrate #warning Generic default scanrate

12
apps/plugins/viewer.c
View file

@ -197,6 +197,18 @@ PLUGIN_HEADER
#define VIEWER_LINE_UP BUTTON_UP #define VIEWER_LINE_UP BUTTON_UP
#define VIEWER_LINE_DOWN BUTTON_DOWN #define VIEWER_LINE_DOWN BUTTON_DOWN
/* Sansa Clip keys */
#elif CONFIG_KEYPAD == SANSA_CLIP_PAD
#define VIEWER_QUIT BUTTON_POWER
#define VIEWER_PAGE_UP BUTTON_VOL_UP
#define VIEWER_PAGE_DOWN BUTTON_VOL_DOWN
#define VIEWER_SCREEN_LEFT BUTTON_LEFT
#define VIEWER_SCREEN_RIGHT BUTTON_RIGHT
#define VIEWER_MENU BUTTON_SELECT
#define VIEWER_AUTOSCROLL BUTTON_HOME
#define VIEWER_LINE_UP BUTTON_UP
#define VIEWER_LINE_DOWN BUTTON_DOWN
/* iriver H10 keys */ /* iriver H10 keys */
#elif CONFIG_KEYPAD == IRIVER_H10_PAD #elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define VIEWER_QUIT BUTTON_POWER #define VIEWER_QUIT BUTTON_POWER

13
apps/plugins/vu_meter.c
View file

@ -137,6 +137,19 @@ PLUGIN_HEADER
#define LABEL_MENU "SELECT" #define LABEL_MENU "SELECT"
#define LABEL_VOLUME "VOL UP/DN" #define LABEL_VOLUME "VOL UP/DN"
#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define VUMETER_QUIT BUTTON_POWER
#define VUMETER_HELP BUTTON_HOME
#define VUMETER_MENU BUTTON_SELECT
#define VUMETER_MENU_EXIT BUTTON_SELECT
#define VUMETER_MENU_EXIT2 BUTTON_POWER
#define VUMETER_UP BUTTON_VOL_UP
#define VUMETER_DOWN BUTTON_VOL_DOWN
#define LABEL_HELP "HOME"
#define LABEL_QUIT "POWER"
#define LABEL_MENU "SELECT"
#define LABEL_VOLUME "VOL UP/DN"
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define VUMETER_QUIT BUTTON_POWER #define VUMETER_QUIT BUTTON_POWER
#define VUMETER_HELP BUTTON_PLAY #define VUMETER_HELP BUTTON_PLAY

19
apps/plugins/wormlet.c
View file

@ -165,6 +165,20 @@ PLUGIN_HEADER
#define WORMS_TEXT "Left/Right" #define WORMS_TEXT "Left/Right"
#elif (CONFIG_KEYPAD == SANSA_CLIP_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_SELECT
#define BTN_QUIT BUTTON_POWER
#define BTN_STOPRESET BUTTON_HOME
#define PLAYERS_TEXT "Up/Down"
#define WORMS_TEXT "Left/Right"
#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) #elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
#define BTN_DIR_UP BUTTON_SCROLL_UP #define BTN_DIR_UP BUTTON_SCROLL_UP
@ -262,6 +276,11 @@ PLUGIN_HEADER
#define ARGH_SIZE 4 #define ARGH_SIZE 4
#define SPEED 14 #define SPEED 14
#define MAX_WORM_SEGMENTS 128 #define MAX_WORM_SEGMENTS 128
#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 64)
#define FOOD_SIZE 3
#define ARGH_SIZE 4
#define SPEED 14
#define MAX_WORM_SEGMENTS 128
#elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80)
#define FOOD_SIZE 3 #define FOOD_SIZE 3
#define ARGH_SIZE 4 #define ARGH_SIZE 4

10
apps/plugins/xobox.c
View file

@ -87,6 +87,16 @@ PLUGIN_HEADER
#define PAUSE BUTTON_REC #define PAUSE BUTTON_REC
#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define QUIT BUTTON_POWER
#define LEFT BUTTON_LEFT
#define RIGHT BUTTON_RIGHT
#define UP BUTTON_UP
#define DOWN BUTTON_DOWN
#define PAUSE BUTTON_HOME
#elif CONFIG_KEYPAD == IRIVER_H10_PAD #elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define QUIT BUTTON_POWER #define QUIT BUTTON_POWER

2
apps/plugins/zxbox/keymaps.h
View file

@ -87,7 +87,7 @@
#define ZX_DOWN BUTTON_SCROLL_DOWN #define ZX_DOWN BUTTON_SCROLL_DOWN
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) (CONFIG_KEYPAD == SANSA_C200_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD)
#define ZX_SELECT BUTTON_SELECT #define ZX_SELECT BUTTON_SELECT
#define ZX_MENU BUTTON_POWER #define ZX_MENU BUTTON_POWER
#define ZX_LEFT BUTTON_LEFT #define ZX_LEFT BUTTON_LEFT

1
apps/plugins/zxbox/zxbox_keyb.c
View file

@ -112,6 +112,7 @@
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \
(CONFIG_KEYPAD == SANSA_CLIP_PAD) || \
(CONFIG_KEYPAD == MROBE100_PAD) (CONFIG_KEYPAD == MROBE100_PAD)
/* TODO: Check keyboard mappings */ /* TODO: Check keyboard mappings */

6
firmware/export/config-clip.h
View file

@ -95,14 +95,10 @@
#define HAVE_FAT16SUPPORT #define HAVE_FAT16SUPPORT
/* The number of bytes reserved for loadable codecs */ /* The number of bytes reserved for loadable codecs */
#define CODEC_SIZE 0x100000 #define CODEC_SIZE 0x80000 /* TODO : check if we can use IRAM */
/* The number of bytes reserved for loadable plugins */ /* The number of bytes reserved for loadable plugins */
#if 0 /* The plugin buffer doesn't fit in the 2MB memory */
#define PLUGIN_BUFFER_SIZE 0x80000 #define PLUGIN_BUFFER_SIZE 0x80000
#else
#define PLUGIN_BUFFER_SIZE 0
#endif
#define AB_REPEAT_ENABLE 1 #define AB_REPEAT_ENABLE 1

2
tools/configure vendored
View file

@ -1685,7 +1685,7 @@ fi
output="rockbox.sansa" output="rockbox.sansa"
bootoutput="bootloader-clip.sansa" bootoutput="bootloader-clip.sansa"
appextra="recorder:gui" appextra="recorder:gui"
plugins="" plugins="yes"
swcodec="yes" swcodec="yes"
toolset=$scramblebitmaptools toolset=$scramblebitmaptools
t_cpu="arm" t_cpu="arm"