diff options
Diffstat (limited to 'apps/plugins/lib/mylcd.h')
-rw-r--r-- | apps/plugins/lib/mylcd.h | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/apps/plugins/lib/mylcd.h b/apps/plugins/lib/mylcd.h index a543d60890..47bdec9e2c 100644 --- a/apps/plugins/lib/mylcd.h +++ b/apps/plugins/lib/mylcd.h | |||
@@ -35,7 +35,7 @@ | |||
35 | * lib/grey.h should be included before including this | 35 | * lib/grey.h should be included before including this |
36 | * header. For bitmap LCD's, defaults to rb->lcd_XXXX otherwise. | 36 | * header. For bitmap LCD's, defaults to rb->lcd_XXXX otherwise. |
37 | */ | 37 | */ |
38 | #if defined (HAVE_LCD_BITMAP) && (LCD_DEPTH < 4) && defined(__GREY_H__) | 38 | #if (LCD_DEPTH < 4) && defined(__GREY_H__) |
39 | #define MYLCD_CFG_GREYLIB /* using greylib */ | 39 | #define MYLCD_CFG_GREYLIB /* using greylib */ |
40 | #define mylcd_(fn) grey_##fn | 40 | #define mylcd_(fn) grey_##fn |
41 | #define myxlcd_(fn) grey_##fn | 41 | #define myxlcd_(fn) grey_##fn |
@@ -51,7 +51,8 @@ | |||
51 | #define MYLCD_DEFAULT_FG GREY_BLACK | 51 | #define MYLCD_DEFAULT_FG GREY_BLACK |
52 | #define MYLCD_DEFAULT_BG GREY_WHITE | 52 | #define MYLCD_DEFAULT_BG GREY_WHITE |
53 | 53 | ||
54 | #elif defined (HAVE_LCD_BITMAP) | 54 | #else |
55 | |||
55 | #define MYLCD_CFG_RB_XLCD /* using standard (X)LCD routines */ | 56 | #define MYLCD_CFG_RB_XLCD /* using standard (X)LCD routines */ |
56 | #define mylcd_(fn) rb->lcd_##fn | 57 | #define mylcd_(fn) rb->lcd_##fn |
57 | #define myxlcd_(fn) xlcd_##fn | 58 | #define myxlcd_(fn) xlcd_##fn |
@@ -67,18 +68,11 @@ | |||
67 | #define MYLCD_DEFAULT_FG LCD_DEFAULT_FG | 68 | #define MYLCD_DEFAULT_FG LCD_DEFAULT_FG |
68 | #define MYLCD_DEFAULT_BG LCD_DEFAULT_BG | 69 | #define MYLCD_DEFAULT_BG LCD_DEFAULT_BG |
69 | 70 | ||
70 | #else | ||
71 | #error Configuration not supported! Did you forget to include the correct lib header? | ||
72 | #endif /* end LCD type selection */ | 71 | #endif /* end LCD type selection */ |
73 | 72 | ||
74 | /* Update functions */ | 73 | /* Update functions */ |
75 | #define mylcd_update mylcd_(update) | 74 | #define mylcd_update mylcd_(update) |
76 | #ifdef HAVE_LCD_BITMAP | ||
77 | #define mylcd_update_rect mylcd_(update_rect) | 75 | #define mylcd_update_rect mylcd_(update_rect) |
78 | #else | ||
79 | static inline void mylcd_update_rect(int x, int y, int w, int h) | ||
80 | { (void)x; (void)y; (void)w; (void)h; pgfx_update(); } | ||
81 | #endif /* HAVE_LCD_BITMAP */ | ||
82 | 76 | ||
83 | /* Update functions - unbuffered : special handling for these | 77 | /* Update functions - unbuffered : special handling for these |
84 | * It is desirable to still evaluate arguments even if there will | 78 | * It is desirable to still evaluate arguments even if there will |
@@ -104,7 +98,6 @@ static inline void mylcd_ub_update_rect(int x, int y, int w, int h) | |||
104 | #define mylcd_set_drawmode mylcd_(set_drawmode) | 98 | #define mylcd_set_drawmode mylcd_(set_drawmode) |
105 | #define mylcd_get_drawmode mylcd_(get_drawmode) | 99 | #define mylcd_get_drawmode mylcd_(get_drawmode) |
106 | 100 | ||
107 | #ifdef HAVE_LCD_BITMAP | ||
108 | #define mylcd_set_foreground mylcd_(set_foreground) | 101 | #define mylcd_set_foreground mylcd_(set_foreground) |
109 | #define mylcd_get_foreground mylcd_(get_foreground) | 102 | #define mylcd_get_foreground mylcd_(get_foreground) |
110 | #define mylcd_set_background mylcd_(set_background) | 103 | #define mylcd_set_background mylcd_(set_background) |
@@ -112,7 +105,6 @@ static inline void mylcd_ub_update_rect(int x, int y, int w, int h) | |||
112 | #define mylcd_set_drawinfo mylcd_(set_drawinfo) | 105 | #define mylcd_set_drawinfo mylcd_(set_drawinfo) |
113 | #define mylcd_setfont mylcd_(setfont) | 106 | #define mylcd_setfont mylcd_(setfont) |
114 | #define mylcd_getstringsize mylcd_(getstringsize) | 107 | #define mylcd_getstringsize mylcd_(getstringsize) |
115 | #endif /* HAVE_LCD_BITMAP */ | ||
116 | 108 | ||
117 | /* Whole display */ | 109 | /* Whole display */ |
118 | #define mylcd_clear_display mylcd_(clear_display) | 110 | #define mylcd_clear_display mylcd_(clear_display) |
@@ -131,57 +123,43 @@ static inline void mylcd_ub_update_rect(int x, int y, int w, int h) | |||
131 | 123 | ||
132 | /* Filled Primitives */ | 124 | /* Filled Primitives */ |
133 | #define mylcd_fillrect mylcd_(fillrect) | 125 | #define mylcd_fillrect mylcd_(fillrect) |
134 | #ifdef HAVE_LCD_BITMAP | ||
135 | #define mylcd_filltriangle myxlcd_(filltriangle) | 126 | #define mylcd_filltriangle myxlcd_(filltriangle) |
136 | #endif /* HAVE_LCD_BITMAP */ | ||
137 | 127 | ||
138 | /* Bitmaps */ | 128 | /* Bitmaps */ |
139 | #define mylcd_mono_bitmap_part mylcd_(mono_bitmap_part) | 129 | #define mylcd_mono_bitmap_part mylcd_(mono_bitmap_part) |
140 | #define mylcd_mono_bitmap mylcd_(mono_bitmap) | 130 | #define mylcd_mono_bitmap mylcd_(mono_bitmap) |
141 | 131 | ||
142 | #ifdef HAVE_LCD_BITMAP | ||
143 | #define mylcd_gray_bitmap_part myxlcd_(gray_bitmap_part) | 132 | #define mylcd_gray_bitmap_part myxlcd_(gray_bitmap_part) |
144 | #define mylcd_gray_bitmap myxlcd_(gray_bitmap) | 133 | #define mylcd_gray_bitmap myxlcd_(gray_bitmap) |
145 | #if 0 /* possible, but not implemented in greylib */ | 134 | #if 0 /* possible, but not implemented in greylib */ |
146 | #define mylcd_color_bitmap_part myxlcd_(color_bitmap_part) | 135 | #define mylcd_color_bitmap_part myxlcd_(color_bitmap_part) |
147 | #define mylcd_color_bitmap myxlcd_(color_bitmap) | 136 | #define mylcd_color_bitmap myxlcd_(color_bitmap) |
148 | #endif | 137 | #endif |
149 | #endif /* HAVE_LCD_BITMAP */ | ||
150 | 138 | ||
151 | /* Bitmaps - unbuffered */ | 139 | /* Bitmaps - unbuffered */ |
152 | #ifdef HAVE_LCD_BITMAP | ||
153 | #define mylcd_ub_gray_bitmap_part myxlcd_ub_(gray_bitmap_part) | 140 | #define mylcd_ub_gray_bitmap_part myxlcd_ub_(gray_bitmap_part) |
154 | #define mylcd_ub_gray_bitmap myxlcd_ub_(gray_bitmap) | 141 | #define mylcd_ub_gray_bitmap myxlcd_ub_(gray_bitmap) |
155 | #endif /* HAVE_LCD_BITMAP */ | ||
156 | 142 | ||
157 | /* Text */ | 143 | /* Text */ |
158 | /* lcd_putsxyofs is static'ed in the core for now on color */ | 144 | /* lcd_putsxyofs is static'ed in the core for now on color */ |
159 | #ifdef HAVE_LCD_BITMAP | ||
160 | #define mylcd_putsxyofs mylcd_(putsxyofs) | 145 | #define mylcd_putsxyofs mylcd_(putsxyofs) |
161 | #define mylcd_putsxy mylcd_(putsxy) | 146 | #define mylcd_putsxy mylcd_(putsxy) |
162 | #endif /* HAVE_LCD_BITMAP */ | ||
163 | 147 | ||
164 | /* Scrolling */ | 148 | /* Scrolling */ |
165 | #ifdef HAVE_LCD_BITMAP | ||
166 | #define mylcd_scroll_left myxlcd_(scroll_left) | 149 | #define mylcd_scroll_left myxlcd_(scroll_left) |
167 | #define mylcd_scroll_right myxlcd_(scroll_right) | 150 | #define mylcd_scroll_right myxlcd_(scroll_right) |
168 | #define mylcd_scroll_up myxlcd_(scroll_up) | 151 | #define mylcd_scroll_up myxlcd_(scroll_up) |
169 | #define mylcd_scroll_down myxlcd_(scroll_down) | 152 | #define mylcd_scroll_down myxlcd_(scroll_down) |
170 | #endif /* HAVE_LCD_BITMAP */ | ||
171 | 153 | ||
172 | /* Scrolling - unbuffered */ | 154 | /* Scrolling - unbuffered */ |
173 | #ifdef HAVE_LCD_BITMAP | ||
174 | #define mylcd_ub_scroll_left myxlcd_ub_(scroll_left) | 155 | #define mylcd_ub_scroll_left myxlcd_ub_(scroll_left) |
175 | #define mylcd_ub_scroll_right myxlcd_ub_(scroll_right) | 156 | #define mylcd_ub_scroll_right myxlcd_ub_(scroll_right) |
176 | #define mylcd_ub_scroll_up myxlcd_ub_(scroll_up) | 157 | #define mylcd_ub_scroll_up myxlcd_ub_(scroll_up) |
177 | #define mylcd_ub_scroll_down myxlcd_ub_(scroll_down) | 158 | #define mylcd_ub_scroll_down myxlcd_ub_(scroll_down) |
178 | #endif /* HAVE_LCD_BITMAP */ | ||
179 | 159 | ||
180 | /* Viewports */ | 160 | /* Viewports */ |
181 | #ifdef HAVE_LCD_BITMAP | ||
182 | #define mylcd_clear_viewport mylcd_(clear_viewport) | 161 | #define mylcd_clear_viewport mylcd_(clear_viewport) |
183 | #define mylcd_set_viewport mylcd_(set_viewport) | 162 | #define mylcd_set_viewport mylcd_(set_viewport) |
184 | #define mylcd_viewport_set_fullscreen mylcd_viewport_(set_fullscreen) | 163 | #define mylcd_viewport_set_fullscreen mylcd_viewport_(set_fullscreen) |
185 | #endif /* HAVE_LCD_BITMAP */ | ||
186 | 164 | ||
187 | #endif /* MYLCD_H */ | 165 | #endif /* MYLCD_H */ |