Prep for v1.2.0

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

diff --git a/drivers/displays/tft/colors.c b/drivers/displays/tft/colors.c
index 7451264..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% fading
+    // Calculate the intermediate color with 25% bg blending

     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);


@@ -248,7 +249,7 @@ uint16_t colorsAlphaBlend(uint16_t bgColor, uint16_t foreColor, uint8_t fadePerc
 
   // Short cut if the color is full intensity
   if (fadePercent == 100)
 
   // Short cut if the color is full intensity
   if (fadePercent == 100)

-    return foreColor;
+    return bgColor;

 
   // Note: This algorithm can definately be optimised!
 
 
   // Note: This algorithm can definately be optimised!