From 543c49a4835a6bc0d3388034ad93ec46ff9fbee5 Mon Sep 17 00:00:00 2001 From: Marianne Arnold Date: Mon, 22 Oct 2007 13:53:16 +0000 Subject: [PATCH] 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 --- apps/plugins/SOURCES | 4 ---- apps/plugins/bitmaps/native/SOURCES | 3 +++ apps/plugins/flipit.c | 10 +++++++++- manual/plugins/flipit.tex | 13 +++++++------ manual/plugins/images/ss-flipit-132x80x16.png | Bin 0 -> 1354 bytes 5 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 manual/plugins/images/ss-flipit-132x80x16.png 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 vbrfix.c viewer.c - #if CONFIG_CODEC == SWCODEC metronome.c #endif @@ -36,16 +35,13 @@ wavrecord.c #ifndef IRIVER_IFP7XX_SERIES /* Temporarily disable plugins for iFP7xx */ dice.c disktidy.c -#ifndef SANSA_C200 flipit.c -#endif #ifdef HAVE_LCD_BITMAP /* Not for the Player */ maze.c mazezam.c text_editor.c wavview.c -robotfindskitten.c /* Plugins needing the grayscale lib on low-depth LCDs */ 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 #elif LCD_WIDTH >= 125 && LCD_HEIGHT >= 110 flipit_cursor.25x25x16.bmp flipit_tokens.25x50x16.bmp +#elif LCD_WIDTH >= 85 && LCD_HEIGHT >= 78 +flipit_cursor.17x17x16.bmp +flipit_tokens.17x34x16.bmp #endif #elif LCD_DEPTH > 1 /* greyscale */ #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 #define FLIPIT_STEP_BY_STEP BUTTON_VOL_DOWN #define FLIPIT_TOGGLE BUTTON_SELECT -#elif CONFIG_KEYPAD == SANSA_E200_PAD +#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ + (CONFIG_KEYPAD == SANSA_C200_PAD) #define FLIPIT_UP BUTTON_UP #define FLIPIT_DOWN BUTTON_DOWN @@ -523,6 +524,13 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) rb->lcd_putsxy(2, 28, "[PL-LEFT] shuffle"); rb->lcd_putsxy(2, 38, "[PL-RIGHT] solution"); rb->lcd_putsxy(2, 48, "[PL-UP] step by step"); +#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ + (CONFIG_KEYPAD == SANSA_C200_PAD) + rb->lcd_putsxy(2, 8, "[POWER] to stop"); + rb->lcd_putsxy(2, 18, "[SELECT] toggle"); + rb->lcd_putsxy(2, 28, "[REC-LEFT] shuffle"); + rb->lcd_putsxy(2, 38, "[REC-RIGHT] solution"); + rb->lcd_putsxy(2, 48, "[REC-SEL] step by step"); #endif rb->lcd_update(); #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. \begin{table} \begin{btnmap}{}{} \opt{PLAYER_PAD}{\ButtonOn/\ButtonMenu/\ButtonLeft/\ButtonRight} -\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD} +\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD} {\ButtonUp/\ButtonDown/\ButtonLeft/\ButtonRight} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay/\ButtonLeft/\ButtonRight} \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown/\ButtonLeft/\ButtonRight} & Move the cursor \\ \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonPlay} \opt{ONDIO_PAD}{\ButtonMenu} -\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonSelect} +\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD} + {\ButtonSelect} \opt{IRIVER_H10_PAD}{\ButtonRew} & Flip \\ \opt{PLAYER_PAD}{\ButtonOn+\ButtonLeft} @@ -24,7 +25,7 @@ a screen containing tokens of only one colour. \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft} \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay+\ButtonLeft} -\opt{SANSA_E200_PAD}{\ButtonRec+\ButtonLeft} +\opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec+\ButtonLeft} \opt{GIGABEAT_PAD}{\ButtonMenu} & Shuffle \\ \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight} @@ -33,7 +34,7 @@ a screen containing tokens of only one colour. \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay} \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay+\ButtonRight} -\opt{SANSA_E200_PAD}{\ButtonRec+\ButtonRight} +\opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec+\ButtonRight} \opt{GIGABEAT_PAD}{\ButtonVolUp} & Solve \\ \opt{PLAYER_PAD}{\ButtonOn+\ButtonPlay} @@ -43,13 +44,13 @@ a screen containing tokens of only one colour. \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight} \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonUp} \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollUp} -\opt{SANSA_E200_PAD}{\ButtonRec+\ButtonSelect} +\opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec+\ButtonSelect} \opt{GIGABEAT_PAD}{\ButtonVolDown} & Solve step by step \\ \opt{PLAYER_PAD}{\ButtonStop} \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu} -\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonPower} +\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,SANSA_C200_PAD}{\ButtonPower} & Quit the game \\ \end{btnmap} \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 0000000000000000000000000000000000000000..7d328f5d91c81cb12b1ea028183875d6a40d3dc5 GIT binary patch literal 1354 zcmV-Q1-1H#P)pF33NqRbVF}#ZDnqB004<9jRpV!1m{UaK~#90?VB%@+E^6Euc(Nq zh(sbP5ET&!L`6geq5@HYSb-Q3u_B@(VnpPK6^IohBPx){k%$$D6^M$63d9OT1!6_S ziv4)$%(7DmNhp_ZUXpXq946%BzL($omwe|*_D|LZNyvqMceB}~X}bEd!iOwtoP-5N z`Zb+Sr@^nm=;O$LKlD6rax+;jmj%_ZNkRl;u~?w!_xJZ<7<>Iur!x@gia3trhGDpC zSyoGkV64~cIF6Ig^WNK$2#P*@jPKP5f?)gi)>a7-jLo;r^!I6!%v{$ug$_hQk;wcV zi}-mRX0yaf2^Wm@Uu*Pe&l{W4qtJIE_aceN)Kp_)+LSx|FnnrIHc7Z(EdN|iZbDPa zi7EX|WFfK?nVUL^2~psMys zxL}}IuG`zI02UI`bBybfqn;it${!^vat&PR_vHoV#- z;ewF|%8COk4IHS?cDp_KX3ZuE7mPOQMGJ!{UbwmRjWi1j41L>Y_}=HqLIgwE_KCxA z)b|FRPS>n;T*tX?79tp$w$J=?GJ4xPAi%TPm9h}Q(6oJKN#eWiQGrM@n<;1Ef}v^q zj6JVNfS*&(!UaRk_6ct$Cj_`tuN~zqTrhMz9IRw8m!1-c^GcMnaKTWseR^i>FA|sq zk8&0+7;3hUk5y)|0KeGxl(W#m(6N2u+vtP1~H(0-X zKkyl6a30@Yzl1LxMp+MM6FtnaNRja`<7X0_!Fha(YtGGbrlb+(5=cBuyKlM$5`2qm ze&j)GVG+To;NfhOhk1m1eNwXHF^~4gD_RSS2u39j2lD|&p^_3@xtl+#XE{^S6mtpl zGiHU75?qPvYh*b`(japQ>!nH(Twf#0Ig$pMOBi`7NpO9QEVU)gGM8|3D@k$~v=$Z@ zjH(_^-ZRQeo_YqSg~bJkU&ajKkW3`QX{V1!qc@tsSObUPgtIyi^!G!3d+t$IpWCFLt^|*he^@X8-^I M07*qoM6N<$g8DOtM*si- literal 0 HcmV?d00001