projects
/
hackover2013-badge-firmware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Vogel.
[hackover2013-badge-firmware.git]
/
drivers
/
displays
/
tft
/
colors.c
diff --git
a/drivers/displays/tft/colors.c
b/drivers/displays/tft/colors.c
index
e74f74a
..
5788948
100644
(file)
--- a/
drivers/displays/tft/colors.c
+++ b/
drivers/displays/tft/colors.c
@@
-156,6
+156,7
@@
uint16_t colorsBGR2RGB(uint16_t color)
@code
@code
+ #include "drivers/displays/tft/drawing.h"
#include "drivers/displays/tft/colors.h"
uint16_t newColor;
#include "drivers/displays/tft/colors.h"
uint16_t newColor;
@@
-225,7
+226,7
@@
uint16_t colorsDim(uint16_t color, uint8_t intensity)
uint16_t bg = COLOR_GREEN;
uint16_t fore = COLOR_WHITE;
uint16_t bg = COLOR_GREEN;
uint16_t fore = COLOR_WHITE;
- // Calculate the intermediate color with 25%
fa
ding
+ // Calculate the intermediate color with 25%
bg blen
ding
uint16_t result = colorsAlphaBlend(bg, fore, 25);
drawRectangleFilled(10, 10, 50, 50, bg);
uint16_t result = colorsAlphaBlend(bg, fore, 25);
drawRectangleFilled(10, 10, 50, 50, bg);
This page took
0.026755 seconds
and
4
git commands to generate.