Diff: SPI_TFTx2_ILI9341.cpp

Revision:

10:aca12a61d2b1

Parent:

9:522e742e62eb

--- a/SPI_TFTx2_ILI9341.cpp	Mon May 12 03:18:44 2014 +0000
+++ b/SPI_TFTx2_ILI9341.cpp	Sun May 18 12:45:24 2014 +0000
@@ -1,5 +1,7 @@
 /* mbed library for 240*320 pixel display TFT based on ILI9341 LCD Controller
  * Copyright (c) 2013 Peter Drescher - DC2PD
+ * Updated by Yoong HM for maintaining SPI_TFTx2 and SPI_TFTx2_ILI9341 in the
+ * same code directory.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -9,22 +11,23 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
- 
+
 // 12.06.13 fork from SPI_TFTx2 code because controller is different ...
-// 14.07.13 Test with real display and bugfix 
+// 14.07.13 Test with real display and bugfix
 // 18.10.13 Better Circle function from Michael Ammann
 // 22.10.13 Fixes for Kinetis Board - 8 bit spi
 // 26.01.14 Change interface for BMP_16 to also use SD-cards
+// 13.05.14 Change the class name to SPI_TFTx2_ILI9341
 
 #include "SPI_TFTx2_ILI9341.h"
 #include "mbed.h"
 
-#define BPP         16                  // Bits per pixel    
-         
+#define BPP         16                  // Bits per pixel
+
 //extern Serial pc;
 //extern DigitalOut xx;     // debug !!
 
-SPI_TFTx2::SPI_TFTx2(PinName mosi, PinName miso, PinName sclk, PinName cs0, PinName cs1, PinName reset, PinName dc, const char *name)
+SPI_TFTx2_ILI9341::SPI_TFTx2_ILI9341(PinName mosi, PinName miso, PinName sclk, PinName cs0, PinName cs1, PinName reset, PinName dc, const char *name)
     : _spi(mosi, miso, sclk), _cs0(cs0), _cs1(cs1), _reset(reset), _dc(dc), GraphicsDisplay(name)
 {
     clk = sclk;
@@ -34,21 +37,21 @@
     tft_reset();
 }
 
-int SPI_TFTx2::width()
+int SPI_TFTx2_ILI9341::width()
 {
     if (orientation == 0 || orientation == 2) return 240;
     else return 320;
 }
 
 
-int SPI_TFTx2::height()
+int SPI_TFTx2_ILI9341::height()
 {
     if (orientation == 0 || orientation == 2) return 320;
     else return 240;
 }
 
 
-void SPI_TFTx2::set_orientation(unsigned int o)
+void SPI_TFTx2_ILI9341::set_orientation(unsigned int o)
 {
     orientation = o;
     wr_cmd(0x36);                     // MEMORY_ACCESS_CONTROL
@@ -66,19 +69,19 @@
             _spi.write(0xE8);
             break;
     }
-    _cs0 = 1; 
+    _cs0 = 1;
     _cs1 = 1;
     WindowMax();
-} 
+}
 
-void SPI_TFTx2::set_display(unsigned int o)
+void SPI_TFTx2_ILI9341::set_display(unsigned int o)
 {
     seldisp = o;
 }
 
 // write command to tft register
 
-void SPI_TFTx2::wr_cmd(unsigned char cmd)
+void SPI_TFTx2_ILI9341::wr_cmd(unsigned char cmd)
 {
     _dc = 0;
     if (seldisp == 0) {
@@ -97,7 +100,7 @@
 
 
 
-void SPI_TFTx2::wr_dat(unsigned char dat)
+void SPI_TFTx2_ILI9341::wr_dat(unsigned char dat)
 {
     if (seldisp == 0) {
         _cs0 = 0;
@@ -114,9 +117,9 @@
 
 
 
-// the ILI9341 can read 
+// the ILI9341 can read
 
-char SPI_TFTx2::rd_byte(unsigned char cmd)
+char SPI_TFTx2_ILI9341::rd_byte(unsigned char cmd)
 {
     char r;
     _dc = 0;
@@ -135,12 +138,12 @@
     _cs1 = 1;
     r = _spi.write(0xff);
     _cs0 = 1;
-    _cs1 = 1;    
+    _cs1 = 1;
     return(r);
 }
 
 // read 32 bit
-int SPI_TFTx2::rd_32(unsigned char cmd)
+int SPI_TFTx2_ILI9341::rd_32(unsigned char cmd)
 {
     int d;
     char r;
@@ -159,7 +162,7 @@
     d = d << 1;
     _spi.format(9,3);    // we have to add a dummy clock cycle
     _spi.write(d);
-    _spi.format(8,3);   
+    _spi.format(8,3);
     _dc = 1;
     r = _spi.write(0xff);
     d = r;
@@ -169,12 +172,12 @@
     d = (d << 8) | r;
     r = _spi.write(0xff);
     d = (d << 8) | r;
-    _cs0 = 1;    
+    _cs0 = 1;
     _cs1 = 1;
     return(d);
 }
 
-int  SPI_TFTx2::Read_ID(void){
+int  SPI_TFTx2_ILI9341::Read_ID(void){
     int r;
     r = rd_byte(0x0A);
     r = rd_byte(0x0A);
@@ -186,47 +189,47 @@
 
 // Init code based on MI0283QT datasheet
 
-void SPI_TFTx2::tft_reset()
+void SPI_TFTx2_ILI9341::tft_reset()
 {
     _spi.format(8,3);                  // 8 bit spi mode 3
-    _spi.frequency(10000000);          // 10 Mhz SPI clock
+    _spi.frequency(48000000);          // 48 Mhz SPI clock
     _cs0 = 1;                          // cs high
     _cs1 = 1;
-    _dc = 1;                           // dc high 
+    _dc = 1;                           // dc high
     _reset = 0;                        // display reset
 
     wait_us(50);
     _reset = 1;                       // end hardware reset
     wait_ms(5);
-     
-    wr_cmd(0x01);                     // SW reset  
+
+    wr_cmd(0x01);                     // SW reset
     wait_ms(5);
-    wr_cmd(0x28);                     // display off  
+    wr_cmd(0x28);                     // display off
 
     /* Start Initial Sequence ----------------------------------------------------*/
-     wr_cmd(0xCF);                     
+     wr_cmd(0xCF);
      _spi.write(0x00);
      _spi.write(0x83);
      _spi.write(0x30);
      _cs0 = 1;
      _cs1 = 1;
-     
-     wr_cmd(0xED);                     
+
+     wr_cmd(0xED);
      _spi.write(0x64);
      _spi.write(0x03);
      _spi.write(0x12);
      _spi.write(0x81);
      _cs0 = 1;
      _cs1 = 1;
-     
-     wr_cmd(0xE8);                     
+
+     wr_cmd(0xE8);
      _spi.write(0x85);
      _spi.write(0x01);
      _spi.write(0x79);
      _cs0 = 1;
      _cs1 = 1;
-     
-     wr_cmd(0xCB);                     
+
+     wr_cmd(0xCB);
      _spi.write(0x39);
      _spi.write(0x2C);
      _spi.write(0x00);
@@ -234,116 +237,116 @@
      _spi.write(0x02);
      _cs0 = 1;
      _cs1 = 1;
-           
-     wr_cmd(0xF7);                     
+
+     wr_cmd(0xF7);
      _spi.write(0x20);
      _cs0 = 1;
      _cs1 = 1;
-           
-     wr_cmd(0xEA);                     
+
+     wr_cmd(0xEA);
      _spi.write(0x00);
      _spi.write(0x00);
      _cs0 = 1;
      _cs1 = 1;
-     
+
      wr_cmd(0xC0);                     // POWER_CONTROL_1
      _spi.write(0x26);
      _cs0 = 1;
      _cs1 = 1;
- 
+
      wr_cmd(0xC1);                     // POWER_CONTROL_2
      _spi.write(0x11);
      _cs0 = 1;
      _cs1 = 1;
-     
+
      wr_cmd(0xC5);                     // VCOM_CONTROL_1
      _spi.write(0x35);
      _spi.write(0x3E);
      _cs0 = 1;
      _cs1 = 1;
-     
+
      wr_cmd(0xC7);                     // VCOM_CONTROL_2
      _spi.write(0xBE);
      _cs0 = 1;
      _cs1 = 1;
-     
+
      wr_cmd(0x36);                     // MEMORY_ACCESS_CONTROL
      _spi.write(0x48);
      _cs0 = 1;
      _cs1 = 1;
-     
+
      wr_cmd(0x3A);                     // COLMOD_PIXEL_FORMAT_SET
-     _spi.write(0x55);                 // 16 bit pixel 
+     _spi.write(0x55);                 // 16 bit pixel
      _cs0 = 1;
      _cs1 = 1;
-     
+
      wr_cmd(0xB1);                     // Frame Rate
      _spi.write(0x00);
-     _spi.write(0x1B);               
+     _spi.write(0x1B);
      _cs0 = 1;
      _cs1 = 1;
-    
+
      wr_cmd(0xF2);                     // Gamma Function Disable
      _spi.write(0x08);
      _cs0 = 1;
      _cs1 = 1;
-     
-     wr_cmd(0x26);                     
+
+     wr_cmd(0x26);
      _spi.write(0x01);                 // gamma set for curve 01/2/04/08
      _cs0 = 1;
      _cs1 = 1;
-     
+
      wr_cmd(0xE0);                     // positive gamma correction
-     _spi.write(0x1F); 
-     _spi.write(0x1A); 
-     _spi.write(0x18); 
-     _spi.write(0x0A); 
-     _spi.write(0x0F); 
-     _spi.write(0x06); 
-     _spi.write(0x45); 
-     _spi.write(0x87); 
-     _spi.write(0x32); 
-     _spi.write(0x0A); 
-     _spi.write(0x07); 
-     _spi.write(0x02); 
+     _spi.write(0x1F);
+     _spi.write(0x1A);
+     _spi.write(0x18);
+     _spi.write(0x0A);
+     _spi.write(0x0F);
+     _spi.write(0x06);
+     _spi.write(0x45);
+     _spi.write(0x87);
+     _spi.write(0x32);
+     _spi.write(0x0A);
      _spi.write(0x07);
-     _spi.write(0x05); 
+     _spi.write(0x02);
+     _spi.write(0x07);
+     _spi.write(0x05);
      _spi.write(0x00);
      _cs0 = 1;
      _cs1 = 1;
-     
+
      wr_cmd(0xE1);                     // negativ gamma correction
-     _spi.write(0x00); 
-     _spi.write(0x25); 
-     _spi.write(0x27); 
-     _spi.write(0x05); 
-     _spi.write(0x10); 
-     _spi.write(0x09); 
-     _spi.write(0x3A); 
-     _spi.write(0x78); 
-     _spi.write(0x4D); 
-     _spi.write(0x05); 
-     _spi.write(0x18); 
-     _spi.write(0x0D); 
+     _spi.write(0x00);
+     _spi.write(0x25);
+     _spi.write(0x27);
+     _spi.write(0x05);
+     _spi.write(0x10);
+     _spi.write(0x09);
+     _spi.write(0x3A);
+     _spi.write(0x78);
+     _spi.write(0x4D);
+     _spi.write(0x05);
+     _spi.write(0x18);
+     _spi.write(0x0D);
      _spi.write(0x38);
-     _spi.write(0x3A); 
+     _spi.write(0x3A);
      _spi.write(0x1F);
      _cs0 = 1;
      _cs1 = 1;
-     
+
      WindowMax ();
-     
+
      //wr_cmd(0x34);                     // tearing effect off
      //_cs = 1;
-     
+
      //wr_cmd(0x35);                     // tearing effect on
      //_cs = 1;
-      
+
      wr_cmd(0xB7);                       // entry mode
      _spi.write(0x07);
      _cs0 = 1;
      _cs1 = 1;
-     
+
      wr_cmd(0xB6);                       // display function control
      _spi.write(0x0A);
      _spi.write(0x82);
@@ -351,23 +354,23 @@
      _spi.write(0x00);
      _cs0 = 1;
      _cs1 = 1;
-     
+
      wr_cmd(0x11);                     // sleep out
      _cs0 = 1;
      _cs1 = 1;
-     
+
      wait_ms(100);
-     
+
      wr_cmd(0x29);                     // display on
      _cs0 = 1;
      _cs1 = 1;
-     
+
      wait_ms(100);
-     
+
  }
 
 
-void SPI_TFTx2::pixel(int x, int y, int color)
+void SPI_TFTx2_ILI9341::pixel(int x, int y, int color)
 {
     wr_cmd(0x2A);
     _spi.write(x >> 8);
@@ -383,7 +386,7 @@
     #if defined TARGET_KL25Z  // 8 Bit SPI
     _spi.write(color >> 8);
     _spi.write(color & 0xff);
-    #else 
+    #else
     _spi.format(16,3);                            // switch to 16 bit Mode 3
     _spi.write(color);                              // Write D0..D15
     _spi.format(8,3);
@@ -393,14 +396,14 @@
 }
 
 
-void SPI_TFTx2::window (unsigned int x, unsigned int y, unsigned int w, unsigned int h)
+void SPI_TFTx2_ILI9341::window (unsigned int x, unsigned int y, unsigned int w, unsigned int h)
 {
     wr_cmd(0x2A);
     _spi.write(x >> 8);
     _spi.write(x);
     _spi.write((x+w-1) >> 8);
     _spi.write(x+w-1);
-    
+
      _cs0 = 1;
      _cs1 = 1;
     wr_cmd(0x2B);
@@ -413,14 +416,14 @@
 }
 
 
-void SPI_TFTx2::WindowMax (void)
+void SPI_TFTx2_ILI9341::WindowMax (void)
 {
     window (0, 0, width(),  height());
 }
 
 
 
-void SPI_TFTx2::cls (void)
+void SPI_TFTx2_ILI9341::cls (void)
 {
     int pixel = ( width() * height());
     WindowMax();
@@ -431,20 +434,20 @@
         _spi.write(_background >> 8);
         _spi.write(_background & 0xff);
         }
-    
-    #else 
+
+    #else
     _spi.format(16,3);                            // switch to 16 bit Mode 3
     unsigned int i;
     for (i = 0; i < ( width() * height()); i++)
         _spi.write(_background);
-    _spi.format(8,3);    
-    #endif                         
+    _spi.format(8,3);
+    #endif
      _cs0 = 1;
      _cs1 = 1;
 }
 
 
-void SPI_TFTx2::circle(int x0, int y0, int r, int color)
+void SPI_TFTx2_ILI9341::circle(int x0, int y0, int r, int color)
 {
 
     int x = -r, y = 0, err = 2-2*r, e2;
@@ -463,7 +466,7 @@
 
 }
 
-void SPI_TFTx2::fillcircle(int x0, int y0, int r, int color)
+void SPI_TFTx2_ILI9341::fillcircle(int x0, int y0, int r, int color)
 {
     int x = -r, y = 0, err = 2-2*r, e2;
     do {
@@ -479,7 +482,7 @@
 }
 
 
-void SPI_TFTx2::hline(int x0, int x1, int y, int color)
+void SPI_TFTx2_ILI9341::hline(int x0, int x1, int y, int color)
 {
     int w;
     w = x1 - x0 + 1;
@@ -490,8 +493,8 @@
     for (j=0; j<w; j++) {
         _spi.write(color >> 8);
         _spi.write(color & 0xff);
-    } 
-    #else 
+    }
+    #else
     _spi.format(16,3);                            // switch to 16 bit Mode 3
     int j;
     for (j=0; j<w; j++) {
@@ -505,7 +508,7 @@
     return;
 }
 
-void SPI_TFTx2::vline(int x, int y0, int y1, int color)
+void SPI_TFTx2_ILI9341::vline(int x, int y0, int y1, int color)
 {
     int h;
     h = y1 - y0 + 1;
@@ -515,8 +518,8 @@
     for (int y=0; y<h; y++) {
         _spi.write(color >> 8);
         _spi.write(color & 0xff);
-    } 
-    #else 
+    }
+    #else
     _spi.format(16,3);                            // switch to 16 bit Mode 3
     for (int y=0; y<h; y++) {
         _spi.write(color);
@@ -531,7 +534,7 @@
 
 
 
-void SPI_TFTx2::line(int x0, int y0, int x1, int y1, int color)
+void SPI_TFTx2_ILI9341::line(int x0, int y0, int x1, int y1, int color)
 {
     //WindowMax();
     int   dx = 0, dy = 0;
@@ -603,7 +606,7 @@
 }
 
 
-void SPI_TFTx2::rect(int x0, int y0, int x1, int y1, int color)
+void SPI_TFTx2_ILI9341::rect(int x0, int y0, int x1, int y1, int color)
 {
 
     if (x1 > x0) hline(x0,x1,y0,color);
@@ -623,14 +626,14 @@
 
 
 
-void SPI_TFTx2::fillrect(int x0, int y0, int x1, int y1, int color)
+void SPI_TFTx2_ILI9341::fillrect(int x0, int y0, int x1, int y1, int color)
 {
 
     int h = y1 - y0 + 1;
     int w = x1 - x0 + 1;
     int pixel = h * w;
     window(x0,y0,w,h);
-    wr_cmd(0x2C);  // send pixel 
+    wr_cmd(0x2C);  // send pixel
     #if defined TARGET_KL25Z  // 8 Bit SPI
     for (int p=0; p<pixel; p++) {
         _spi.write(color >> 8);
@@ -650,7 +653,7 @@
 }
 
 
-void SPI_TFTx2::locate(int x, int y)
+void SPI_TFTx2_ILI9341::locate(int x, int y)
 {
     char_x = x;
     char_y = y;
@@ -658,21 +661,21 @@
 
 
 
-int SPI_TFTx2::columns()
+int SPI_TFTx2_ILI9341::columns()
 {
     return width() / font[1];
 }
 
 
 
-int SPI_TFTx2::rows()
+int SPI_TFTx2_ILI9341::rows()
 {
     return height() / font[2];
 }
 
 
 
-int SPI_TFTx2::_putc(int value)
+int SPI_TFTx2_ILI9341::_putc(int value)
 {
     if (value == '\n') {    // new line
         char_x = 0;
@@ -687,7 +690,7 @@
 }
 
 
-void SPI_TFTx2::character(int x, int y, int c)
+void SPI_TFTx2_ILI9341::character(int x, int y, int c)
 {
     unsigned int hor,vert,offset,bpl,j,i,b;
     unsigned char* zeichen;
@@ -710,8 +713,8 @@
     }
     window(char_x, char_y,hor,vert); // char box
     wr_cmd(0x2C);  // send pixel
-    #ifndef TARGET_KL25Z  // 16 Bit SPI 
-    _spi.format(16,3);   
+    #ifndef TARGET_KL25Z  // 16 Bit SPI
+    _spi.format(16,3);
     #endif                         // switch to 16 bit Mode 3
     zeichen = &font[((c -32) * offset) + 4]; // start of char bitmap
     w = zeichen[0];                          // width of actual char
@@ -720,7 +723,7 @@
             z =  zeichen[bpl * i + ((j & 0xF8) >> 3)+1];
             b = 1 << (j & 0x07);
             if (( z & b ) == 0x00) {
-               #ifndef TARGET_KL25Z  // 16 Bit SPI 
+               #ifndef TARGET_KL25Z  // 16 Bit SPI
                 _spi.write(_background);
                #else
                 _spi.write(_background >> 8);
@@ -748,14 +751,14 @@
 }
 
 
-void SPI_TFTx2::set_font(unsigned char* f)
+void SPI_TFTx2_ILI9341::set_font(unsigned char* f)
 {
     font = f;
 }
 
 
 
-void SPI_TFTx2::Bitmap(unsigned int x, unsigned int y, unsigned int w, unsigned int h,unsigned char *bitmap)
+void SPI_TFTx2_ILI9341::Bitmap(unsigned int x, unsigned int y, unsigned int w, unsigned int h,unsigned char *bitmap)
 {
     unsigned int  j;
     int padd;
@@ -763,9 +766,9 @@
     #if defined TARGET_KL25Z  // 8 Bit SPI
         unsigned short pix_temp;
     #endif
-    
+
     unsigned int i;
-    
+
     // the lines are padded to multiple of 4 bytes in a bitmap
     padd = -1;
     do {
@@ -774,7 +777,7 @@
     window(x, y, w, h);
     bitmap_ptr += ((h - 1)* (w + padd));
     wr_cmd(0x2C);  // send pixel
-    #ifndef TARGET_KL25Z  // 16 Bit SPI 
+    #ifndef TARGET_KL25Z  // 16 Bit SPI
     _spi.format(16,3);
     #endif                            // switch to 16 bit Mode 3
     for (j = 0; j < h; j++) {         //Lines
@@ -794,7 +797,7 @@
     }
      _cs0 = 1;
      _cs1 = 1;
-    #ifndef TARGET_KL25Z  // 16 Bit SPI 
+    #ifndef TARGET_KL25Z  // 16 Bit SPI
     _spi.format(8,3);
     #endif
     WindowMax();
@@ -803,7 +806,7 @@
 
 // local filesystem is not implemented in kinetis board , but you can add a SD card
 
-int SPI_TFTx2::BMP_16(unsigned int x, unsigned int y, const char *Name_BMP)
+int SPI_TFTx2_ILI9341::BMP_16(unsigned int x, unsigned int y, const char *Name_BMP)
 {
 
 #define OffsetPixelWidth    18
@@ -825,8 +828,8 @@
     while (*Name_BMP!='\0') {
         filename[i++]=*Name_BMP++;
     }
-    filename[i] = 0;  
-    
+    filename[i] = 0;
+
     FILE *Image = fopen((const char *)&filename[0], "rb");  // open the bmp file
     if (!Image) {
         return(0);      // error file not found !
@@ -867,21 +870,21 @@
 
     window(x, y,PixelWidth ,PixelHeigh);
     wr_cmd(0x2C);  // send pixel
-    #ifndef TARGET_KL25Z // only 8 Bit SPI 
-    _spi.format(16,3);  
+    #ifndef TARGET_KL25Z // only 8 Bit SPI
+    _spi.format(16,3);
     #endif                          // switch to 16 bit Mode 3
     for (j = PixelHeigh - 1; j >= 0; j--) {               //Lines bottom up
         off = j * (PixelWidth  * 2 + padd) + start_data;   // start of line
         fseek(Image, off ,SEEK_SET);
-        fread(line,1,PixelWidth * 2,Image);       // read a line - slow 
+        fread(line,1,PixelWidth * 2,Image);       // read a line - slow
         for (i = 0; i < PixelWidth; i++) {        // copy pixel data to TFT
         #ifndef TARGET_KL25Z // only 8 Bit SPI
             _spi.write(line[i]);                  // one 16 bit pixel
-        #else  
+        #else
             _spi.write(line[i] >> 8);
             _spi.write(line[i]);
-        #endif    
-        } 
+        #endif
+        }
      }
      _cs0 = 1;
      _cs1 = 1;