diff options
Diffstat (limited to 'apps/plugins/fractals')
-rw-r--r-- | apps/plugins/fractals/fractal.c | 30 | ||||
-rw-r--r-- | apps/plugins/fractals/fractal_sets.h | 2 |
2 files changed, 12 insertions, 20 deletions
diff --git a/apps/plugins/fractals/fractal.c b/apps/plugins/fractals/fractal.c index ff768a9516..971ae506ca 100644 --- a/apps/plugins/fractals/fractal.c +++ b/apps/plugins/fractals/fractal.c | |||
@@ -31,16 +31,6 @@ | |||
31 | #include "mandelbrot_set.h" | 31 | #include "mandelbrot_set.h" |
32 | 32 | ||
33 | #ifdef USEGSLIB | 33 | #ifdef USEGSLIB |
34 | #define MYLCD(fn) grey_ub_ ## fn | ||
35 | #define MYLCD_UPDATE() | ||
36 | #define MYXLCD(fn) grey_ub_ ## fn | ||
37 | #else | ||
38 | #define MYLCD(fn) rb->lcd_ ## fn | ||
39 | #define MYLCD_UPDATE() rb->lcd_update(); | ||
40 | #define MYXLCD(fn) xlcd_ ## fn | ||
41 | #endif | ||
42 | |||
43 | #ifdef USEGSLIB | ||
44 | GREY_INFO_STRUCT | 34 | GREY_INFO_STRUCT |
45 | static unsigned char *gbuf; | 35 | static unsigned char *gbuf; |
46 | static size_t gbuf_size = 0; | 36 | static size_t gbuf_size = 0; |
@@ -143,8 +133,8 @@ enum plugin_status plugin_start(const void* parameter) | |||
143 | switch (redraw) | 133 | switch (redraw) |
144 | { | 134 | { |
145 | case REDRAW_FULL: | 135 | case REDRAW_FULL: |
146 | MYLCD(clear_display)(); | 136 | mylcd_ub_clear_display(); |
147 | MYLCD_UPDATE(); | 137 | mylcd_ub_update(); |
148 | /* fall-through */ | 138 | /* fall-through */ |
149 | case REDRAW_FULL_OVERLAY: | 139 | case REDRAW_FULL_OVERLAY: |
150 | rects_queue_init(); | 140 | rects_queue_init(); |
@@ -200,32 +190,32 @@ enum plugin_status plugin_start(const void* parameter) | |||
200 | 190 | ||
201 | case FRACTAL_UP: | 191 | case FRACTAL_UP: |
202 | ops->move(0, +1); | 192 | ops->move(0, +1); |
203 | MYXLCD(scroll_down)(LCD_SHIFT_Y); | 193 | mylcd_ub_scroll_down(LCD_SHIFT_Y); |
204 | MYLCD_UPDATE(); | 194 | mylcd_ub_update(); |
205 | if (redraw != REDRAW_FULL) | 195 | if (redraw != REDRAW_FULL) |
206 | redraw = rects_move_down() ? REDRAW_FULL : REDRAW_PARTIAL; | 196 | redraw = rects_move_down() ? REDRAW_FULL : REDRAW_PARTIAL; |
207 | break; | 197 | break; |
208 | 198 | ||
209 | case FRACTAL_DOWN: | 199 | case FRACTAL_DOWN: |
210 | ops->move(0, -1); | 200 | ops->move(0, -1); |
211 | MYXLCD(scroll_up)(LCD_SHIFT_Y); | 201 | mylcd_ub_scroll_up(LCD_SHIFT_Y); |
212 | MYLCD_UPDATE(); | 202 | mylcd_ub_update(); |
213 | if (redraw != REDRAW_FULL) | 203 | if (redraw != REDRAW_FULL) |
214 | redraw = rects_move_up() ? REDRAW_FULL : REDRAW_PARTIAL; | 204 | redraw = rects_move_up() ? REDRAW_FULL : REDRAW_PARTIAL; |
215 | break; | 205 | break; |
216 | 206 | ||
217 | case FRACTAL_LEFT: | 207 | case FRACTAL_LEFT: |
218 | ops->move(-1, 0); | 208 | ops->move(-1, 0); |
219 | MYXLCD(scroll_right)(LCD_SHIFT_X); | 209 | mylcd_ub_scroll_right(LCD_SHIFT_X); |
220 | MYLCD_UPDATE(); | 210 | mylcd_ub_update(); |
221 | if (redraw != REDRAW_FULL) | 211 | if (redraw != REDRAW_FULL) |
222 | redraw = rects_move_right() ? REDRAW_FULL : REDRAW_PARTIAL; | 212 | redraw = rects_move_right() ? REDRAW_FULL : REDRAW_PARTIAL; |
223 | break; | 213 | break; |
224 | 214 | ||
225 | case FRACTAL_RIGHT: | 215 | case FRACTAL_RIGHT: |
226 | ops->move(+1, 0); | 216 | ops->move(+1, 0); |
227 | MYXLCD(scroll_left)(LCD_SHIFT_X); | 217 | mylcd_ub_scroll_left(LCD_SHIFT_X); |
228 | MYLCD_UPDATE(); | 218 | mylcd_ub_update(); |
229 | if (redraw != REDRAW_FULL) | 219 | if (redraw != REDRAW_FULL) |
230 | redraw = rects_move_left() ? REDRAW_FULL : REDRAW_PARTIAL; | 220 | redraw = rects_move_left() ? REDRAW_FULL : REDRAW_PARTIAL; |
231 | break; | 221 | break; |
diff --git a/apps/plugins/fractals/fractal_sets.h b/apps/plugins/fractals/fractal_sets.h index b2eaa589dc..865517b5b5 100644 --- a/apps/plugins/fractals/fractal_sets.h +++ b/apps/plugins/fractals/fractal_sets.h | |||
@@ -30,6 +30,8 @@ | |||
30 | #include "lib/xlcd.h" | 30 | #include "lib/xlcd.h" |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | #include "lib/mylcd.h" | ||
34 | |||
33 | #define DELTA 8 /* Panning moves 1/DELTA of screen */ | 35 | #define DELTA 8 /* Panning moves 1/DELTA of screen */ |
34 | 36 | ||
35 | #define LCD_SHIFT_X (LCD_WIDTH / DELTA) | 37 | #define LCD_SHIFT_X (LCD_WIDTH / DELTA) |