Merge branch 'master' of gitlab:wintermute/hackover2013-badge-firmware

[hackover2013-badge-firmware.git] / drivers / displays / tft / colors.h

diff --git a/drivers/displays/tft/colors.h b/drivers/displays/tft/colors.h
index 22f996a..83cbf98 100644 (file)
--- a/drivers/displays/tft/colors.h
+++ b/drivers/displays/tft/colors.h
@@ -59,42 +59,10 @@
 #define COLOR_GRAY_200                      (uint16_t)(0xCE59)    // 200 200 200
 #define COLOR_GRAY_225                      (uint16_t)(0xE71C)    // 225 225 225
 
-// Color Palettes
-#define COLOR_THEME_LIMEGREEN_BASE          (uint16_t)(0xD7F0)    // 211 255 130
-#define COLOR_THEME_LIMEGREEN_DARKER        (uint16_t)(0x8DE8)    // 137 188  69
-#define COLOR_THEME_LIMEGREEN_LIGHTER       (uint16_t)(0xEFF9)    // 238 255 207
-#define COLOR_THEME_LIMEGREEN_SHADOW        (uint16_t)(0x73EC)    // 119 127 103
-#define COLOR_THEME_LIMEGREEN_ACCENT        (uint16_t)(0xAE6D)    // 169 204 104
-
-#define COLOR_THEME_VIOLET_BASE             (uint16_t)(0x8AEF)    // 143  94 124
-#define COLOR_THEME_VIOLET_DARKER           (uint16_t)(0x4187)    //  66  49  59
-#define COLOR_THEME_VIOLET_LIGHTER          (uint16_t)(0xC475)    // 194 142 174
-#define COLOR_THEME_VIOLET_SHADOW           (uint16_t)(0x40E6)    //  66  29  52
-#define COLOR_THEME_VIOLET_ACCENT           (uint16_t)(0xC992)    // 204  50 144
-
-#define COLOR_THEME_EARTHY_BASE             (uint16_t)(0x6269)    //  97  79  73
-#define COLOR_THEME_EARTHY_DARKER           (uint16_t)(0x3103)    //  48  35  31
-#define COLOR_THEME_EARTHY_LIGHTER          (uint16_t)(0x8C30)    // 140 135 129
-#define COLOR_THEME_EARTHY_SHADOW           (uint16_t)(0xAB29)    // 173 102  79
-#define COLOR_THEME_EARTHY_ACCENT           (uint16_t)(0xFE77)    // 250 204 188
-
-#define COLOR_THEME_SKYBLUE_BASE            (uint16_t)(0x95BF)    // 150 180 255
-#define COLOR_THEME_SKYBLUE_DARKER          (uint16_t)(0x73B0)    // 113 118 131
-#define COLOR_THEME_SKYBLUE_LIGHTER         (uint16_t)(0xE75F)    // 227 235 255
-#define COLOR_THEME_SKYBLUE_SHADOW          (uint16_t)(0x4ACF)    //  75  90 127
-#define COLOR_THEME_SKYBLUE_ACCENT          (uint16_t)(0xB5F9)    // 182 188 204
-
-// Using these values allows you to update the entire UI color scheme in one location
-#define COLOR_THEME_DEFAULT_BASE            COLOR_THEME_LIMEGREEN_BASE
-#define COLOR_THEME_DEFAULT_DARKER          COLOR_THEME_LIMEGREEN_DARKER
-#define COLOR_THEME_DEFAULT_LIGHTER         COLOR_THEME_LIMEGREEN_LIGHTER
-#define COLOR_THEME_DEFAULT_SHADOW          COLOR_THEME_LIMEGREEN_SHADOW
-#define COLOR_THEME_DEFAULT_ACCENT          COLOR_THEME_LIMEGREEN_ACCENT
-
 uint16_t colorsRGB24toRGB565  ( uint8_t r, uint8_t g, uint8_t b );
 uint32_t colorsRGB565toBGRA32 ( uint16_t color );
 uint16_t colorsBGR2RGB        ( uint16_t color );
 uint16_t colorsDim            ( uint16_t color, uint8_t intensity );
-uint16_t colorsBlend          ( uint16_t bgColor, uint16_t foreColor, uint8_t intensity );
+uint16_t colorsAlphaBlend     ( uint16_t bgColor, uint16_t foreColor, uint8_t fadePercent );
 
 #endif