From 26801b3bd8f11fe680146086aa0a2fd12e7de289 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Fri, 12 Apr 2013 07:27:08 +0200 Subject: scroll_engine: Add STYLE_NONE to allow for drawing lines without styling. This allows to draw lines without destroying styles that were drawn manually (e.g. from apps/) beforehand. Change-Id: I0de290c9343061efb115e1b76da5b76395c2b2af --- firmware/export/lcd-remote.h | 3 --- firmware/export/lcd.h | 13 +++++++------ 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'firmware/export') 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 @@ int remote_type(void); #endif -#define STYLE_DEFAULT 0x00000000 -#define STYLE_INVERT 0x20000000 - #if LCD_REMOTE_DEPTH <= 8 #if (LCD_REMOTE_PIXELFORMAT == VERTICAL_INTERLEAVED) \ || (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 { #define STRIDE(screen, w, h) (screen==SCREEN_MAIN?STRIDE_MAIN((w), \ (h)):STRIDE_REMOTE((w),(h))) -#define STYLE_DEFAULT 0x00000000 -#define STYLE_COLORED 0x10000000 -#define STYLE_INVERT 0x20000000 -#define STYLE_COLORBAR 0x40000000 -#define STYLE_GRADIENT 0x80000000 -#define STYLE_MODE_MASK 0xF0000000 +#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 -- cgit v1.2.3