summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/lcd-remote.h3
-rw-r--r--firmware/export/lcd.h13
2 files changed, 7 insertions, 9 deletions
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index 74b668db3d..be6816cd7e 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -37,9 +37,6 @@
37int remote_type(void); 37int remote_type(void);
38#endif 38#endif
39 39
40#define STYLE_DEFAULT 0x00000000
41#define STYLE_INVERT 0x20000000
42
43#if LCD_REMOTE_DEPTH <= 8 40#if LCD_REMOTE_DEPTH <= 8
44#if (LCD_REMOTE_PIXELFORMAT == VERTICAL_INTERLEAVED) \ 41#if (LCD_REMOTE_PIXELFORMAT == VERTICAL_INTERLEAVED) \
45 || (LCD_REMOTE_PIXELFORMAT == HORIZONTAL_INTERLEAVED) 42 || (LCD_REMOTE_PIXELFORMAT == HORIZONTAL_INTERLEAVED)
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 7ea053f241..37e6bf4d16 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -119,12 +119,13 @@ enum screen_type {
119#define STRIDE(screen, w, h) (screen==SCREEN_MAIN?STRIDE_MAIN((w), \ 119#define STRIDE(screen, w, h) (screen==SCREEN_MAIN?STRIDE_MAIN((w), \
120 (h)):STRIDE_REMOTE((w),(h))) 120 (h)):STRIDE_REMOTE((w),(h)))
121 121
122#define STYLE_DEFAULT 0x00000000 122#define STYLE_NONE 0x00000000
123#define STYLE_COLORED 0x10000000 123#define STYLE_DEFAULT 0x01000000
124#define STYLE_INVERT 0x20000000 124#define STYLE_COLORED 0x02000000
125#define STYLE_COLORBAR 0x40000000 125#define STYLE_INVERT 0x04000000
126#define STYLE_GRADIENT 0x80000000 126#define STYLE_COLORBAR 0x08000000
127#define STYLE_MODE_MASK 0xF0000000 127#define STYLE_GRADIENT 0x10000000
128#define STYLE_MODE_MASK 0xFF000000
128/* HACK: This isnt really a style, We need to be able to tell some of 129/* HACK: This isnt really a style, We need to be able to tell some of
129 * the lcd API that we want to draw text to a specific pixel instead 130 * the lcd API that we want to draw text to a specific pixel instead
130 * of a char. Remove this hack when the whole LCD api goes to fully 131 * of a char. Remove this hack when the whole LCD api goes to fully