Upgrade to v0.92

[hackover2013-badge-firmware.git] / drivers / lcd / tft / drawing.c

diff --git a/drivers/lcd/tft/drawing.c b/drivers/lcd/tft/drawing.c
index cd612e6..ed113a6 100644 (file)
--- a/drivers/lcd/tft/drawing.c
+++ b/drivers/lcd/tft/drawing.c
@@ -970,7 +970,7 @@ uint16_t drawBGR2RGB(uint16_t color)
   r = (color>>11) & 0x1f;   
      
   return( (b<<11) + (g<<5) + (r<<0) );
   r = (color>>11) & 0x1f;   
      
   return( (b<<11) + (g<<5) + (r<<0) );

-}  
+}

 
 /**************************************************************************/
 /*!
 
 /**************************************************************************/
 /*!


@@ -1073,16 +1073,6 @@ void drawProgressBar ( uint16_t x, uint16_t y, uint16_t width, uint16_t height,
 /**************************************************************************/
 void drawButton(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const FONT_INFO *fontInfo, uint16_t fontHeight, uint16_t borderclr, uint16_t fillclr, uint16_t fontclr, char* text)
 {
 /**************************************************************************/
 void drawButton(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const FONT_INFO *fontInfo, uint16_t fontHeight, uint16_t borderclr, uint16_t fillclr, uint16_t fontclr, char* text)
 {

-  uint16_t border, fill, font, activeborder, activefill, activefont;
-
-  // Set colors
-  border            = COLOR_GRAY_30;
-  fill              = COLOR_GRAY_30;
-  font              = COLOR_WHITE;
-  activeborder      = COLOR_THEME_DEFAULT_DARKER;
-  activefill        = COLOR_THEME_DEFAULT_BASE;
-  activefont        = COLOR_BLACK;
-

   // Border
   drawRectangleRounded(x, y, x + width, y + height, borderclr, 5, DRAW_ROUNDEDCORNERS_ALL);
   // Fill
   // Border
   drawRectangleRounded(x, y, x + width, y + height, borderclr, 5, DRAW_ROUNDEDCORNERS_ALL);
   // Fill


@@ -1131,7 +1121,6 @@ void drawButton(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const F
 void drawIcon16(uint16_t x, uint16_t y, uint16_t color, uint16_t icon[])
 {
   int i;
 void drawIcon16(uint16_t x, uint16_t y, uint16_t color, uint16_t icon[])
 {
   int i;

-  uint16_t row;

   for (i = 0; i<16; i++)
   {
     if (icon[i] & (0X8000)) drawPixel(x, y+i, color);
   for (i = 0; i<16; i++)
   {
     if (icon[i] & (0X8000)) drawPixel(x, y+i, color);