summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/lcd.h21
-rw-r--r--firmware/export/scroll_engine.h3
2 files changed, 0 insertions, 24 deletions
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index bdeddf0b52..e7a75e893a 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -120,27 +120,6 @@ struct scrollinfo;
120#define STRIDE(screen, w, h) (screen==SCREEN_MAIN?STRIDE_MAIN((w), \ 120#define STRIDE(screen, w, h) (screen==SCREEN_MAIN?STRIDE_MAIN((w), \
121 (h)):STRIDE_REMOTE((w),(h))) 121 (h)):STRIDE_REMOTE((w),(h)))
122 122
123#define STYLE_NONE 0x00000000
124#define STYLE_DEFAULT 0x01000000
125#define STYLE_COLORED 0x02000000
126#define STYLE_INVERT 0x04000000
127#define STYLE_COLORBAR 0x08000000
128#define STYLE_GRADIENT 0x10000000
129#define STYLE_MODE_MASK 0xFF000000
130/* HACK: This isnt really a style, We need to be able to tell some of
131 * the lcd API that we want to draw text to a specific pixel instead
132 * of a char. Remove this hack when the whole LCD api goes to fully
133 * pixel based positioning - jdgordon */
134#define STYLE_XY_PIXELS 0x00010000
135#define STYLE_COLOR_MASK 0x0000FFFF
136#ifdef HAVE_LCD_COLOR
137#define STYLE_CURLN_MASK 0x0000FF00
138#define STYLE_MAXLN_MASK 0x000000FF
139#define CURLN_PACK(x) (((x)<<8) & STYLE_CURLN_MASK)
140#define CURLN_UNPACK(x) ((unsigned char)(((x)&STYLE_CURLN_MASK) >> 8))
141#define NUMLN_PACK(x) ((x) & STYLE_MAXLN_MASK)
142#define NUMLN_UNPACK(x) ((unsigned char)((x) & STYLE_MAXLN_MASK))
143#endif
144 123
145#ifdef HAVE_LCD_BITMAP 124#ifdef HAVE_LCD_BITMAP
146#if LCD_DEPTH <=8 125#if LCD_DEPTH <=8
diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h
index e3fd720550..19a2bc4cca 100644
--- a/firmware/export/scroll_engine.h
+++ b/firmware/export/scroll_engine.h
@@ -69,9 +69,6 @@ struct scrollinfo
69 int width, height; 69 int width, height;
70 /* pixel to skip from the beginning of the string, increments as the text scrolls */ 70 /* pixel to skip from the beginning of the string, increments as the text scrolls */
71 int offset; 71 int offset;
72#ifdef HAVE_LCD_BITMAP
73 int style; /* line style */
74#endif /* HAVE_LCD_BITMAP */
75 /* scroll presently forward or backward? */ 72 /* scroll presently forward or backward? */
76 bool backward; 73 bool backward;
77 bool bidir; 74 bool bidir;