From 84f7f60b8fbcd0084cf849613ac3e793894611c3 Mon Sep 17 00:00:00 2001 From: Marty Miller Date: Sat, 21 Apr 2012 21:36:42 -0500 Subject: [PATCH] Fix Rockblox plugin display issues on Clip Zip Added Rockblox background, layout and detection for 96x96x16 displays Change-Id: I4585d5e679851b5696542269fe2123cf7df200de --- apps/plugins/bitmaps/native/SOURCES | 4 ++- .../native/rockblox_background.96x96x16.bmp | Bin 0 -> 10294 bytes apps/plugins/rockblox.c | 24 ++++++++++-------- docs/CREDITS | 1 + 4 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 apps/plugins/bitmaps/native/rockblox_background.96x96x16.bmp diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index de347fd1aa..f8ec9385b2 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES @@ -514,8 +514,10 @@ rockblox_background.128x160x16.bmp rockblox_background.128x128x16.bmp #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) rockblox_background.132x80x16.bmp -#elif ((LCD_WIDTH == 128 && LCD_HEIGHT == 96) || (LCD_WIDTH == 96 && LCD_HEIGHT == 96)) +#elif (LCD_WIDTH == 128 && LCD_HEIGHT == 96) rockblox_background.128x96x2.bmp +#elif (LCD_WIDTH == 96 && LCD_HEIGHT == 96) +rockblox_background.96x96x16.bmp #endif #elif LCD_DEPTH == 2 /* greyscale versions */ #if (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) diff --git a/apps/plugins/bitmaps/native/rockblox_background.96x96x16.bmp b/apps/plugins/bitmaps/native/rockblox_background.96x96x16.bmp new file mode 100644 index 0000000000000000000000000000000000000000..cb8f1b130e3744bed8c6e8d5748e677217ff5187 GIT binary patch literal 10294 zcmeHM&2pPC5MDbu-rL;UOMB@t_dZ0QDv!|@b9c2`2>}8m+>AZ- zj)9fHpO$a+p*8;Y^Z6radp-pq_m|lgaHjj=1HjoOZ?M2F+UT%Yz;d~Sq9{Nq1$AA+ z&CLzm-rmCb`FpsyxQCOIPk7}QxV-obcXxMie}4}T4-fG8_y|u=Pk8PtZr^eHfv~^f z<>duV;SaXA@cQ}++wB(pqa7JIGO$k!RC{ilj$Qc?N0Zt7Iz9H<*2cfK2G-L~e-oPc z%Y41gbG;L1xl{Z#z%pL~tX9TZ{~P=)3*swvjf)1_H7y==G>86Xiyve^$1Tf@lXv2e zO|Z{DvhQ05pOY%dG{j_xOmhr3Tl}oDEYGr4o{Q7re_nnC zHjK~w&|Z>iditAQ{2=@f@Us*A(flUHPud#M*O*|foZ0dD@wG**o#q!N#LxUoGR-m2 z#3|s%FZmtiKLFSoE{NZlKku3ksH$oq3^zOYJ?o1PUyTZu^ldI8$LGfrC(b4OmC(lb zE}771eSfSe#ABKpZdeW!U#DgWcL@JsK%QTAbf_lWqrGI4f{(wyCK@1qw0`OL-9#h& zSgRuOnP186g!%uU;YX~$tlvm}-X^~>`kFX7@iLm9qED+(>1dp3jE?%`ehKpCvY05F7%$p6Lb6v+0*sQL6(Ywr#Wsgt5fl?V-~)~ zsSsb`J!rb{W{4zbbMQH0+!JQWqfj!KI39!WQ}xR@xL0L`Nv#XW5wxH*+aU-))@1%$ z5JyMHbNn?KgdHpfWMX2}4L5u{aqBzcN9)(tCs*OJ#GXmXZ^VqS z&rjiIx_-l~yE87ohl`)8U&lh&o1@<_sypNO4^Q}(ocC^hl=!CW*WLe^NBl(VH?n?+ zP@}$7p3h^k(|MQQ!_^n(H$HwYfK1(^7c*S~=>=1`%`zbxNZ>X9$@$gmqp5pJ3Y$w4UN(6Mm)`{aV#ruoQFvILP>E&SMg=qrpW|g>s7i4q zkjGE5emMcU?jaW|Ib8w~Q^FDF*S?|RM|G$v@2^C^7R83Eon|-T$C}fxMCs#Gy({MU zkDvd7F?4kGPYiy<9ozaU0^im@w#XT9QtIc3_-EyJhu)&G zZvI5*OP+6GSbOFz@cE(Kzu>l(V{iSnK@K<+f2_IZ^8m0p<@kx!7sZ7OEv~uvxTlpD zf3@p38|-6AL6(e9SZbs2L)8g>=p_V!s$3&iyvQWu>*$Kogp8wL1w#IU32nlH@uG$M<{^u zOkB;vCoU`xgw<#1@l(j=7W#lqALo~*>?DiVFV+vS7WECTPo@r`MLzb2RO>uVoCC)H E3yM9Za{vGU literal 0 HcmV?d00001 diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 17eadd65be..8db4a3497f 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c @@ -670,19 +670,21 @@ #define LEVEL_X 78 #define LINES_Y 51 -#elif LCD_WIDTH == 96 && LCD_HEIGHT == 96 +#elif (LCD_WIDTH == 96) && (LCD_HEIGHT == 96) -#define BLOCK_WIDTH 3 -#define BLOCK_HEIGHT 3 -#define BOARD_X 9 -#define BOARD_Y 3 -#define PREVIEW_X 59 -#define PREVIEW_Y 5 +#define BLOCK_WIDTH 4 +#define BLOCK_HEIGHT 4 +#define BOARD_X 5 +#define BOARD_Y 4 +#define PREVIEW_X 64 +#define PREVIEW_Y 76 #define LABEL_X 59 -#define SCORE_Y 32 -#define LEVEL_Y 13 -#define LEVEL_X 78 -#define LINES_Y 51 +#define SCORE_Y 15 +#define SCORE_X 58 +#define LEVEL_Y 39 +#define LEVEL_X 58 +#define LINES_Y 62 +#define LINES_X 58 #endif #ifndef LEVEL_X diff --git a/docs/CREDITS b/docs/CREDITS index 3619b6aea8..aa915c6896 100644 --- a/docs/CREDITS +++ b/docs/CREDITS @@ -621,6 +621,7 @@ Albert Barca Fukuda Takafumi Dimitar Dimitrov Osborne Jacobs +Marty Miller The libmad team The wavpack team