diff options
author | Marianne Arnold <pixelma@rockbox.org> | 2007-10-22 13:53:16 +0000 |
---|---|---|
committer | Marianne Arnold <pixelma@rockbox.org> | 2007-10-22 13:53:16 +0000 |
commit | 543c49a4835a6bc0d3388034ad93ec46ff9fbee5 (patch) | |
tree | c8319704afb6eef01d78886e790519385ae603d3 | |
parent | 69bd0f82e3258b6f4b1c0c5cbda42e201668a65f (diff) | |
download | rockbox-543c49a4835a6bc0d3388034ad93ec46ff9fbee5.tar.gz rockbox-543c49a4835a6bc0d3388034ad93ec46ff9fbee5.zip |
Flipit for Sansa c200 and add the help text in the welcome screen for both Sansas. Update the manual as well.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15266 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/SOURCES | 4 | ||||
-rw-r--r-- | apps/plugins/bitmaps/native/SOURCES | 3 | ||||
-rw-r--r-- | apps/plugins/flipit.c | 10 | ||||
-rw-r--r-- | manual/plugins/flipit.tex | 13 | ||||
-rw-r--r-- | manual/plugins/images/ss-flipit-132x80x16.png | bin | 0 -> 1354 bytes |
5 files changed, 19 insertions, 11 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 2f7ea1d32f..a7a2201e5b 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES | |||
@@ -21,7 +21,6 @@ stopwatch.c | |||
21 | vbrfix.c | 21 | vbrfix.c |
22 | viewer.c | 22 | viewer.c |
23 | 23 | ||
24 | |||
25 | #if CONFIG_CODEC == SWCODEC | 24 | #if CONFIG_CODEC == SWCODEC |
26 | metronome.c | 25 | metronome.c |
27 | #endif | 26 | #endif |
@@ -36,16 +35,13 @@ wavrecord.c | |||
36 | #ifndef IRIVER_IFP7XX_SERIES /* Temporarily disable plugins for iFP7xx */ | 35 | #ifndef IRIVER_IFP7XX_SERIES /* Temporarily disable plugins for iFP7xx */ |
37 | dice.c | 36 | dice.c |
38 | disktidy.c | 37 | disktidy.c |
39 | #ifndef SANSA_C200 | ||
40 | flipit.c | 38 | flipit.c |
41 | #endif | ||
42 | 39 | ||
43 | #ifdef HAVE_LCD_BITMAP /* Not for the Player */ | 40 | #ifdef HAVE_LCD_BITMAP /* Not for the Player */ |
44 | maze.c | 41 | maze.c |
45 | mazezam.c | 42 | mazezam.c |
46 | text_editor.c | 43 | text_editor.c |
47 | wavview.c | 44 | wavview.c |
48 | robotfindskitten.c | ||
49 | 45 | ||
50 | /* Plugins needing the grayscale lib on low-depth LCDs */ | 46 | /* Plugins needing the grayscale lib on low-depth LCDs */ |
51 | fire.c | 47 | fire.c |
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index aa36caa8cf..e6e01036cb 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES | |||
@@ -202,6 +202,9 @@ flipit_tokens.28x56x16.bmp | |||
202 | #elif LCD_WIDTH >= 125 && LCD_HEIGHT >= 110 | 202 | #elif LCD_WIDTH >= 125 && LCD_HEIGHT >= 110 |
203 | flipit_cursor.25x25x16.bmp | 203 | flipit_cursor.25x25x16.bmp |
204 | flipit_tokens.25x50x16.bmp | 204 | flipit_tokens.25x50x16.bmp |
205 | #elif LCD_WIDTH >= 85 && LCD_HEIGHT >= 78 | ||
206 | flipit_cursor.17x17x16.bmp | ||
207 | flipit_tokens.17x34x16.bmp | ||
205 | #endif | 208 | #endif |
206 | #elif LCD_DEPTH > 1 /* greyscale */ | 209 | #elif LCD_DEPTH > 1 /* greyscale */ |
207 | #if LCD_WIDTH >= 140 && LCD_HEIGHT >= 122 | 210 | #if LCD_WIDTH >= 140 && LCD_HEIGHT >= 122 |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 96d6ea1a9b..bdb9e68360 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -107,7 +107,8 @@ PLUGIN_HEADER | |||
107 | #define FLIPIT_STEP_BY_STEP BUTTON_VOL_DOWN | 107 | #define FLIPIT_STEP_BY_STEP BUTTON_VOL_DOWN |
108 | #define FLIPIT_TOGGLE BUTTON_SELECT | 108 | #define FLIPIT_TOGGLE BUTTON_SELECT |
109 | 109 | ||
110 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 110 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
111 | (CONFIG_KEYPAD == SANSA_C200_PAD) | ||
111 | 112 | ||
112 | #define FLIPIT_UP BUTTON_UP | 113 | #define FLIPIT_UP BUTTON_UP |
113 | #define FLIPIT_DOWN BUTTON_DOWN | 114 | #define FLIPIT_DOWN BUTTON_DOWN |
@@ -523,6 +524,13 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
523 | rb->lcd_putsxy(2, 28, "[PL-LEFT] shuffle"); | 524 | rb->lcd_putsxy(2, 28, "[PL-LEFT] shuffle"); |
524 | rb->lcd_putsxy(2, 38, "[PL-RIGHT] solution"); | 525 | rb->lcd_putsxy(2, 38, "[PL-RIGHT] solution"); |
525 | rb->lcd_putsxy(2, 48, "[PL-UP] step by step"); | 526 | rb->lcd_putsxy(2, 48, "[PL-UP] step by step"); |
527 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | ||
528 | (CONFIG_KEYPAD == SANSA_C200_PAD) | ||
529 | rb->lcd_putsxy(2, 8, "[POWER] to stop"); | ||
530 | rb->lcd_putsxy(2, 18, "[SELECT] toggle"); | ||
531 | rb->lcd_putsxy(2, 28, "[REC-LEFT] shuffle"); | ||
532 | rb->lcd_putsxy(2, 38, "[REC-RIGHT] solution"); | ||
533 | rb->lcd_putsxy(2, 48, "[REC-SEL] step by step"); | ||
526 | #endif | 534 | #endif |
527 | rb->lcd_update(); | 535 | rb->lcd_update(); |
528 | #else /* HAVE_LCD_CHARCELLS */ | 536 | #else /* HAVE_LCD_CHARCELLS */ |
diff --git a/manual/plugins/flipit.tex b/manual/plugins/flipit.tex index fec5cf171e..235f3e4e5e 100644 --- a/manual/plugins/flipit.tex +++ b/manual/plugins/flipit.tex | |||
@@ -8,14 +8,15 @@ a screen containing tokens of only one colour. | |||
8 | \begin{table} | 8 | \begin{table} |
9 | \begin{btnmap}{}{} | 9 | \begin{btnmap}{}{} |
10 | \opt{PLAYER_PAD}{\ButtonOn/\ButtonMenu/\ButtonLeft/\ButtonRight} | 10 | \opt{PLAYER_PAD}{\ButtonOn/\ButtonMenu/\ButtonLeft/\ButtonRight} |
11 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD} | 11 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD} |
12 | {\ButtonUp/\ButtonDown/\ButtonLeft/\ButtonRight} | 12 | {\ButtonUp/\ButtonDown/\ButtonLeft/\ButtonRight} |
13 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay/\ButtonLeft/\ButtonRight} | 13 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay/\ButtonLeft/\ButtonRight} |
14 | \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown/\ButtonLeft/\ButtonRight} | 14 | \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown/\ButtonLeft/\ButtonRight} |
15 | & Move the cursor \\ | 15 | & Move the cursor \\ |
16 | \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonPlay} | 16 | \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonPlay} |
17 | \opt{ONDIO_PAD}{\ButtonMenu} | 17 | \opt{ONDIO_PAD}{\ButtonMenu} |
18 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonSelect} | 18 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD} |
19 | {\ButtonSelect} | ||
19 | \opt{IRIVER_H10_PAD}{\ButtonRew} | 20 | \opt{IRIVER_H10_PAD}{\ButtonRew} |
20 | & Flip \\ | 21 | & Flip \\ |
21 | \opt{PLAYER_PAD}{\ButtonOn+\ButtonLeft} | 22 | \opt{PLAYER_PAD}{\ButtonOn+\ButtonLeft} |
@@ -24,7 +25,7 @@ a screen containing tokens of only one colour. | |||
24 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode} | 25 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode} |
25 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft} | 26 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft} |
26 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay+\ButtonLeft} | 27 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay+\ButtonLeft} |
27 | \opt{SANSA_E200_PAD}{\ButtonRec+\ButtonLeft} | 28 | \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec+\ButtonLeft} |
28 | \opt{GIGABEAT_PAD}{\ButtonMenu} | 29 | \opt{GIGABEAT_PAD}{\ButtonMenu} |
29 | & Shuffle \\ | 30 | & Shuffle \\ |
30 | \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight} | 31 | \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight} |
@@ -33,7 +34,7 @@ a screen containing tokens of only one colour. | |||
33 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn} | 34 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn} |
34 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay} | 35 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay} |
35 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay+\ButtonRight} | 36 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay+\ButtonRight} |
36 | \opt{SANSA_E200_PAD}{\ButtonRec+\ButtonRight} | 37 | \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec+\ButtonRight} |
37 | \opt{GIGABEAT_PAD}{\ButtonVolUp} | 38 | \opt{GIGABEAT_PAD}{\ButtonVolUp} |
38 | & Solve \\ | 39 | & Solve \\ |
39 | \opt{PLAYER_PAD}{\ButtonOn+\ButtonPlay} | 40 | \opt{PLAYER_PAD}{\ButtonOn+\ButtonPlay} |
@@ -43,13 +44,13 @@ a screen containing tokens of only one colour. | |||
43 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight} | 44 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight} |
44 | \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonUp} | 45 | \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonUp} |
45 | \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollUp} | 46 | \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollUp} |
46 | \opt{SANSA_E200_PAD}{\ButtonRec+\ButtonSelect} | 47 | \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec+\ButtonSelect} |
47 | \opt{GIGABEAT_PAD}{\ButtonVolDown} | 48 | \opt{GIGABEAT_PAD}{\ButtonVolDown} |
48 | & Solve step by step \\ | 49 | & Solve step by step \\ |
49 | \opt{PLAYER_PAD}{\ButtonStop} | 50 | \opt{PLAYER_PAD}{\ButtonStop} |
50 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} | 51 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} |
51 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu} | 52 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu} |
52 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonPower} | 53 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,SANSA_C200_PAD}{\ButtonPower} |
53 | & Quit the game \\ | 54 | & Quit the game \\ |
54 | \end{btnmap} | 55 | \end{btnmap} |
55 | \end{table} | 56 | \end{table} |
diff --git a/manual/plugins/images/ss-flipit-132x80x16.png b/manual/plugins/images/ss-flipit-132x80x16.png new file mode 100644 index 0000000000..7d328f5d91 --- /dev/null +++ b/manual/plugins/images/ss-flipit-132x80x16.png | |||
Binary files differ | |||