From 106ac75ad8229d4c5f66a846609520d22d9d8f0c Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Sat, 22 Mar 2008 14:20:04 +0000 Subject: Adapted most multi-source plugins to the iAudio M3 keypad and screen. Doom and mpegplayer are disabled because of the not yet implemented greyscale library, and zxbox used 2-bit greyscale for now. * Slight optimisation for the (currently unused except on M3) 2-bit greyscale code in zxbox. * Simplified button definitions in chessbox. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16744 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/sudoku/sudoku.c | 16 +++++++++------- apps/plugins/sudoku/sudoku.h | 10 ++++++++++ 2 files changed, 19 insertions(+), 7 deletions(-) (limited to 'apps/plugins/sudoku') diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c index 1d548ace6d..553357fc5c 100644 --- a/apps/plugins/sudoku/sudoku.c +++ b/apps/plugins/sudoku/sudoku.c @@ -116,22 +116,24 @@ static const char default_game[9][9] = #define CELL_HEIGHT 8 #define SMALL_BOARD -#elif (LCD_HEIGHT==110) && (LCD_WIDTH==138) -/* iPod Mini - 138x110, 9 cells @ 10x10 with 14 border lines */ +#elif ((LCD_HEIGHT==96) && (LCD_WIDTH==128)) +/* iAudio M3, 9 cells @ 9x9 with 14 border lines */ /* Internal dimensions of a cell */ -#define CELL_WIDTH 10 -#define CELL_HEIGHT 10 +#define CELL_WIDTH 9 +#define CELL_HEIGHT 9 -#elif (LCD_HEIGHT==128) && (LCD_WIDTH==128) +#elif (LCD_HEIGHT==110) && (LCD_WIDTH==138) \ + || (LCD_HEIGHT==128) && (LCD_WIDTH==128) +/* iPod Mini - 138x110, 9 cells @ 10x10 with 14 border lines */ /* iriver H10 5-6GB - 128x128, 9 cells @ 10x10 with 14 border lines */ /* Internal dimensions of a cell */ #define CELL_WIDTH 10 #define CELL_HEIGHT 10 -#elif ((LCD_HEIGHT==128) && (LCD_WIDTH==160)) || \ - ((LCD_HEIGHT==132) && (LCD_WIDTH==176)) +#elif ((LCD_HEIGHT==128) && (LCD_WIDTH==160)) \ + || ((LCD_HEIGHT==132) && (LCD_WIDTH==176)) /* iAudio X5, Iriver H1x0, iPod G3, G4 - 160x128; */ /* iPod Nano - 176x132, 9 cells @ 12x12 with 14 border lines */ diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 78d1b73e63..8c2759796a 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h @@ -160,6 +160,16 @@ #define SUDOKU_BUTTON_MENU BUTTON_MENU #define SUDOKU_BUTTON_POSSIBLE BUTTON_DISPLAY +#elif CONFIG_KEYPAD == IAUDIO_M3_PAD +#define SUDOKU_BUTTON_QUIT BUTTON_RC_REC +#define SUDOKU_BUTTON_UP BUTTON_RC_VOL_UP +#define SUDOKU_BUTTON_DOWN BUTTON_RC_VOL_DOWN +#define SUDOKU_BUTTON_LEFT BUTTON_RC_REW +#define SUDOKU_BUTTON_RIGHT BUTTON_RC_FF +#define SUDOKU_BUTTON_TOGGLE BUTTON_RC_MODE +#define SUDOKU_BUTTON_MENU BUTTON_RC_MENU +#define SUDOKU_BUTTON_POSSIBLE BUTTON_RC_PLAY + #else #error No keymap defined! #endif -- cgit v1.2.3