path: root/firmware/export
diff options
authorThomas Martitz <>2013-04-16 23:47:17 +0200
committerThomas Martitz <>2014-01-07 14:13:48 +0100
commit36e469db8bb7789c89ff642b51c1471669b830f5 (patch)
tree14e40cf0b2258dfe34a2fbf5a436db5de2abcdd1 /firmware/export
parentad0985ea1c4841498084dc3bc2158492f207e6fb (diff)
lcd-common: Remove direct style (line decorations) from lcd-puts* functions.
This logic is moved into apps (put_line()) which can better handle line decorations with respect to scrolling, mulitline and other complications. Firmware doesn't need this. The remaining drawing function know only one style, that is foreground on background/backdrop (changing drawmode is still supported). Change-Id: I707060edc388a7d723a7d09b0cf5cbda6ec56708
Diffstat (limited to 'firmware/export')
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;
#define STRIDE(screen, w, h) (screen==SCREEN_MAIN?STRIDE_MAIN((w), \
-#define STYLE_NONE 0x00000000
-#define STYLE_DEFAULT 0x01000000
-#define STYLE_COLORED 0x02000000
-#define STYLE_INVERT 0x04000000
-#define STYLE_COLORBAR 0x08000000
-#define STYLE_GRADIENT 0x10000000
-#define STYLE_MODE_MASK 0xFF000000
-/* HACK: This isnt really a style, We need to be able to tell some of
- * the lcd API that we want to draw text to a specific pixel instead
- * of a char. Remove this hack when the whole LCD api goes to fully
- * pixel based positioning - jdgordon */
-#define STYLE_XY_PIXELS 0x00010000
-#define STYLE_COLOR_MASK 0x0000FFFF
-#define STYLE_CURLN_MASK 0x0000FF00
-#define STYLE_MAXLN_MASK 0x000000FF
-#define CURLN_PACK(x) (((x)<<8) & STYLE_CURLN_MASK)
-#define CURLN_UNPACK(x) ((unsigned char)(((x)&STYLE_CURLN_MASK) >> 8))
-#define NUMLN_PACK(x) ((x) & STYLE_MAXLN_MASK)
-#define NUMLN_UNPACK(x) ((unsigned char)((x) & STYLE_MAXLN_MASK))
#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
int width, height;
/* pixel to skip from the beginning of the string, increments as the text scrolls */
int offset;
- int style; /* line style */
-#endif /* HAVE_LCD_BITMAP */
/* scroll presently forward or backward? */
bool backward;
bool bidir;