Diff: SPI_TFT_ILI9341.h

Revision:

10:a02d649ea00e

Parent:

9:b8bc8296da24

--- a/SPI_TFT_ILI9341.h	Tue May 06 18:09:00 2014 +0000
+++ b/SPI_TFT_ILI9341.h	Thu Jan 10 01:14:10 2019 +0000
@@ -26,10 +26,10 @@
 /* some RGB color definitions                                                 */
 #define Black           0x0000      /*   0,   0,   0 */
 #define Navy            0x000F      /*   0,   0, 128 */
-#define DarkGreen       0x03E0      /*   0, 128,   0 */
 #define DarkCyan        0x03EF      /*   0, 128, 128 */
 #define Maroon          0x7800      /* 128,   0,   0 */
 #define Purple          0x780F      /* 128,   0, 128 */
+#define Pink            0xF59E      /* 238, 136, 238 */
 #define Olive           0x7BE0      /* 128, 128,   0 */
 #define LightGrey       0xC618      /* 192, 192, 192 */
 #define DarkGrey        0x7BEF      /* 128, 128, 128 */
@@ -40,8 +40,15 @@
 #define Magenta         0xF81F      /* 255,   0, 255 */
 #define Yellow          0xFFE0      /* 255, 255,   0 */
 #define White           0xFFFF      /* 255, 255, 255 */
-#define Orange          0xFD20      /* 255, 165,   0 */
 #define GreenYellow     0xAFE5      /* 173, 255,  47 */
+#define Orange          0xFC00
+#define Brown           0x8208
+#define BlueGreen       0x4410
+#define White           0xFFFF
+#define LightPink       0xFC18
+#define DarkOrange      0xE3C0
+#define DarkGreen       0x0400
+#define Mustard         0x8400
 
 
 /** Display control class, based on GraphicsDisplay and TextDisplay
@@ -215,9 +222,9 @@
    * cast the pointer to (unsigned char *) :
    * tft.Bitmap(10,40,309,50,(unsigned char *)scala);
    */    
-  void Bitmap(unsigned int x, unsigned int y, unsigned int w, unsigned int h,unsigned char *bitmap);
+  void Bitmap(unsigned int x, unsigned int y, unsigned int w, unsigned int h,unsigned const char *bitmap);
     
-#if DEVICE_LOCALFILESYSTEM
+//#if DEVICE_LOCALFILESYSTEM
    /** Paint a 16 bit BMP from local filesytem on the TFT (slow) 
    *
    * @param x,y : upper left corner 
@@ -235,7 +242,7 @@
    */      
     
   int BMP_16(unsigned int x, unsigned int y, const char *Name_BMP);  
-#endif
+//#endif
     
     
   /** Select the font to use