1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES
index c12c7c7..df1397d 100644
--- a/apps/plugins/bitmaps/mono/SOURCES
+++ b/apps/plugins/bitmaps/mono/SOURCES
@@ -5,7 +5,7 @@
 bubbles_bubble.112x64x1.bmp
 #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 64)
 bubbles_bubble.128x64x1.bmp
-#elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80)
+#elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) || (LCD_WIDTH == 96 && LCD_HEIGHT == 96)
 bubbles_bubble.132x80x16.bmp
 #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96)
 bubbles_bubble.128x96x1.bmp
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES
index 8eaf623..7ea9e29 100644
--- a/apps/plugins/bitmaps/native/SOURCES
+++ b/apps/plugins/bitmaps/native/SOURCES
@@ -76,7 +76,7 @@ brickmania_long_pads.132x80x16.bmp
 brickmania_powerups.132x80x16.bmp
 brickmania_break.132x80x16.bmp
 
-#elif LCD_WIDTH >= 128
+#elif LCD_WIDTH >= 96
 brickmania_ball.4x4x16.bmp
 brickmania_bricks.128x128x16.bmp
 brickmania_pads.132x80x16.bmp
@@ -84,6 +84,7 @@ brickmania_short_pads.132x80x16.bmp
 brickmania_long_pads.132x80x16.bmp
 brickmania_powerups.132x80x16.bmp
 brickmania_break.132x80x16.bmp
+
 #endif /* different colour displays */
 
 #elif LCD_DEPTH > 1
@@ -148,7 +149,7 @@ bubbles_background.128x128x16.bmp
 #elif (LCD_WIDTH >= 132) && (LCD_HEIGHT >= 80)
 bubbles_emblem.132x80x16.bmp
 bubbles_background.132x80x16.bmp
-#elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 96)
+#elif (LCD_WIDTH >= 96) && (LCD_HEIGHT >= 96)
 bubbles_emblem.132x80x16.bmp
 bubbles_background.128x96x16.bmp
 #endif
@@ -262,7 +263,7 @@ clock_segments.128x128x2.bmp
 clock_smallsegments.128x128x2.bmp
 clock_logo.128x128x2.bmp
 clock_messages.128x128x2.bmp
-#elif (LCD_WIDTH >= 112) && (LCD_HEIGHT >= 64) && (LCD_DEPTH >= 1)
+#elif (LCD_WIDTH >= 96) && (LCD_HEIGHT >= 64) && (LCD_DEPTH >= 1)
 clock_binary.112x64x1.bmp
 clock_digits.112x64x1.bmp
 clock_smalldigits.112x64x1.bmp
@@ -505,7 +506,7 @@ 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)
+#elif ((LCD_WIDTH == 128 && LCD_HEIGHT == 96) || (LCD_WIDTH == 96 && LCD_HEIGHT == 96))
 rockblox_background.128x96x2.bmp
 #endif
 #elif LCD_DEPTH == 2 /* greyscale versions */
@@ -647,7 +648,7 @@ solitaire_suitsi.26x132x16.bmp
 card_back.18x23x16.bmp
 card_deck.234x92x16.bmp
 solitaire_suitsi.18x92x16.bmp
-#elif LCD_WIDTH >= 128
+#elif LCD_WIDTH >= 96
 card_back.15x20x16.bmp
 card_deck.195x80x16.bmp
 solitaire_suitsi.15x80x16.bmp
@@ -729,7 +730,7 @@ sudoku_inverse.128x128x2.bmp
 sudoku_start.138x110x2.bmp
 sudoku_normal.138x110x2.bmp
 sudoku_inverse.138x110x2.bmp
-#elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) && (LCD_DEPTH >= 16)
+#elif ((LCD_WIDTH == 132 && LCD_HEIGHT == 80) || (LCD_WIDTH == 96 && LCD_HEIGHT == 96)) && (LCD_DEPTH >= 16)
 sudoku_start.132x80x16.bmp
 sudoku_normal.132x80x16.bmp
 sudoku_inverse.132x80x16.bmp
@@ -898,6 +899,8 @@ pitch_notes.128x128x2.bmp
 pitch_notes.128x96x2.bmp
 #elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 64)
 pitch_notes.128x64x1.bmp
+#elif (LCD_WIDTH >= 96) && (LCD_HEIGHT >= 96)
+pitch_notes.132x80x16.bmp
 #else
 #error Pitch Detector: unsupported LCD
 #endif
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c
index 1c4bbca..9f860d4 100644
--- a/apps/plugins/bubbles.c
+++ b/apps/plugins/bubbles.c
@@ -198,7 +198,7 @@ enum {
 #define MAX_FPS       30
 
 /* 7x7 bubbles (Sansa Clip/m200) */
-#elif (LCD_HEIGHT == 64 && LCD_WIDTH == 128)
+#elif (LCD_HEIGHT == 64 && LCD_WIDTH == 128) || (LCD_HEIGHT == 96 && LCD_WIDTH == 96)
 #define XOFS          33
 #define ROW_HEIGHT     5
 #define MAX_FPS       30
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 7097704..674b14e 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -630,6 +630,19 @@
 #define LEVEL_X 78
 #define LINES_Y 51
 
+#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 LABEL_X 59
+#define SCORE_Y 32
+#define LEVEL_Y 13
+#define LEVEL_X 78
+#define LINES_Y 51
 #endif
 
 #ifndef LEVEL_X
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c
index f0bff4d..73c1870 100644
--- a/apps/plugins/sudoku/sudoku.c
+++ b/apps/plugins/sudoku/sudoku.c
@@ -99,7 +99,7 @@ static const char default_game[9][9] =
 
 #if LCD_HEIGHT <= LCD_WIDTH /* Horizontal layout, scratchpad at the left */
 
-#if (LCD_HEIGHT==64) && (LCD_WIDTH==112 || LCD_WIDTH==128)
+#if ((LCD_HEIGHT==64 && (LCD_WIDTH==112 || LCD_WIDTH==128)) || (LCD_HEIGHT == 96 && LCD_WIDTH == 96))
 /* Archos Recorders and Ondios - 112x64, 9 cells @ 8x6 with 10 border lines */
 #define SMALL_BOARD
 #define MARK_OFFS   1   /* Pixels between border and mark */
diff --git a/tools/configure b/tools/configure
index 8a622af..80c6380 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2541,7 +2541,7 @@ fi
     output="rockbox.sansa"
     bootoutput="bootloader-clipzip.sansa"
     appextra="recorder:gui:radio"
-    plugins=""
+    plugins="yes"
     swcodec="yes"
     toolset=$scramblebitmaptools
     t_cpu="arm"