7 Oct 18:36
vitja: r18730 - in trunk: apps/plugins apps/plugins/midi apps/plugins/mpegplayer apps/plugins/pacbox apps/plugins/reversi apps/plugins/sudoku apps/plugins/zxbox firmware/export
From: <mailer <at> svn.rockbox.org>
Subject: vitja: r18730 - in trunk: apps/plugins apps/plugins/midi apps/plugins/mpegplayer apps/plugins/pacbox apps/plugins/reversi apps/plugins/sudoku apps/plugins/zxbox firmware/export
Newsgroups: gmane.comp.systems.archos.rockbox.cvs
Date: 2008-10-07 16:38:29 GMT
Subject: vitja: r18730 - in trunk: apps/plugins apps/plugins/midi apps/plugins/mpegplayer apps/plugins/pacbox apps/plugins/reversi apps/plugins/sudoku apps/plugins/zxbox firmware/export
Newsgroups: gmane.comp.systems.archos.rockbox.cvs
Date: 2008-10-07 16:38:29 GMT
Date: 2008-10-07 18:38:28 +0200 (Tue, 07 Oct 2008)
New Revision: 18730
Log Message:
IAUDIO67_PAD: Add keymaps for most of the plugins, they are not all tested yet.
IAUDIO7: Define MODEL_NAME in config
Modified:
trunk/apps/plugins/calculator.c
trunk/apps/plugins/chessclock.c
trunk/apps/plugins/chopper.c
trunk/apps/plugins/cube.c
trunk/apps/plugins/dict.c
trunk/apps/plugins/fireworks.c
trunk/apps/plugins/invadrox.c
trunk/apps/plugins/jewels.c
trunk/apps/plugins/jpeg.c
trunk/apps/plugins/lamp.c
trunk/apps/plugins/logo.c
trunk/apps/plugins/matrix.c
trunk/apps/plugins/midi/midiplay.c
trunk/apps/plugins/mosaique.c
trunk/apps/plugins/mp3_encoder.c
trunk/apps/plugins/mpegplayer/mpeg_settings.c
trunk/apps/plugins/mpegplayer/mpegplayer.c
trunk/apps/plugins/pacbox/pacbox.h
trunk/apps/plugins/plasma.c
trunk/apps/plugins/pong.c
trunk/apps/plugins/reversi/reversi-gui.h
trunk/apps/plugins/rockblox.c
trunk/apps/plugins/rockblox1d.c
trunk/apps/plugins/snow.c
trunk/apps/plugins/sokoban.c
trunk/apps/plugins/starfield.c
trunk/apps/plugins/stats.c
trunk/apps/plugins/stopwatch.c
trunk/apps/plugins/sudoku/sudoku.h
trunk/apps/plugins/viewer.c
trunk/apps/plugins/xobox.c
trunk/apps/plugins/zxbox/keymaps.h
trunk/apps/plugins/zxbox/zxbox_keyb.c
trunk/firmware/export/config-iaudio7.h
Modified: trunk/apps/plugins/calculator.c
===================================================================
--- trunk/apps/plugins/calculator.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/calculator.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -261,6 +261,19 @@
#define CALCULATOR_QUIT BUTTON_POWER
#define CALCULATOR_CLEAR BUTTON_MENU
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+
+#define CALCULATOR_LEFT BUTTON_LEFT
+#define CALCULATOR_RIGHT BUTTON_RIGHT
+#define CALCULATOR_UP BUTTON_VOLUP
+#define CALCULATOR_DOWN BUTTON_VOLDOWN
+#define CALCULATOR_QUIT BUTTON_POWER
+#define CALCULATOR_INPUT BUTTON_PLAY
+#define CALCULATOR_CALC BUTTON_MENU
+#define CALCULATOR_CLEAR BUTTON_STOP
+
+#define CALCULATOR_RC_QUIT (BUTTON_MENU|BUTTON_PLAY)
+
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/chessclock.c
===================================================================
--- trunk/apps/plugins/chessclock.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/chessclock.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -190,6 +190,17 @@
#define CHC_SETTINGS_DEC BUTTON_MINUS
#define CHC_SETTINGS_CANCEL BUTTON_POWER
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define CHC_QUIT BUTTON_POWER
+#define CHC_STARTSTOP BUTTON_PLAY
+#define CHC_RESET BUTTON_LEFT
+#define CHC_MENU BUTTON_MENU
+#define CHC_SETTINGS_INC BUTTON_VOLUP
+#define CHC_SETTINGS_DEC BUTTON_VOLDOWN
+#define CHC_SETTINGS_OK BUTTON_PLAY
+#define CHC_SETTINGS_OK2 BUTTON_LEFT
+#define CHC_SETTINGS_CANCEL BUTTON_POWER
+
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/chopper.c
===================================================================
--- trunk/apps/plugins/chopper.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/chopper.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -108,6 +108,12 @@
#elif CONFIG_KEYPAD == COWOND2_PAD
#define QUIT BUTTON_POWER
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define QUIT BUTTON_POWER
+#define ACTION BUTTON_PLAY
+#define ACTION2 BUTTON_STOP
+#define ACTIONTEXT "PLAY"
+
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/cube.c
===================================================================
--- trunk/apps/plugins/cube.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/cube.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -205,6 +205,16 @@
#elif CONFIG_KEYPAD == COWOND2_PAD
#define CUBE_QUIT BUTTON_POWER
+#elif (CONFIG_KEYPAD == IAUDIO67_PAD)
+#define CUBE_QUIT BUTTON_POWER
+#define CUBE_NEXT BUTTON_RIGHT
+#define CUBE_PREV BUTTON_LEFT
+#define CUBE_INC BUTTON_VOLUP
+#define CUBE_DEC BUTTON_VOLDOWN
+#define CUBE_MODE BUTTON_MENU
+#define CUBE_PAUSE BUTTON_PLAY
+#define CUBE_HIGHSPEED BUTTON_STOP
+
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/dict.c
===================================================================
--- trunk/apps/plugins/dict.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/dict.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -132,6 +132,8 @@
#define LP_QUIT BUTTON_RC_REC
#elif CONFIG_KEYPAD == COWOND2_PAD
#define LP_QUIT BUTTON_POWER
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define LP_QUIT BUTTON_POWER
#else
#define LP_QUIT BUTTON_OFF
#endif
Modified: trunk/apps/plugins/fireworks.c
===================================================================
--- trunk/apps/plugins/fireworks.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/fireworks.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -73,6 +73,9 @@
#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
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/invadrox.c
===================================================================
--- trunk/apps/plugins/invadrox.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/invadrox.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -120,6 +120,13 @@
#define QUIT BUTTON_POWER
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+
+#define QUIT BUTTON_POWER
+#define LEFT BUTTON_LEFT
+#define RIGHT BUTTON_RIGHT
+#define FIRE BUTTON_PLAY
+
#else
#error INVADROX: Unsupported keypad
#endif
Modified: trunk/apps/plugins/jewels.c
===================================================================
--- trunk/apps/plugins/jewels.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/jewels.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -153,6 +153,14 @@
#elif CONFIG_KEYPAD == COWOND2_PAD
#define JEWELS_CANCEL BUTTON_POWER
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define JEWELS_UP BUTTON_STOP
+#define JEWELS_DOWN BUTTON_PLAY
+#define JEWELS_LEFT BUTTON_LEFT
+#define JEWELS_RIGHT BUTTON_RIGHT
+#define JEWELS_SELECT BUTTON_MENU
+#define JEWELS_CANCEL BUTTON_POWER
+
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/jpeg.c
===================================================================
--- trunk/apps/plugins/jpeg.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/jpeg.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -214,6 +214,17 @@
#elif CONFIG_KEYPAD == COWOND2_PAD
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define JPEG_ZOOM_IN BUTTON_VOLUP
+#define JPEG_ZOOM_OUT BUTTON_VOLDOWN
+#define JPEG_UP BUTTON_STOP
+#define JPEG_DOWN BUTTON_PLAY
+#define JPEG_LEFT BUTTON_LEFT
+#define JPEG_RIGHT BUTTON_RIGHT
+#define JPEG_MENU BUTTON_MENU
+#define JPEG_NEXT (BUTTON_PLAY|BUTTON_VOLUP)
+#define JPEG_PREVIOUS (BUTTON_PLAY|BUTTON_VOLDOWN)
+
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/lamp.c
===================================================================
--- trunk/apps/plugins/lamp.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/lamp.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -74,6 +74,10 @@
#elif CONFIG_KEYPAD == COWOND2_PAD
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+# define LAMP_LEFT BUTTON_LEFT
+# define LAMP_RIGHT BUTTON_RIGHT
+
#else
# error Missing key definitions for this keypad
#endif
Modified: trunk/apps/plugins/logo.c
===================================================================
--- trunk/apps/plugins/logo.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/logo.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -141,6 +141,13 @@
#elif CONFIG_KEYPAD == COWOND2_PAD
#define LP_QUIT BUTTON_POWER
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define LP_QUIT BUTTON_POWER
+#define LP_DEC_X BUTTON_LEFT
+#define LP_INC_X BUTTON_RIGHT
+#define LP_DEC_Y BUTTON_PLAY
+#define LP_INC_Y BUTTON_STOP
+
#else
#define LP_QUIT BUTTON_OFF
#define LP_DEC_X BUTTON_LEFT
Modified: trunk/apps/plugins/matrix.c
===================================================================
--- trunk/apps/plugins/matrix.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/matrix.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -99,6 +99,11 @@
#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
#else
#error Unsupported keypad
#endif
Modified: trunk/apps/plugins/midi/midiplay.c
===================================================================
--- trunk/apps/plugins/midi/midiplay.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/midi/midiplay.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -149,6 +149,13 @@
#elif CONFIG_KEYPAD == COWOND2_PAD
#define BTN_QUIT BUTTON_POWER
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define BTN_QUIT BUTTON_POWER
+#define BTN_RIGHT BUTTON_RIGHT
+#define BTN_LEFT BUTTON_LEFT
+#define BTN_UP BUTTON_STOP
+#define BTN_DOWN BUTTON_PLAY
+#define BTN_PLAY BUTTON_MENU
#else
#error No keymap defined!
Modified: trunk/apps/plugins/mosaique.c
===================================================================
--- trunk/apps/plugins/mosaique.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/mosaique.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -127,6 +127,11 @@
#elif CONFIG_KEYPAD == COWOND2_PAD
#define MOSAIQUE_QUIT BUTTON_POWER
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define MOSAIQUE_QUIT BUTTON_POWER
+#define MOSAIQUE_SPEED BUTTON_PLAY
+#define MOSAIQUE_RESTART BUTTON_MENU
+
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/mp3_encoder.c
===================================================================
--- trunk/apps/plugins/mp3_encoder.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/mp3_encoder.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -2457,6 +2457,11 @@
#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
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/mpegplayer/mpeg_settings.c
===================================================================
--- trunk/apps/plugins/mpegplayer/mpeg_settings.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/mpegplayer/mpeg_settings.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -124,6 +124,14 @@
#elif CONFIG_KEYPAD == COWOND2_PAD
#define MPEG_START_TIME_EXIT BUTTON_POWER
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define MPEG_START_TIME_SELECT BUTTON_MENU
+#define MPEG_START_TIME_LEFT BUTTON_LEFT
+#define MPEG_START_TIME_RIGHT BUTTON_RIGHT
+#define MPEG_START_TIME_UP BUTTON_STOP
+#define MPEG_START_TIME_DOWN BUTTON_PLAY
+#define MPEG_START_TIME_EXIT BUTTON_POWER
+
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/mpegplayer/mpegplayer.c
===================================================================
--- trunk/apps/plugins/mpegplayer/mpegplayer.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/mpegplayer/mpegplayer.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -231,6 +231,15 @@
#define MPEG_VOLDOWN BUTTON_MINUS
#define MPEG_VOLUP BUTTON_PLUS
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define MPEG_MENU BUTTON_MENU
+#define MPEG_STOP BUTTON_STOP
+#define MPEG_PAUSE BUTTON_PLAY
+#define MPEG_VOLDOWN BUTTON_VOLDOWN
+#define MPEG_VOLUP BUTTON_VOLUP
+#define MPEG_RW BUTTON_LEFT
+#define MPEG_FF BUTTON_RIGHT
+
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/pacbox/pacbox.h
===================================================================
--- trunk/apps/plugins/pacbox/pacbox.h 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/pacbox/pacbox.h 2008-10-07 16:38:28 UTC (rev 18730)
@@ -147,6 +147,18 @@
#define PACMAN_MENU (BUTTON_MENU|BUTTON_REL)
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+
+#define PACMAN_UP BUTTON_STOP
+#define PACMAN_DOWN BUTTON_PLAY
+#define PACMAN_LEFT BUTTON_LEFT
+#define PACMAN_RIGHT BUTTON_RIGHT
+#define PACMAN_1UP BUTTON_VOLDOWN
+#define PACMAN_2UP BUTTON_VOLUP
+#define PACMAN_COIN_PRE BUTTON_MENU
+#define PACMAN_COIN (BUTTON_MENU | BUTTON_PLAY)
+#define PACMAN_MENU BUTTON_POWER
+
#else
#error Keymap not defined!
Modified: trunk/apps/plugins/plasma.c
===================================================================
--- trunk/apps/plugins/plasma.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/plasma.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -102,6 +102,13 @@
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#define PLASMA_QUIT BUTTON_POWER
+#elif (CONFIG_KEYPAD == IAUDIO67_PAD)
+#define PLASMA_QUIT BUTTON_POWER
+#define PLASMA_INCREASE_FREQUENCY BUTTON_RIGHT
+#define PLASMA_DECREASE_FREQUENCY BUTTON_LEFT
+#define PLASMA_RC_QUIT BUTTON_STOP
+#define PLASMA_REGEN_COLORS BUTTON_PLAY
+
#endif
#ifdef HAVE_TOUCHSCREEN
Modified: trunk/apps/plugins/pong.c
===================================================================
--- trunk/apps/plugins/pong.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/pong.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -151,6 +151,14 @@
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#define PONG_QUIT BUTTON_POWER
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define PONG_QUIT BUTTON_POWER
+#define PONG_PAUSE BUTTON_MENU
+#define PONG_LEFT_UP BUTTON_VOLUP
+#define PONG_LEFT_DOWN BUTTON_VOLDOWN
+#define PONG_RIGHT_UP BUTTON_RIGHT
+#define PONG_RIGHT_DOWN BUTTON_LEFT
+
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/reversi/reversi-gui.h
===================================================================
--- trunk/apps/plugins/reversi/reversi-gui.h 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/reversi/reversi-gui.h 2008-10-07 16:38:28 UTC (rev 18730)
@@ -147,6 +147,15 @@
#define REVERSI_QUIT BUTTON_POWER
#define REVERSI_BUTTON_MENU BUTTON_MENU
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define REVERSI_BUTTON_QUIT BUTTON_POWER
+#define REVERSI_BUTTON_UP BUTTON_STOP
+#define REVERSI_BUTTON_DOWN BUTTON_PLAY
+#define REVERSI_BUTTON_LEFT BUTTON_LEFT
+#define REVERSI_BUTTON_RIGHT BUTTON_RIGHT
+#define REVERSI_BUTTON_MAKE_MOVE BUTTON_VOLUP
+#define REVERSI_BUTTON_MENU BUTTON_MENU
+
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/rockblox.c
===================================================================
--- trunk/apps/plugins/rockblox.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/rockblox.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -217,6 +217,17 @@
#define ROCKBLOX_OFF BUTTON_POWER
#define ROCKBLOX_RESTART BUTTON_MENU
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+
+#define ROCKBLOX_OFF BUTTON_POWER
+#define ROCKBLOX_ROTATE_RIGHT BUTTON_VOLDOWN
+#define ROCKBLOX_ROTATE_LEFT BUTTON_VOLUP
+#define ROCKBLOX_DOWN BUTTON_STOP
+#define ROCKBLOX_LEFT BUTTON_LEFT
+#define ROCKBLOX_RIGHT BUTTON_RIGHT
+#define ROCKBLOX_DROP BUTTON_PLAY
+#define ROCKBLOX_RESTART BUTTON_MENU
+
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/rockblox1d.c
===================================================================
--- trunk/apps/plugins/rockblox1d.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/rockblox1d.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -82,6 +82,10 @@
#define ONEDROCKBLOX_DOWN BUTTON_MENU
#define ONEDROCKBLOX_QUIT BUTTON_POWER
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define ONEDROCKBLOX_DOWN BUTTON_MENU
+#define ONEDROCKBLOX_QUIT BUTTON_POWER
+
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/snow.c
===================================================================
--- trunk/apps/plugins/snow.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/snow.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -64,6 +64,8 @@
#define SNOW_RC_QUIT BUTTON_RC_REC
#elif CONFIG_KEYPAD == COWOND2_PAD
#define SNOW_QUIT BUTTON_POWER
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define SNOW_QUIT BUTTON_POWER
#else
#define SNOW_QUIT BUTTON_OFF
#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
Modified: trunk/apps/plugins/sokoban.c
===================================================================
--- trunk/apps/plugins/sokoban.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/sokoban.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -276,6 +276,20 @@
#define SOKOBAN_MENU BUTTON_MENU
#define SOKOBAN_MENU_NAME "[MENU]"
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define SOKOBAN_LEFT BUTTON_LEFT
+#define SOKOBAN_RIGHT BUTTON_RIGHT
+#define SOKOBAN_UP BUTTON_STOP
+#define SOKOBAN_DOWN BUTTON_PLAY
+#define SOKOBAN_MENU BUTTON_MENU
+#define SOKOBAN_UNDO BUTTON_VOLDOWN
+#define SOKOBAN_REDO BUTTON_VOLUP
+#define SOKOBAN_PAUSE (BUTTON_MENU|BUTTON_LEFT)
+#define BUTTON_SAVE (BUTTON_MENU|BUTTON_PLAY)
+#define BUTTON_SAVE_NAME "MENU+PLAY"
+
+#define SOKOBAN_RC_MENU (BUTTON_MENU|BUTTON_STOP)
+
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/starfield.c
===================================================================
--- trunk/apps/plugins/starfield.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/starfield.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -88,6 +88,13 @@
#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
+#define STARFIELD_DECREASE_ZMOVE BUTTON_PLAY
+#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
#endif
Modified: trunk/apps/plugins/stats.c
===================================================================
--- trunk/apps/plugins/stats.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/stats.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -78,6 +78,9 @@
#elif CONFIG_KEYPAD == COWOND2_PAD
#define STATS_STOP BUTTON_POWER
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define STATS_STOP BUTTON_POWER
+
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/stopwatch.c
===================================================================
--- trunk/apps/plugins/stopwatch.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/stopwatch.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -150,6 +150,14 @@
#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
+#define STOPWATCH_RESET_TIMER BUTTON_STOP
+#define STOPWATCH_LAP_TIMER BUTTON_LEFT
+#define STOPWATCH_SCROLL_UP BUTTON_VOLUP
+#define STOPWATCH_SCROLL_DOWN BUTTON_VOLDOWN
+#define STOPWATCH_RC_QUIT BUTTON_POWER
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/sudoku/sudoku.h
===================================================================
--- trunk/apps/plugins/sudoku/sudoku.h 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/sudoku/sudoku.h 2008-10-07 16:38:28 UTC (rev 18730)
@@ -186,6 +186,16 @@
#define SUDOKU_BUTTON_QUIT BUTTON_POWER
#define SUDOKU_BUTTON_MENU BUTTON_MENU
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define SUDOKU_BUTTON_QUIT BUTTON_POWER
+#define SUDOKU_BUTTON_UP BUTTON_STOP
+#define SUDOKU_BUTTON_DOWN BUTTON_PLAY
+#define SUDOKU_BUTTON_LEFT BUTTON_LEFT
+#define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT
+#define SUDOKU_BUTTON_TOGGLE BUTTON_VOLUP
+#define SUDOKU_BUTTON_MENU BUTTON_MENU
+#define SUDOKU_BUTTON_POSSIBLE BUTTON_VOLDOWN
+
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/viewer.c
===================================================================
--- trunk/apps/plugins/viewer.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/viewer.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -258,6 +258,16 @@
#define VIEWER_QUIT BUTTON_POWER
#define VIEWER_MENU BUTTON_MENU
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define VIEWER_QUIT BUTTON_POWER
+#define VIEWER_PAGE_UP BUTTON_VOLUP
+#define VIEWER_PAGE_DOWN BUTTON_VOLDOWN
+#define VIEWER_SCREEN_LEFT BUTTON_LEFT
+#define VIEWER_SCREEN_RIGHT BUTTON_RIGHT
+#define VIEWER_MENU BUTTON_MENU
+#define VIEWER_AUTOSCROLL BUTTON_PLAY
+#define VIEWER_RC_QUIT BUTTON_STOP
+
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/xobox.c
===================================================================
--- trunk/apps/plugins/xobox.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/xobox.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -145,6 +145,15 @@
#define QUIT BUTTON_POWER
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+
+#define QUIT BUTTON_POWER
+#define LEFT BUTTON_LEFT
+#define RIGHT BUTTON_RIGHT
+#define UP BUTTON_STOP
+#define DOWN BUTTON_PLAY
+#define PAUSE BUTTON_MENU
+
#else
#error No keymap defined!
#endif
Modified: trunk/apps/plugins/zxbox/keymaps.h
===================================================================
--- trunk/apps/plugins/zxbox/keymaps.h 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/zxbox/keymaps.h 2008-10-07 16:38:28 UTC (rev 18730)
@@ -122,6 +122,14 @@
#elif CONFIG_KEYPAD == COWOND2_PAD
#define ZX_MENU (BUTTON_MENU|BUTTON_REL)
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+#define ZX_UP BUTTON_STOP
+#define ZX_DOWN BUTTON_PLAY
+#define ZX_LEFT BUTTON_LEFT
+#define ZX_RIGHT BUTTON_RIGHT
+#define ZX_SELECT BUTTON_VOLUP
+#define ZX_MENU BUTTON_MENU
+
#else
#error Keymap not defined!
Modified: trunk/apps/plugins/zxbox/zxbox_keyb.c
===================================================================
--- trunk/apps/plugins/zxbox/zxbox_keyb.c 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/apps/plugins/zxbox/zxbox_keyb.c 2008-10-07 16:38:28 UTC (rev 18730)
@@ -136,6 +136,14 @@
#define KBD_ABORT BUTTON_POWER
+#elif CONFIG_KEYPAD == IAUDIO67_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_STOP
+#define KBD_DOWN BUTTON_PLAY
#endif
#ifdef HAVE_TOUCHSCREEN
Modified: trunk/firmware/export/config-iaudio7.h
===================================================================
--- trunk/firmware/export/config-iaudio7.h 2008-10-07 13:05:28 UTC (rev 18729)
+++ trunk/firmware/export/config-iaudio7.h 2008-10-07 16:38:28 UTC (rev 18730)
@@ -5,6 +5,7 @@
/* For Rolo and boot loader */
#define MODEL_NUMBER 32
+#define MODEL_NAME "Cowon iAudio7"
/* define this if you have recording possibility */
#define HAVE_RECORDING
_______________________________________________
rockbox-cvs mailing list
rockbox-cvs <at> cool.haxx.se
http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs
RSS Feed