Lib for the new LCD Display with ILI9341 controller supporting two displays

Dependents:   CANary_9341_test CANary_9341 CANary

Fork of SPI_TFT_ILI9341 by Peter Drescher

Files at this revision

API Documentation at this revision

Comitter:
TickTock
Date:
Sun May 18 12:45:24 2014 +0000
Parent:
9:522e742e62eb
Commit message:
Works with both controllers using precompiler directive

Changed in this revision

GraphicsDisplay.cpp Show annotated file Show diff for this revision Revisions of this file
GraphicsDisplay.h Show annotated file Show diff for this revision Revisions of this file
SPI_TFTx2.cpp Show annotated file Show diff for this revision Revisions of this file
SPI_TFTx2.h Show annotated file Show diff for this revision Revisions of this file
SPI_TFTx2_ILI9341.cpp Show annotated file Show diff for this revision Revisions of this file
SPI_TFTx2_ILI9341.h Show annotated file Show diff for this revision Revisions of this file
diff -r 522e742e62eb -r aca12a61d2b1 GraphicsDisplay.cpp
--- a/GraphicsDisplay.cpp	Mon May 12 03:18:44 2014 +0000
+++ b/GraphicsDisplay.cpp	Sun May 18 12:45:24 2014 +0000
@@ -113,7 +113,7 @@
     blitbit(column * 8, row * 8, 8, 8, (char*)&(FONT8x8[value - 0x1F][0]));
 }
 
-void GraphicsDisplay::window(unsigned int x,unsigned  int y,unsigned  int w,unsigned  int h) {
+void GraphicsDisplay::gdwindow(int x, int y, int w, int h) {
     // current pixel location
     _x = x;
     _y = y;
@@ -139,7 +139,7 @@
 }
 
 void GraphicsDisplay::fill(int x, int y, int w, int h, int colour) { 
-    window(x, y, w, h);
+    gdwindow(x, y, w, h);
     for(int i=0; i<w*h; i++) {
         putp(colour);
     }
@@ -150,14 +150,14 @@
 }
     
 void GraphicsDisplay::blit(int x, int y, int w, int h, const int *colour) { 
-    window(x, y, w, h);
+    gdwindow(x, y, w, h);
     for(int i=0; i<w*h; i++) {
         putp(colour[i]);
     }
 }
     
 void GraphicsDisplay::blitbit(int x, int y, int w, int h, const char* colour) {
-    window(x, y, w, h);
+    gdwindow(x, y, w, h);
     for(int i = 0; i < w*h; i++) {
         char byte = colour[i >> 3];
         int offset = i & 0x7;
@@ -173,4 +173,3 @@
 int GraphicsDisplay::rows() { 
     return height() / 8; 
 }
-
diff -r 522e742e62eb -r aca12a61d2b1 GraphicsDisplay.h
--- a/GraphicsDisplay.h	Mon May 12 03:18:44 2014 +0000
+++ b/GraphicsDisplay.h	Sun May 18 12:45:24 2014 +0000
@@ -26,7 +26,7 @@
     virtual int width() = 0;
     virtual int height() = 0;
         
-    virtual void window(unsigned int x,unsigned int y,unsigned int w,unsigned int h);
+    virtual void gdwindow(int x, int y, int w, int h);
     virtual void putp(int colour);
     
     virtual void cls();
diff -r 522e742e62eb -r aca12a61d2b1 SPI_TFTx2.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SPI_TFTx2.cpp	Sun May 18 12:45:24 2014 +0000
@@ -0,0 +1,1277 @@
+/* mbed library for 240*320 pixel display TFT based on HX8347D LCD Controller
+ * Copyright (c) 2011 Peter Drescher - DC2PD
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+// fix bmp padding for Bitmap function
+// speed up pixel
+// 30.12.11 fix cls
+// 11.03.12 use DMA to speed up
+// 15.03.12 use SSEL for TFT CS to enable DMA Register writes
+// 06.04.12 fix SSEL CS problem
+// 06.04.12 use direct access to the spi register to speed up the library.
+// 11.09.12 switch back to using io pin as cs to avoid problems with SSEL CS.
+// 21.09.12 fix Bug in BMP_16 
+// 11.10.12 patch from Hans Bergles to get SPI1 working again
+// 03.02.13 add a switch to switch off DMA use for LPC11U24
+
+#include "SPI_TFTx2.h"
+#include "mbed.h"
+
+#define BPP         16                  // Bits per pixel                
+
+#if defined TARGET_LPC1768 
+#define USE_DMA
+#endif
+
+#if defined NO_DMA
+#undef USE_DMA
+#endif
+
+//extern Serial pc;
+//extern DigitalOut xx;     // debug !!
+
+SPI_TFTx2::SPI_TFTx2(PinName mosi, PinName miso, PinName sclk, PinName cs0, PinName cs1, PinName reset, const char *name)
+    : _spi(mosi, miso, sclk), _cs0(cs0), _cs1(cs1), _reset(reset), GraphicsDisplay(name)
+{
+    orientation = 0;
+    char_x = 0;
+    _cs0 = 1;
+    _cs1 = 1;
+
+    if (mosi == p11 || mosi == P0_18) spi_port = 0;  // we must know the used SPI port to setup the DMA
+    else spi_port = 1;
+    seldisp = 2;
+    tft_reset();
+}
+
+int SPI_TFTx2::width()
+{
+    if (orientation == 0 || orientation == 2) return 240;
+    else return 320;
+}
+
+
+int SPI_TFTx2::height()
+{
+    if (orientation == 0 || orientation == 2) return 320;
+    else return 240;
+}
+
+
+void SPI_TFTx2::set_orientation(unsigned int o)
+{
+    orientation = o;
+    switch (orientation) {
+        case 0:
+            wr_reg(0x16, 0x08);
+            break;
+        case 1:
+            wr_reg(0x16, 0x68);
+            break;
+        case 2:
+            wr_reg(0x16, 0xC8);
+            break;
+        case 3:
+            wr_reg(0x16, 0xA8);
+            break;
+    }
+    WindowMax();
+}
+
+void SPI_TFTx2::set_display(unsigned int o)
+{
+    seldisp = o;
+}
+
+// write command to tft register
+
+void SPI_TFTx2::wr_cmd(unsigned char cmd)
+{
+    unsigned short spi_d;
+    spi_d =  0x7000 | cmd ;
+
+    if (seldisp == 0) {
+        _cs0 = 0;
+        _cs1 = 1;
+    } else if (seldisp == 1) {
+        _cs0 = 1;
+        _cs1 = 0;
+    } else {
+        _cs0 = 0;
+        _cs1 = 0;
+    }
+    
+    if (spi_port == 0) {    // TFT on SSP0
+        LPC_SSP0->DR = spi_d;
+        // we have to wait for SPI IDLE to set CS back to high
+        do {
+        } while ((LPC_SSP0->SR & 0x10) == 0x10); // SPI0 not idle
+    } else {
+        LPC_SSP1->DR = spi_d;
+        do {
+        } while ((LPC_SSP1->SR & 0x10) == 0x10); // SPI1 not idle
+    }
+    _cs0 = 1;
+    _cs1 = 1;
+}
+
+
+
+void SPI_TFTx2::wr_dat(unsigned char dat)
+{
+    unsigned short spi_d;
+    spi_d =  0x7200 | dat;
+    if (seldisp == 0) {
+        _cs0 = 0;
+        _cs1 = 1;
+    } else if (seldisp == 1) {
+        _cs0 = 1;
+        _cs1 = 0;
+    } else {
+        _cs0 = 0;
+        _cs1 = 0;
+    }
+
+    if (spi_port == 0) {    // TFT on SSP0
+        LPC_SSP0->DR = spi_d;
+        // we have to wait for SPI IDLE to set CS back to high
+        do {
+        } while ((LPC_SSP0->SR & 0x10) == 0x10); // SPI0 not idle
+    } else {
+        LPC_SSP1->DR = spi_d;
+        do {
+        } while ((LPC_SSP1->SR & 0x10) == 0x10); // SPI1 not idle
+    }
+    _cs0 = 1;
+    _cs1 = 1;
+}
+
+
+
+// the HX8347-D controller do not use the MISO (SDO) Signal.
+// This is a bug - ?
+// A read will return 0 at the moment
+
+unsigned short SPI_TFTx2::rd_dat (void)
+{
+    unsigned short val = 0;
+
+    //val = _spi.write(0x73ff);                /* Dummy read 1           */
+    //val   = _spi.write(0x0000);              /* Read D8..D15           */
+    return (val);
+}
+
+void SPI_TFTx2::wr_reg (unsigned char reg, unsigned char val)
+{
+    wr_cmd(reg);
+    wr_dat(val);
+}
+
+unsigned short SPI_TFTx2::rd_reg (unsigned char reg)
+{
+    wr_cmd(reg);
+    return(rd_dat());
+}
+
+void SPI_TFTx2::tft_reset()
+{
+    //static unsigned short driverCode;
+    _spi.format(16,3);                 // 16 bit spi mode 3
+    _spi.frequency(48000000);          // 48 Mhz SPI clock
+    _cs0 = 1;                          // cs high
+    _cs1 = 1;                          // cs high
+    _reset = 0;                        // display reset
+
+    wait_us(50);
+    _reset = 1;                       // end reset
+    wait_ms(5);
+
+    /* Start Initial Sequence ----------------------------------------------------*/
+    wr_reg(0xEA, 0x00);                 /* Reset Power Control 1                */
+    wr_reg(0xEB, 0x20);                 /* Power Control 2                      */
+    wr_reg(0xEC, 0x0C);                 /* Power Control 3                      */
+    wr_reg(0xED, 0xC4);                 /* Power Control 4                      */
+    wr_reg(0xE8, 0x40);                 /* Source OPON_N                        */
+    wr_reg(0xE9, 0x38);                 /* Source OPON_I                        */
+    wr_reg(0xF1, 0x01);                 /*                                      */
+    wr_reg(0xF2, 0x10);                 /*                                      */
+    wr_reg(0x27, 0xA3);                 /* Display Control 2                    */
+
+    /* Power On sequence ---------------------------------------------------------*/
+    wr_reg(0x1B, 0x1B);                 /* Power Control 2                      */
+    wr_reg(0x1A, 0x01);                 /* Power Control 1                      */
+    wr_reg(0x24, 0x2F);                 /* Vcom Control 2                       */
+    wr_reg(0x25, 0x57);                 /* Vcom Control 3                       */
+    wr_reg(0x23, 0x8D);                 /* Vcom Control 1                       */
+
+    /* Gamma settings  -----------------------------------------------------------*/
+    wr_reg(0x40,0x00);   //
+    wr_reg(0x41,0x00);   //
+    wr_reg(0x42,0x01);   //
+    wr_reg(0x43,0x13);   //
+    wr_reg(0x44,0x10);   //
+    wr_reg(0x45,0x26);   //
+    wr_reg(0x46,0x08);   //
+    wr_reg(0x47,0x51);   //
+    wr_reg(0x48,0x02);   //
+    wr_reg(0x49,0x12);   //
+    wr_reg(0x4A,0x18);   //
+    wr_reg(0x4B,0x19);   //
+    wr_reg(0x4C,0x14);   //
+    wr_reg(0x50,0x19);   //
+    wr_reg(0x51,0x2F);   //
+    wr_reg(0x52,0x2C);   //
+    wr_reg(0x53,0x3E);   //
+    wr_reg(0x54,0x3F);   //
+    wr_reg(0x55,0x3F);   //
+    wr_reg(0x56,0x2E);   //
+    wr_reg(0x57,0x77);   //
+    wr_reg(0x58,0x0B);   //
+    wr_reg(0x59,0x06);   //
+    wr_reg(0x5A,0x07);   //
+    wr_reg(0x5B,0x0D);   //
+    wr_reg(0x5C,0x1D);   //
+    wr_reg(0x5D,0xCC);   //
+
+    /* Power + Osc ---------------------------------------------------------------*/
+    wr_reg(0x18, 0x0036);                 /* OSC Control 1                        */
+    wr_reg(0x19, 0x0001);                 /* OSC Control 2                        */
+    wr_reg(0x01, 0x0000);                 /* Display Mode Control                 */
+    wr_reg(0x1F, 0x0088);                 /* Power Control 6                      */
+    wait_ms(5);                           /* Delay 5 ms                           */
+    wr_reg(0x1F, 0x0080);                 /* Power Control 6                      */
+    wait_ms(5);                           /* Delay 5 ms                           */
+    wr_reg(0x1F, 0x0090);                 /* Power Control 6                      */
+    wait_ms(5);                           /* Delay 5 ms                           */
+    wr_reg(0x1F, 0x00D0);                 /* Power Control 6                      */
+    wait_ms(5);                           /* Delay 5 ms                           */
+
+    wr_reg(0x17, 0x0005);                 /* Colmod 16Bit/Pixel                   */
+
+    wr_reg(0x36, 0x0000);                 /* Panel Characteristic                 */
+    wr_reg(0x28, 0x0038);                 /* Display Control 3                    */
+    wait_ms(40);
+    wr_reg(0x28, 0x003C);                 /* Display Control 3                    */
+    switch (orientation) {
+        case 0:
+            wr_reg(0x16, 0x0008);
+            break;
+        case 1:
+            wr_reg(0x16, 0x0068);
+            break;
+        case 2:
+            wr_reg(0x16, 0x00C8);
+            break;
+        case 3:
+            wr_reg(0x16, 0x00A8);
+            break;
+    }
+#if defined USE_DMA
+    // setup DMA channel 0
+    // Power up the GPDMA.
+    LPC_SC->PCONP |= (1UL << 29);
+    LPC_GPDMA->DMACConfig = 1;          // enable DMA controller
+    // Reset the Interrupt status
+    LPC_GPDMA->DMACIntTCClear = 0x1;
+    LPC_GPDMA->DMACIntErrClr = 0x1;
+    LPC_GPDMACH0->DMACCLLI      = 0;
+#endif
+
+    WindowMax ();
+}
+
+
+void SPI_TFTx2::pixel(int x, int y, int color)
+{
+    unsigned char u,l;
+    wr_reg(0x03, (x >> 0));
+    wr_reg(0x02, (x >> 8));
+    wr_reg(0x07, (y >> 0));
+    wr_reg(0x06, (y >> 8));
+    wr_cmd(0x22);
+    u = color  >> 8;
+    l = color & 0xff;
+    if (seldisp == 0) {
+        _cs0 = 0;
+        _cs1 = 1;
+    } else if (seldisp == 1) {
+        _cs0 = 1;
+        _cs1 = 0;
+    } else {
+        _cs0 = 0;
+        _cs1 = 0;
+    }
+    if (spi_port == 0) {    // TFT on SSP0
+        LPC_SSP0->CR0 &= ~(0x08UL); // set to 8 bit
+        LPC_SSP0->DR = 0x72;        // start Data
+        LPC_SSP0->DR = u;           // high byte
+        LPC_SSP0->DR = l;           // low byte
+        LPC_SSP0->CR0 |= 0x08UL;    // set back to 16 bit
+        // we have to wait for SPI IDLE to set CS back to high
+        do {
+        } while ((LPC_SSP0->SR & 0x10) == 0x10); // SPI0 not idle
+    } else {
+        LPC_SSP1->CR0 &= ~(0x08UL); // set to 8 bit
+        LPC_SSP1->DR = 0x72;        // start Data
+        LPC_SSP1->DR = u;
+        LPC_SSP1->DR = l;
+        LPC_SSP1->CR0 |= 0x08UL;    // set back to 16 bit
+        // we have to wait for SPI IDLE to set CS back to high
+        do {
+        } while ((LPC_SSP1->SR & 0x10) == 0x10); // SPI1 not idle
+    }
+        _cs0 = 1;
+        _cs1 = 1;
+}
+
+
+void SPI_TFTx2::window (unsigned int x, unsigned int y, unsigned int w, unsigned int h)
+{
+    wr_reg(0x03, x );
+    wr_reg(0x02, (x >> 8));
+    wr_reg(0x05, x+w-1 );
+    wr_reg(0x04, (x+w-1 >> 8));
+    wr_reg(0x07,  y );
+    wr_reg(0x06, ( y >> 8));
+    wr_reg(0x09, ( y+h-1 ));
+    wr_reg(0x08, ( y+h-1 >> 8));
+}
+
+
+void SPI_TFTx2::WindowMax (void)
+{
+    window (0, 0, width(),  height());
+}
+
+
+void SPI_TFTx2::cls (void)
+{
+    int pixel = ( width() * height());
+#if defined USE_DMA
+    int dma_count;
+    int color = _background;
+#endif
+    WindowMax();
+    wr_cmd(0x22);
+
+    // The SSEL signal is held low until the spi FIFO is emty.
+    // We have to lower the SPI clock for the 8 bit start to get the spi running
+    // until the next data word
+#if defined USE_DMA
+    LPC_GPDMACH0->DMACCSrcAddr = (uint32_t)&color;
+#endif
+    if (seldisp == 0) {
+        _cs0 = 0;
+        _cs1 = 1;
+    } else if (seldisp == 1) {
+        _cs0 = 1;
+        _cs1 = 0;
+    } else {
+        _cs0 = 0;
+        _cs1 = 0;
+    }
+    if (spi_port == 0) {    // TFT on SSP0
+#if defined USE_DMA
+        LPC_GPDMACH0->DMACCDestAddr = (uint32_t)&LPC_SSP0->DR; // we send to SSP0
+        /* Enable SSP0 for DMA. */
+        LPC_SSP0->DMACR = 0x2;
+#endif
+        LPC_SSP0->CR0 &= ~(0x08UL); // set to 8 bit
+        LPC_SSP0->DR = 0x72;        // start byte
+        LPC_SSP0->CR0 |= 0x08UL;    // set to 16 bit
+    } else {
+#if defined USE_DMA
+        LPC_GPDMACH0->DMACCDestAddr = (uint32_t)&LPC_SSP1->DR; // we send to SSP1
+        /* Enable SSP1 for DMA. */
+        LPC_SSP1->DMACR = 0x2;
+#endif
+        LPC_SSP1->CR0 &= ~(0x08UL); // set to 8 bit
+        LPC_SSP1->DR = 0x72;        // start Data
+        LPC_SSP1->CR0 |= 0x08UL;    // set to 16 bit
+    }
+
+#if defined USE_DMA
+    // start DMA
+    do {
+        if (pixel > 4095) {
+            dma_count = 4095;
+            pixel = pixel - 4095;
+        } else {
+            dma_count = pixel;
+            pixel = 0;
+        }
+        LPC_GPDMA->DMACIntTCClear = 0x1;
+        LPC_GPDMA->DMACIntErrClr = 0x1;
+        LPC_GPDMACH0->DMACCControl = dma_count | (1UL << 18) | (1UL << 21) | (1UL << 31) ; // 16 bit transfer , no address increment, interrupt
+        LPC_GPDMACH0->DMACCConfig  = DMA_CHANNEL_ENABLE | DMA_TRANSFER_TYPE_M2P | (spi_port ? DMA_DEST_SSP1_TX : DMA_DEST_SSP0_TX);
+        LPC_GPDMA->DMACSoftSReq = 0x1;   // DMA request
+
+        do {
+        } while ((LPC_GPDMA->DMACRawIntTCStat & 0x01) == 0); // DMA is running
+
+    } while (pixel > 0);
+    if (spi_port == 0) {    // TFT on SSP0
+        do {
+        } while ((0x0010 & LPC_SSP0->SR) == 0x10); // SPI FIFO not empty
+        /* disable SSP0 for DMA. */
+        LPC_SSP0->DMACR = 0x0;
+    } else {
+        do {
+        } while ((0x0010 & LPC_SSP1->SR) == 0x10); // SPI FIFO not empty
+        /* disable SSP1 for DMA. */
+        LPC_SSP1->DMACR = 0x0;
+    }
+#else  // no DMA
+    unsigned int i;
+    for (i = 0; i < ( width() * height()); i++)
+        _spi.write(_background);
+#endif
+    _cs0 = 1;
+    _cs1 = 1;
+}
+
+void SPI_TFTx2::circle(int x0, int y0, int r, int color)
+{
+
+    int draw_x0, draw_y0;
+    int draw_x1, draw_y1;
+    int draw_x2, draw_y2;
+    int draw_x3, draw_y3;
+    int draw_x4, draw_y4;
+    int draw_x5, draw_y5;
+    int draw_x6, draw_y6;
+    int draw_x7, draw_y7;
+    int xx, yy;
+    int di;
+    //WindowMax();
+    if (r == 0) {       /* no radius */
+        return;
+    }
+
+    draw_x0 = draw_x1 = x0;
+    draw_y0 = draw_y1 = y0 + r;
+    if (draw_y0 < height()) {
+        pixel(draw_x0, draw_y0, color);     /* 90 degree */
+    }
+
+    draw_x2 = draw_x3 = x0;
+    draw_y2 = draw_y3 = y0 - r;
+    if (draw_y2 >= 0) {
+        pixel(draw_x2, draw_y2, color);    /* 270 degree */
+    }
+
+    draw_x4 = draw_x6 = x0 + r;
+    draw_y4 = draw_y6 = y0;
+    if (draw_x4 < width()) {
+        pixel(draw_x4, draw_y4, color);     /* 0 degree */
+    }
+
+    draw_x5 = draw_x7 = x0 - r;
+    draw_y5 = draw_y7 = y0;
+    if (draw_x5>=0) {
+        pixel(draw_x5, draw_y5, color);     /* 180 degree */
+    }
+
+    if (r == 1) {
+        return;
+    }
+
+    di = 3 - 2*r;
+    xx = 0;
+    yy = r;
+    while (xx < yy) {
+
+        if (di < 0) {
+            di += 4*xx + 6;
+        } else {
+            di += 4*(xx - yy) + 10;
+            yy--;
+            draw_y0--;
+            draw_y1--;
+            draw_y2++;
+            draw_y3++;
+            draw_x4--;
+            draw_x5++;
+            draw_x6--;
+            draw_x7++;
+        }
+        xx++;
+        draw_x0++;
+        draw_x1--;
+        draw_x2++;
+        draw_x3--;
+        draw_y4++;
+        draw_y5++;
+        draw_y6--;
+        draw_y7--;
+
+        if ( (draw_x0 <= width()) && (draw_y0>=0) ) {
+            pixel(draw_x0, draw_y0, color);
+        }
+
+        if ( (draw_x1 >= 0) && (draw_y1 >= 0) ) {
+            pixel(draw_x1, draw_y1, color);
+        }
+
+        if ( (draw_x2 <= width()) && (draw_y2 <= height()) ) {
+            pixel(draw_x2, draw_y2, color);
+        }
+
+        if ( (draw_x3 >=0 ) && (draw_y3 <= height()) ) {
+            pixel(draw_x3, draw_y3, color);
+        }
+
+        if ( (draw_x4 <= width()) && (draw_y4 >= 0) ) {
+            pixel(draw_x4, draw_y4, color);
+        }
+
+        if ( (draw_x5 >= 0) && (draw_y5 >= 0) ) {
+            pixel(draw_x5, draw_y5, color);
+        }
+        if ( (draw_x6 <=width()) && (draw_y6 <= height()) ) {
+            pixel(draw_x6, draw_y6, color);
+        }
+        if ( (draw_x7 >= 0) && (draw_y7 <= height()) ) {
+            pixel(draw_x7, draw_y7, color);
+        }
+    }
+    return;
+}
+
+void SPI_TFTx2::fillcircle(int x, int y, int r, int color)
+{
+    int i;
+    for (i = 0; i <= r; i++)
+        circle(x,y,i,color);
+}
+
+
+
+void SPI_TFTx2::hline(int x0, int x1, int y, int color)
+{
+    int w,i;
+    w = x1 - x0 + 1;
+    window(x0,y,w,1);
+    wr_cmd(0x22);
+    if (seldisp == 0) {
+        _cs0 = 0;
+        _cs1 = 1;
+    } else if (seldisp == 1) {
+        _cs0 = 1;
+        _cs1 = 0;
+    } else {
+        _cs0 = 0;
+        _cs1 = 0;
+    }
+    if (spi_port == 0) {    // TFT on SSP0
+        for (i = 0; i < ( width() * height()); i++)
+#if defined USE_DMA
+        LPC_GPDMACH0->DMACCDestAddr = (uint32_t)&LPC_SSP0->DR; // we send to SSP0
+        /* Enable SSP0 for DMA. */
+        LPC_SSP0->DMACR = 0x2;
+#endif
+        LPC_SSP0->CR0 &= ~(0x08UL); // set to 8 bit
+        LPC_SSP0->DR = 0x72;        // start Data
+        LPC_SSP0->CR0 |= 0x08UL;    // set to 16 bit
+    } else {
+#if defined USE_DMA
+        LPC_GPDMACH0->DMACCDestAddr = (uint32_t)&LPC_SSP1->DR; // we send to SSP1
+        /* Enable SSP1 for DMA. */
+        LPC_SSP1->DMACR = 0x2;
+#endif
+        LPC_SSP1->CR0 &= ~(0x08UL); // set to 8 bit
+        LPC_SSP1->DR = 0x72;        // start Data
+        LPC_SSP1->CR0 |= 0x08UL;    // set to 16 bit
+    }
+#if defined USE_DMA
+    LPC_GPDMA->DMACIntTCClear = 0x1;
+    LPC_GPDMA->DMACIntErrClr = 0x1;
+    LPC_GPDMACH0->DMACCSrcAddr = (uint32_t)&color;
+    LPC_GPDMACH0->DMACCControl = w | (1UL << 18) | (1UL << 21) | (1UL << 31) ; // 16 bit transfer , no address increment, interrupt
+    LPC_GPDMACH0->DMACCConfig  = DMA_CHANNEL_ENABLE | DMA_TRANSFER_TYPE_M2P | (spi_port ? DMA_DEST_SSP1_TX : DMA_DEST_SSP0_TX);
+    LPC_GPDMA->DMACSoftSReq = 0x1;   // start DMA
+    do {
+    } while ((LPC_GPDMA->DMACRawIntTCStat & 0x01) == 0); // DMA is running
+    if (spi_port == 0) {    // TFT on SSP0
+        do {
+        } while ((LPC_SSP0->SR & 0x10) == 0x10); // SPI FIFO not empty
+    } else {
+        do {
+        } while ((LPC_SSP1->SR & 0x10) == 0x10); // SPI FIFO not empty
+    }
+#else
+    for (i=0; i<w; i++) {
+        _spi.write(color);
+    }
+    
+#endif
+    _cs0 = 1;
+    _cs1 = 1;
+    WindowMax();
+    return;
+}
+
+void SPI_TFTx2::vline(int x, int y0, int y1, int color)
+{
+    int h;
+    h = y1 - y0 + 1;
+    window(x,y0,1,h);
+    wr_cmd(0x22);
+    if (seldisp == 0) {
+        _cs0 = 0;
+        _cs1 = 1;
+    } else if (seldisp == 1) {
+        _cs0 = 1;
+        _cs1 = 0;
+    } else {
+        _cs0 = 0;
+        _cs1 = 0;
+    }
+    if (spi_port == 0) {    // TFT on SSP0
+#if defined USE_DMA
+        LPC_GPDMACH0->DMACCDestAddr = (uint32_t)&LPC_SSP0->DR; // we send to SSP0
+        /* Enable SSP0 for DMA. */
+        LPC_SSP0->DMACR = 0x2;
+#endif
+        LPC_SSP0->CR0 &= ~(0x08UL); // set to 8 bit
+        LPC_SSP0->DR = 0x72;        // start Data
+        LPC_SSP0->CR0 |= 0x08UL;    // set to 16 bit
+    } else {
+#if defined USE_DMA
+        LPC_GPDMACH0->DMACCDestAddr = (uint32_t)&LPC_SSP1->DR; // we send to SSP1
+        /* Enable SSP1 for DMA. */
+        LPC_SSP1->DMACR = 0x2;
+#endif
+        LPC_SSP1->CR0 &= ~(0x08UL); // set to 8 bit
+        LPC_SSP1->DR = 0x72;        // start Data
+        LPC_SSP1->CR0 |= 0x08UL;    // set to 16 bit
+    }
+#if defined USE_DMA
+    LPC_GPDMA->DMACIntTCClear = 0x1;
+    LPC_GPDMA->DMACIntErrClr = 0x1;
+    LPC_GPDMACH0->DMACCSrcAddr = (uint32_t)&color;
+    LPC_GPDMACH0->DMACCControl = h | (1UL << 18) | (1UL << 21) | (1UL << 31) ; // 16 bit transfer , no address increment, interrupt
+    LPC_GPDMACH0->DMACCConfig  = DMA_CHANNEL_ENABLE | DMA_TRANSFER_TYPE_M2P | (spi_port ? DMA_DEST_SSP1_TX : DMA_DEST_SSP0_TX);
+    LPC_GPDMA->DMACSoftSReq = 0x1;
+    do {
+    } while ((LPC_GPDMA->DMACRawIntTCStat & 0x01) == 0); // DMA is running
+
+    if (spi_port == 0) {    // TFT on SSP0
+        do {
+        } while ((LPC_SSP0->SR & 0x10) == 0x10); // SPI FIFO not empty
+    } else {
+        do {
+        } while ((LPC_SSP1->SR & 0x10) == 0x10); // SPI FIFO not empty
+    }
+#else
+    for (int y=0; y<h; y++) {
+        _spi.write(color);
+    }
+#endif
+    _cs0 = 1;
+    _cs1 = 1;
+    WindowMax();
+    return;
+}
+
+void SPI_TFTx2::line(int x0, int y0, int x1, int y1, int color)
+{
+    //WindowMax();
+    int   dx = 0, dy = 0;
+    int   dx_sym = 0, dy_sym = 0;
+    int   dx_x2 = 0, dy_x2 = 0;
+    int   di = 0;
+
+    dx = x1-x0;
+    dy = y1-y0;
+
+    // vline and hline are very slow for some reason so not using
+    //if (dx == 0) {        /* vertical line */
+    //    if (y1 > y0) vline(x0,y0,y1,color);
+    //    else vline(x0,y1,y0,color);
+    //    return;
+    //}
+
+    if (dx > 0) {
+        dx_sym = 1;
+    } else {
+        dx_sym = -1;
+    }
+    //if (dy == 0) {        /* horizontal line */
+    //    if (x1 > x0) hline(x0,x1,y0,color);
+    //    else  hline(x1,x0,y0,color);
+    //    return;
+    //}
+
+    if (dy > 0) {
+        dy_sym = 1;
+    } else {
+        dy_sym = -1;
+    }
+
+    dx = dx_sym*dx;
+    dy = dy_sym*dy;
+
+    dx_x2 = dx*2;
+    dy_x2 = dy*2;
+
+    if (dx >= dy) {
+        di = dy_x2 - dx;
+        while (x0 != x1) {
+
+            pixel(x0, y0, color);
+            x0 += dx_sym;
+            if (di<0) {
+                di += dy_x2;
+            } else {
+                di += dy_x2 - dx_x2;
+                y0 += dy_sym;
+            }
+        }
+        pixel(x0, y0, color);
+    } else {
+        di = dx_x2 - dy;
+        while (y0 != y1) {
+            pixel(x0, y0, color);
+            y0 += dy_sym;
+            if (di < 0) {
+                di += dx_x2;
+            } else {
+                di += dx_x2 - dy_x2;
+                x0 += dx_sym;
+            }
+        }
+        pixel(x0, y0, color);
+    }
+    return;
+}
+
+
+void SPI_TFTx2::rect(int x0, int y0, int x1, int y1, int color)
+{
+
+    if (x1 > x0) hline(x0,x1,y0,color);
+    else  hline(x1,x0,y0,color);
+
+    if (y1 > y0) vline(x0,y0,y1,color);
+    else vline(x0,y1,y0,color);
+
+    if (x1 > x0) hline(x0,x1,y1,color);
+    else  hline(x1,x0,y1,color);
+
+    if (y1 > y0) vline(x1,y0,y1,color);
+    else vline(x1,y1,y0,color);
+
+    return;
+}
+
+
+
+void SPI_TFTx2::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;
+    int dma_count;
+    window(x0,y0,w,h);
+    wr_cmd(0x22);
+    if (seldisp == 0) {
+        _cs0 = 0;
+        _cs1 = 1;
+    } else if (seldisp == 1) {
+        _cs0 = 1;
+        _cs1 = 0;
+    } else {
+        _cs0 = 0;
+        _cs1 = 0;
+    }
+    if (spi_port == 0) {    // TFT on SSP0
+        #if defined USE_DMA
+        LPC_GPDMACH0->DMACCDestAddr = (uint32_t)&LPC_SSP0->DR; // we send to SSP0
+        /* Enable SSP0 for DMA. */
+        LPC_SSP0->DMACR = 0x2;
+        #endif
+        LPC_SSP0->CR0 &= ~(0x08UL); // set to 8 bit
+        LPC_SSP0->DR = 0x72;        // start Data
+        LPC_SSP0->CR0 |= 0x08UL;    // set to 16 bit
+    } else {
+        #if defined USE_DMA
+        LPC_GPDMACH0->DMACCDestAddr = (uint32_t)&LPC_SSP1->DR; // we send to SSP1
+        /* Enable SSP1 for DMA. */
+        LPC_SSP1->DMACR = 0x2;
+        #endif
+        LPC_SSP1->CR0 &= ~(0x08UL); // set to 8 bit
+        LPC_SSP1->DR = 0x72;        // start Data
+        LPC_SSP1->CR0 |= 0x08UL;    // set to 16 bit
+    }
+    #if defined USE_DMA
+    do {
+        if (pixel > 4095) {
+            dma_count = 4095;
+            pixel = pixel - 4095;
+        } else {
+            dma_count = pixel;
+            pixel = 0;
+        }
+        LPC_GPDMA->DMACIntTCClear = 0x1;
+        LPC_GPDMA->DMACIntErrClr = 0x1;
+        LPC_GPDMACH0->DMACCSrcAddr = (uint32_t)&color;
+        LPC_GPDMACH0->DMACCControl = dma_count | (1UL << 18) | (1UL << 21) | (1UL << 31) ; // 16 bit transfer , no address increment, interrupt
+        LPC_GPDMACH0->DMACCConfig  = DMA_CHANNEL_ENABLE | DMA_TRANSFER_TYPE_M2P | (spi_port ? DMA_DEST_SSP1_TX : DMA_DEST_SSP0_TX);
+        LPC_GPDMA->DMACSoftSReq = 0x1;
+        do {
+        } while ((LPC_GPDMA->DMACRawIntTCStat & 0x01) == 0); // DMA is running
+
+    } while (pixel > 0);
+
+    if (spi_port == 0) {    // TFT on SSP0
+        do {
+        } while ((LPC_SSP0->SR & 0x10) == 0x10); // SPI FIFO not empty
+    } else {
+        do {
+        } while ((LPC_SSP1->SR & 0x10) == 0x10); // SPI FIFO not empty
+    }
+   
+    #else  // no DMA 
+    for (int p=0; p<pixel; p++) {
+        _spi.write(color);
+    }
+    #endif
+
+    _cs0 = 1;
+    _cs1 = 1;
+    WindowMax();
+    return;
+}
+
+
+void SPI_TFTx2::locate(int x, int y)
+{
+    char_x = x;
+    char_y = y;
+}
+
+
+
+int SPI_TFTx2::columns()
+{
+    return width() / font[1];
+}
+
+
+
+int SPI_TFTx2::rows()
+{
+    return height() / font[2];
+}
+
+
+
+int SPI_TFTx2::_putc(int value)
+{
+    if (value == '\n') {    // new line
+        char_x = 0;
+        char_y = char_y + font[2];
+        if (char_y >= height() - font[2]) {
+            char_y = 0;
+        }
+    } else {
+        character(char_x, char_y, value);
+    }
+    return value;
+}
+
+
+
+
+void SPI_TFTx2::character(int x, int y, int c)
+{
+    unsigned int hor,vert,offset,bpl,j,i,b,p;
+    unsigned char* zeichen;
+    unsigned char z,w;
+    #if defined USE_DMA
+    unsigned int pixel;
+    unsigned int dma_count,dma_off;
+    uint16_t *buffer;
+    #endif
+
+    if ((c < 31) || (c > 127)) return;   // test char range
+
+    // read font parameter from start of array
+    offset = font[0];                    // bytes / char
+    hor = font[1];                       // get hor size of font
+    vert = font[2];                      // get vert size of font
+    bpl = font[3];                       // bytes per line
+
+    if (char_x + hor > width()) {
+        char_x = 0;
+        char_y = char_y + vert;
+        if (char_y >= height() - font[2]) {
+            char_y = 0;
+        }
+    }
+    window(char_x, char_y,hor,vert); // char box
+    wr_cmd(0x22);
+
+#if defined USE_DMA
+    pixel = hor * vert;  // calculate buffer size
+
+    buffer = (uint16_t *) malloc (2*pixel); // we need a buffer for the 16 bit
+    if (buffer == NULL) {
+        //led = 1;
+        //pc.printf("Malloc error !\n\r");
+        return;         // error no memory
+    }
+
+    zeichen = &font[((c -32) * offset) + 4]; // start of char bitmap
+    w = zeichen[0];                          // width of actual char
+    p = 0;
+    // construct the char into the buffer
+    for (j=0; j<vert; j++) {  //  vert line
+        for (i=0; i<hor; i++) {   //  horz line
+            z =  zeichen[bpl * i + ((j & 0xF8) >> 3)+1];
+            b = 1 << (j & 0x07);
+            if (( z & b ) == 0x00) {
+                buffer[p] = _background;
+            } else {
+                buffer[p] = _foreground;
+            }
+            p++;
+        }
+    }
+
+    // copy the buffer with DMA SPI to display
+    dma_off = 0;  // offset for DMA transfer
+    if (seldisp == 0) {
+        _cs0 = 0;
+        _cs1 = 1;
+    } else if (seldisp == 1) {
+        _cs0 = 1;
+        _cs1 = 0;
+    } else {
+        _cs0 = 0;
+        _cs1 = 0;
+    }
+    if (spi_port == 0) {    // TFT on SSP0
+        LPC_GPDMACH0->DMACCDestAddr = (uint32_t)&LPC_SSP0->DR; // we send to SSP0
+        /* Enable SSP0 for DMA. */
+        LPC_SSP0->DMACR = 0x2;
+        LPC_SSP0->CR0 &= ~(0x08UL); // set to 8 bit
+        LPC_SSP0->DR = 0x72;        // start Data
+        LPC_SSP0->CR0 |= 0x08UL;    // set to 16 bit
+    } else {
+        LPC_GPDMACH0->DMACCDestAddr = (uint32_t)&LPC_SSP1->DR; // we send to SSP1
+        /* Enable SSP1 for DMA. */
+        LPC_SSP1->DMACR = 0x2;
+        LPC_SSP1->CR0 &= ~(0x08UL); // set to 8 bit
+        LPC_SSP1->DR = 0x72;        // start Data
+        LPC_SSP1->CR0 |= 0x08UL;    // set to 16 bit
+    }
+
+    // start DMA
+    do {
+        if (pixel > 4095) {         // this is a giant font !
+            dma_count = 4095;
+            pixel = pixel - 4095;
+        } else {
+            dma_count = pixel;
+            pixel = 0;
+        }
+        LPC_GPDMA->DMACIntTCClear = 0x1;
+        LPC_GPDMA->DMACIntErrClr = 0x1;
+        LPC_GPDMACH0->DMACCSrcAddr = (uint32_t) (buffer + dma_off);
+        LPC_GPDMACH0->DMACCControl = dma_count | (1UL << 18) | (1UL << 21) | (1UL << 31) |  DMA_CHANNEL_SRC_INC ; // 16 bit transfer , address increment, interrupt
+        LPC_GPDMACH0->DMACCConfig  = DMA_CHANNEL_ENABLE | DMA_TRANSFER_TYPE_M2P | (spi_port ? DMA_DEST_SSP1_TX : DMA_DEST_SSP0_TX);
+        LPC_GPDMA->DMACSoftSReq = 0x1;
+        do {
+        } while ((LPC_GPDMA->DMACRawIntTCStat & 0x01) == 0); // DMA is running
+        dma_off = dma_off + dma_count;
+    } while (pixel > 0);
+
+    free ((uint16_t *) buffer);
+
+    if (spi_port == 0) {    // TFT on SSP0
+        do {
+        } while ((LPC_SSP0->SR & 0x10) == 0x10); // SPI0 not idle
+        /* disable SSP0 for DMA. */
+        LPC_SSP0->DMACR = 0x0;
+    } else {
+        do {
+        } while ((LPC_SSP1->SR & 0x10) == 0x10); // SPI1 not idle
+        /* disable SSP1 for DMA. */
+        LPC_SSP1->DMACR = 0x0;
+    }
+#else
+    if (seldisp == 0) {
+        _cs0 = 0;
+        _cs1 = 1;
+    } else if (seldisp == 1) {
+        _cs0 = 1;
+        _cs1 = 0;
+    } else {
+        _cs0 = 0;
+        _cs1 = 0;
+    }
+    if (spi_port == 0) {    // TFT on SSP0
+        LPC_SSP0->CR0 &= ~(0x08UL); // set to 8 bit
+        LPC_SSP0->DR = 0x72;        // start Data
+        LPC_SSP0->CR0 |= 0x08UL;    // set to 16 bit
+    } else {
+        LPC_SSP1->CR0 &= ~(0x08UL); // set to 8 bit
+        LPC_SSP1->DR = 0x72;        // start Data
+        LPC_SSP1->CR0 |= 0x08UL;    // set to 16 bit
+    }
+    zeichen = &font[((c -32) * offset) + 4]; // start of char bitmap
+    w = zeichen[0];                          // width of actual char
+     for (j=0; j<vert; j++) {  //  vert line
+        for (i=0; i<hor; i++) {   //  horz line
+            z =  zeichen[bpl * i + ((j & 0xF8) >> 3)+1];
+            b = 1 << (j & 0x07);
+            if (( z & b ) == 0x00) {
+                _spi.write(_background);
+            } else {
+                _spi.write(_foreground);
+            }
+        }
+    }
+#endif    
+    _cs0 = 1;
+    _cs1 = 1;
+    WindowMax();
+    if ((w + 2) < hor) {                   // x offset to next char
+        char_x += w + 2;
+    } else char_x += hor;
+
+}
+
+
+void SPI_TFTx2::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)
+{
+    unsigned int  j;
+    int padd;
+    unsigned short *bitmap_ptr = (unsigned short *)bitmap;
+    // the lines are padded to multiple of 4 bytes in a bitmap
+    padd = -1;
+    do {
+        padd ++;
+    } while (2*(w + padd)%4 != 0);
+    window(x, y, w, h);
+    wr_cmd(0x22);
+    if (seldisp == 0) {
+        _cs0 = 0;
+        _cs1 = 1;
+    } else if (seldisp == 1) {
+        _cs0 = 1;
+        _cs1 = 0;
+    } else {
+        _cs0 = 0;
+        _cs1 = 0;
+    }
+    if (spi_port == 0) {    // TFT on SSP0
+#if defined USE_DMA    
+        LPC_GPDMACH0->DMACCDestAddr = (uint32_t)&LPC_SSP0->DR; // we send to SSP0
+        /* Enable SSP0 for DMA. */
+        LPC_SSP0->DMACR = 0x2;
+#endif        
+        LPC_SSP0->CR0 &= ~(0x08UL); // set to 8 bit
+        LPC_SSP0->DR = 0x72;        // start Data
+        LPC_SSP0->CR0 |= 0x08UL;    // set to 16 bit
+
+    } else {
+#if defined USE_DMA    
+        LPC_GPDMACH0->DMACCDestAddr = (uint32_t)&LPC_SSP1->DR; // we send to SSP1
+        /* Enable SSP1 for DMA. */
+        LPC_SSP1->DMACR = 0x2;   
+#endif        
+        LPC_SSP1->CR0 &= ~(0x08UL); // set to 8 bit
+        LPC_SSP1->DR = 0x72;        // start Data command
+        LPC_SSP1->CR0 |= 0x08UL;    // set to 16 bit
+    }
+
+    bitmap_ptr += ((h - 1)* (w + padd));
+#if defined USE_DMA      
+    for (j = 0; j < h; j++) {        //Lines
+        LPC_GPDMA->DMACIntTCClear = 0x1;
+        LPC_GPDMA->DMACIntErrClr = 0x1;
+        LPC_GPDMACH0->DMACCSrcAddr = (uint32_t)bitmap_ptr;
+        LPC_GPDMACH0->DMACCControl = w | (1UL << 18) | (1UL << 21) | (1UL << 31) |  DMA_CHANNEL_SRC_INC ; // 16 bit transfer , address increment, interrupt
+        LPC_GPDMACH0->DMACCConfig  = DMA_CHANNEL_ENABLE | DMA_TRANSFER_TYPE_M2P | (spi_port ? DMA_DEST_SSP1_TX : DMA_DEST_SSP0_TX);
+        LPC_GPDMA->DMACSoftSReq = 0x1;
+        do {
+        } while ((LPC_GPDMA->DMACRawIntTCStat & 0x01) == 0); // DMA is running
+
+        bitmap_ptr -= w;
+        bitmap_ptr -= padd;
+    }
+#else
+    unsigned int i;
+    for (j = 0; j < h; j++) {        //Lines
+        for (i = 0; i < w; i++) {     // copy pixel data to TFT
+            _spi.write(*bitmap_ptr);    // one line
+            bitmap_ptr++;
+        }
+        bitmap_ptr -= 2*w;
+        bitmap_ptr -= padd;
+    }   
+#endif    
+    if (spi_port == 0) {    // TFT on SSP0
+        do {
+        } while ((LPC_SSP0->SR & 0x10) == 0x10); // SPI FIFO not empty
+    } else {
+        do {
+        } while ((LPC_SSP1->SR & 0x10) == 0x10); // SPI FIFO not empty
+    }
+    _cs0 = 1;
+    _cs1 = 1;
+    WindowMax();
+}
+
+
+int SPI_TFTx2::BMP_16(unsigned int x, unsigned int y, const char *Name_BMP)
+{
+
+#define OffsetPixelWidth    18
+#define OffsetPixelHeigh    22
+#define OffsetFileSize      34
+#define OffsetPixData       10
+#define OffsetBPP           28
+
+    char filename[50];
+    unsigned char BMP_Header[54];
+    unsigned short BPP_t;
+    unsigned int PixelWidth,PixelHeigh,start_data;
+    unsigned int    i,off;
+    int padd,j;
+    unsigned short *line;
+
+    // get the filename
+    LocalFileSystem local("local");
+    sprintf(&filename[0],"/local/");
+    i=7;
+    while (*Name_BMP!='\0') {
+        filename[i++]=*Name_BMP++;
+    }
+
+    fprintf(stderr, "filename : %s \n\r",filename);
+
+    FILE *Image = fopen((const char *)&filename[0], "rb");  // open the bmp file
+    if (!Image) {
+        return(0);      // error file not found !
+    }
+
+    fread(&BMP_Header[0],1,54,Image);      // get the BMP Header
+
+    if (BMP_Header[0] != 0x42 || BMP_Header[1] != 0x4D) {  // check magic byte
+        fclose(Image);
+        return(-1);     // error no BMP file
+    }
+
+    BPP_t = BMP_Header[OffsetBPP] + (BMP_Header[OffsetBPP + 1] << 8);
+    if (BPP_t != 0x0010) {
+        fclose(Image);
+        return(-2);     // error no 16 bit BMP
+    }
+
+    PixelHeigh = BMP_Header[OffsetPixelHeigh] + (BMP_Header[OffsetPixelHeigh + 1] << 8) + (BMP_Header[OffsetPixelHeigh + 2] << 16) + (BMP_Header[OffsetPixelHeigh + 3] << 24);
+    PixelWidth = BMP_Header[OffsetPixelWidth] + (BMP_Header[OffsetPixelWidth + 1] << 8) + (BMP_Header[OffsetPixelWidth + 2] << 16) + (BMP_Header[OffsetPixelWidth + 3] << 24);
+    if (PixelHeigh > height() + y || PixelWidth > width() + x) {
+        fclose(Image);
+        return(-3);      // to big
+    }
+
+    start_data = BMP_Header[OffsetPixData] + (BMP_Header[OffsetPixData + 1] << 8) + (BMP_Header[OffsetPixData + 2] << 16) + (BMP_Header[OffsetPixData + 3] << 24);
+
+    line = (unsigned short *) malloc (2 * PixelWidth); // we need a buffer for a line
+    if (line == NULL) {
+        return(-4);         // error no memory
+    }
+
+    // the bmp lines are padded to multiple of 4 bytes
+    padd = -1;
+    do {
+        padd ++;
+    } while ((PixelWidth * 2 + padd)%4 != 0);
+
+
+//fseek(Image, 70 ,SEEK_SET);
+    window(x, y,PixelWidth ,PixelHeigh);
+    wr_cmd(0x22);
+    if (seldisp == 0) {
+        _cs0 = 0;
+        _cs1 = 1;
+    } else if (seldisp == 1) {
+        _cs0 = 1;
+        _cs1 = 0;
+    } else {
+        _cs0 = 0;
+        _cs1 = 0;
+    }
+
+    if (spi_port == 0) {    // TFT on SSP0
+#if defined USE_DMA
+        LPC_GPDMACH0->DMACCDestAddr = (uint32_t)&LPC_SSP0->DR; // we send to SSP0
+        /* Enable SSP0 for DMA. */
+        LPC_SSP0->DMACR = 0x2;
+#endif
+        LPC_SSP0->CR0 &= ~(0x08UL); // set to 8 bit
+        LPC_SSP0->DR = 0x72;        // start Data
+        LPC_SSP0->CR0 |= 0x08UL;    // set to 16 bit
+
+    } else {
+#if defined USE_DMA    
+        LPC_GPDMACH0->DMACCDestAddr = (uint32_t)&LPC_SSP1->DR; // we send to SSP1
+        /* Enable SSP1 for DMA. */
+        LPC_SSP1->DMACR = 0x2;
+#endif
+        LPC_SSP1->CR0 &= ~(0x08UL); // set to 8 bit
+        LPC_SSP1->DR = 0x72;        // start Data
+        LPC_SSP1->CR0 |= 0x08UL;    // set to 16 bit     
+    }
+    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 !
+#if defined USE_DMA
+        LPC_GPDMA->DMACIntTCClear = 0x1;
+        LPC_GPDMA->DMACIntErrClr = 0x1;
+        LPC_GPDMACH0->DMACCSrcAddr = (uint32_t)line;
+        LPC_GPDMACH0->DMACCControl = PixelWidth | (1UL << 18) | (1UL << 21) | (1UL << 31) |  DMA_CHANNEL_SRC_INC ; // 16 bit transfer , address increment, interrupt
+        LPC_GPDMACH0->DMACCConfig  = DMA_CHANNEL_ENABLE | DMA_TRANSFER_TYPE_M2P | (spi_port ? DMA_DEST_SSP1_TX : DMA_DEST_SSP0_TX);
+        LPC_GPDMA->DMACSoftSReq = 0x1;
+        do {
+        } while ((LPC_GPDMA->DMACRawIntTCStat & 0x01) == 0); // DMA is running
+#else
+    for (i = 0; i < PixelWidth; i++) {        // copy pixel data to TFT
+            _spi.write(line[i]);                  // one 16 bit pixel
+        } 
+#endif            
+    }
+    if (spi_port == 0) {    // TFT on SSP0
+        do {
+        } while ((LPC_SSP0->SR & 0x10) == 0x10); // SPI FIFO not empty
+    } else {
+        do {
+        } while ((LPC_SSP1->SR & 0x10) == 0x10); // SPI FIFO not empty
+    }
+    _cs0 = 1;
+    _cs1 = 1;
+    free (line);
+    fclose(Image);
+    WindowMax();
+    return(1);
+}
\ No newline at end of file
diff -r 522e742e62eb -r aca12a61d2b1 SPI_TFTx2.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SPI_TFTx2.h	Sun May 18 12:45:24 2014 +0000
@@ -0,0 +1,417 @@
+/* mbed library for 240*320 pixel display TFT based on HX8347D LCD Controller
+ * Copyright (c) 2011 Peter Drescher - DC2PD
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+ 
+ /* change the char position handling
+  * use pixel (x,y) instadt of colum row */
+ 
+
+#ifndef MBED_SPI_TFT_H
+#define MBED_SPI_TFT_H
+
+//#define NO_DMA
+
+#include "mbed.h"
+#include "GraphicsDisplay.h"
+
+#define RGB(r,g,b)  (((r&0xF8)<<8)|((g&0xFC)<<3)|((b&0xF8)>>3)) //5 red | 6 green | 5 blue
+
+#define SPI_START   (0x70)              /* Start byte for SPI transfer        */
+#define SPI_RD      (0x01)              /* WR bit 1 within start              */
+#define SPI_WR      (0x00)              /* WR bit 0 within start              */
+#define SPI_DATA    (0x02)              /* RS bit 1 within start byte         */
+#define SPI_INDEX   (0x00)              /* RS bit 0 within start byte         */
+
+
+/* some RGB color definitions                                                 */
+#define Black           0x0000      /*   0,   0,   0 */
+#define Navy            0x0007      /*   0,   0,  64 */
+#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 Olive           0x7BE0      /* 128, 128,   0 */
+#define LightGrey       0xC618      /* 192, 192, 192 */
+#define DarkGrey        0x7BEF      /* 128, 128, 128 */
+#define Blue            0x001F      /*   0,   0, 255 */
+#define Green           0x07E0      /*   0, 255,   0 */
+#define Cyan            0x07FF      /*   0, 255, 255 */
+#define Red             0xF800      /* 255,   0,   0 */
+#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 Amber           0xFBE0      /* 255, 126,   0 */
+
+
+// some defines for the DMA use
+#define DMA_CHANNEL_ENABLE      1
+#define DMA_TRANSFER_TYPE_M2P   (1UL << 11)   
+#define DMA_CHANNEL_TCIE        (1UL << 31)
+#define DMA_CHANNEL_SRC_INC     (1UL << 26)
+#define DMA_MASK_IE             (1UL << 14)
+#define DMA_MASK_ITC            (1UL << 15)
+#define DMA_SSP1_TX             (1UL << 2)
+#define DMA_SSP0_TX             (0) 
+#define DMA_DEST_SSP1_TX        (2UL << 6)
+#define DMA_DEST_SSP0_TX        (0UL << 6) 
+
+
+/** Display control class, based on GraphicsDisplay and TextDisplay
+ *
+ * Example:
+ * @code
+ * #include "stdio.h"
+ * #include "mbed.h"
+ * #include "SPI_TFTx2.h"
+ * #include "string"
+ * #include "Arial12x12.h"
+ * #include "Arial24x23.h"
+ * 
+ *
+ *
+ * // the TFT is connected to SPI pin 5-7 
+ * SPI_TFTx2 TFT(p5, p6, p7, p8, p9, p15,"TFT"); // mosi, miso, sclk, cs0, cs1, reset
+ * 
+ * int main() {
+ *     TFT.claim(stdout);      // send stdout to the TFT display 
+ *     //TFT.claim(stderr);      // send stderr to the TFT display
+ *
+ *     TFT.background(Black);    // set background to black
+ *     TFT.foreground(White);    // set chars to white
+ *     TFT.cls();                // clear the screen
+ *     TFT.set_font((unsigned char*) Arial12x12);  // select the font
+ *     
+ *     TFT.set_orientation(0);
+ *     TFT.set_display(0);
+ *     TFT.locate(0,0);
+ *     printf("  Hello Mbed 0");
+ *     TFT.set_font((unsigned char*) Arial24x23);  // select font 2
+ *     TFT.locate(48,115);
+ *     TFT.printf("Bigger Font");
+ *  }
+ * @endcode
+ */
+ class SPI_TFTx2 : public GraphicsDisplay {
+ public:
+
+  /** Create a SPI_TFTx2 object connected to SPI and two pins
+   *
+   * @param mosi,miso,sclk SPI
+   * @param cs0 pin connected to CS of left display
+   * @param cs1 pin connected to CS of right display
+   * @param reset pin connected to RESET of display
+   *
+   */ 
+  SPI_TFTx2(PinName mosi, PinName miso, PinName sclk, PinName cs0, PinName cs1, PinName reset,const char* name ="TFT");
+    
+  /** Get the width of the screen in pixel
+   *
+   * @param 
+   * @returns width of screen in pixel
+   *
+   */    
+  virtual int width();
+
+  /** Get the height of the screen in pixel
+   *
+   * @returns height of screen in pixel 
+   *
+   */     
+  virtual int height();
+    
+  /** Draw a pixel at x,y with color 
+   *  
+   * @param x horizontal position
+   * @param y vertical position
+   * @param color 16 bit pixel color
+   */    
+  virtual void pixel(int x, int y,int colour);
+    
+  /** draw a circle
+   *
+   * @param x0,y0 center
+   * @param r radius
+   * @param color 16 bit color                                                                 *
+   *
+   */    
+  void circle(int x, int y, int r, int colour); 
+  
+  /** draw a filled circle
+   *
+   * @param x0,y0 center
+   * @param r radius
+   * @param color 16 bit color                                                                 *
+   *
+   * use circle with different radius,
+   * can miss some pixel
+   */    
+  void fillcircle(int x, int y, int r, int colour); 
+  
+ 
+    
+  /** draw a 1 pixel line
+   *
+   * @param x0,y0 start point
+   * @param x1,y1 stop point
+   * @param color 16 bit color
+   *
+   */    
+  void line(int x0, int y0, int x1, int y1, int colour);
+    
+  /** draw a rect
+   *
+   * @param x0,y0 top left corner
+   * @param x1,y1 down right corner
+   * @param color 16 bit color
+   *                                                   *
+   */    
+  void rect(int x0, int y0, int x1, int y1, int colour);
+    
+  /** draw a filled rect
+   *
+   * @param x0,y0 top left corner
+   * @param x1,y1 down right corner
+   * @param color 16 bit color
+   *
+   */    
+  void fillrect(int x0, int y0, int x1, int y1, int colour);
+    
+  /** setup cursor position
+   *
+   * @param x x-position (top left)
+   * @param y y-position 
+   */   
+  virtual void locate(int x, int y);
+    
+  /** Fill the screen with _backgroun color
+   *
+   */   
+  virtual void cls (void);   
+    
+  /** calculate the max number of char in a line
+   *
+   * @returns max columns
+   * depends on actual font size
+   *
+   */    
+  virtual int columns(void);
+    
+  /** calculate the max number of columns
+   *
+   * @returns max column
+   * depends on actual font size
+   *
+   */   
+  virtual int rows(void);
+    
+  /** put a char on the screen
+   *
+   * @param value char to print
+   * @returns printed char
+   *
+   */
+  virtual int _putc(int value);
+    
+  /** draw a character on given position out of the active font to the TFT
+   *
+   * @param x x-position of char (top left) 
+   * @param y y-position
+   * @param c char to print
+   *
+   */    
+  virtual void character(int x, int y, int c);
+    
+  /** paint a bitmap on the TFT 
+   *
+   * @param x,y : upper left corner 
+   * @param w width of bitmap
+   * @param h high of bitmap
+   * @param *bitmap pointer to the bitmap data
+   *
+   *   bitmap format: 16 bit R5 G6 B5
+   * 
+   *   use Gimp to create / load , save as BMP, option 16 bit R5 G6 B5            
+   *   use winhex to load this file and mark data stating at offset 0x46 to end
+   *   use edit -> copy block -> C Source to export C array
+   *   paste this array into your program
+   * 
+   *   define the array as static const unsigned char to put it into flash memory
+   *   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);
+    
+    
+   /** paint a 16 bit BMP from local filesytem on the TFT (slow) 
+   *
+   * @param x,y : upper left corner 
+   * @param *Name_BMP name of the BMP file
+   * @returns 1 if bmp file was found and painted
+   * @returns -1 if bmp file was found not found
+   * @returns -2 if bmp file is not 16bit
+   * @returns -3 if bmp file is to big for screen 
+   * @returns -4 if buffer malloc go wrong
+   *
+   *   bitmap format: 16 bit R5 G6 B5
+   * 
+   *   use Gimp to create / load , save as BMP, option 16 bit R5 G6 B5
+   *   copy to internal file system            
+   * 
+   */      
+    
+  int BMP_16(unsigned int x, unsigned int y, const char *Name_BMP);  
+    
+    
+    
+  /** select the font to use
+   *
+   * @param f pointer to font array 
+   *                                                                              
+   *   font array can created with GLCD Font Creator from http://www.mikroe.com
+   *   you have to add 4 parameter at the beginning of the font array to use: 
+   *   - the number of byte / char
+   *   - the vertial size in pixel
+   *   - the horizontal size in pixel
+   *   - the number of byte per vertical line
+   *   you also have to change the array to char[]
+   *
+   */  
+  void set_font(unsigned char* f);
+   
+  /** Set the orientation of the screen
+   *  x,y: 0,0 is always top left 
+   *
+   * @param o direction to use the screen (0-3) 90&#65533; Steps  
+   *
+   */  
+  void set_orientation(unsigned int o);
+
+  /* Select between two displays */
+  void set_display(unsigned int o);
+
+    
+  SPI _spi;
+  DigitalOut _cs0; 
+  DigitalOut _cs1; 
+  DigitalOut _reset;
+  unsigned char* font;
+  
+  
+  
+   
+protected:
+
+  /** Set draw window region to whole screen
+   *
+   */  
+  void WindowMax (void);
+
+
+  /** draw a horizontal line
+   *
+   * @param x0 horizontal start
+   * @param x1 horizontal stop
+   * @param y vertical position
+   * @param color 16 bit color                                               
+   *
+   */
+  void hline(int x0, int x1, int y, int colour);
+    
+  /** draw a vertical line
+   *
+   * @param x horizontal position
+   * @param y0 vertical start 
+   * @param y1 vertical stop
+   * @param color 16 bit color
+   */
+  void vline(int y0, int y1, int x, int colour);
+    
+  /** Set draw window region
+   *
+   * @param x horizontal position
+   * @param y vertical position
+   * @param w window width in pixel
+   * @param h window height in pixels
+   */    
+  void window (unsigned int x, unsigned int y, unsigned int w, unsigned int h);
+    
+ 
+    
+  /** Init the HX8347D controller 
+   *
+   */    
+  void tft_reset();
+    
+   /** Write data to the LCD controller
+   *
+   * @param dat data written to LCD controller
+   * 
+   */   
+  //void wr_dat(unsigned int value);
+  void wr_dat(unsigned char value);
+    
+  /** Write a command the LCD controller 
+   *
+   * @param cmd: command to be written   
+   *
+   */   
+  void wr_cmd(unsigned char value);
+    
+   /** Start data sequence to the LCD controller
+   * 
+   */   
+  //void wr_dat_start();
+    
+  /** Stop of data writing to the LCD controller
+   *   
+   */  
+  //void wr_dat_stop();
+    
+  /** write data to the LCD controller
+   *
+   * @param data to be written 
+   *                                           *
+   */    
+  void wr_dat_only(unsigned short dat);
+    
+  /** Read data from the LCD controller
+   *
+   * @returns data from LCD controller
+   *  
+   */    
+  unsigned short rd_dat(void);
+    
+  /** Write a value to the to a LCD register
+   *
+   * @param reg register to be written
+   * @param val data to be written
+   */   
+  void wr_reg (unsigned char reg, unsigned char val);
+    
+  /** Read a LCD register
+   *
+   * @param reg register to be read
+   * @returns value of the register 
+   */    
+  unsigned short rd_reg (unsigned char reg);
+    
+  unsigned char spi_port; 
+  unsigned int orientation;
+  unsigned int seldisp;
+  unsigned int char_x;
+  unsigned int char_y;
+ 
+    
+};
+
+#endif
diff -r 522e742e62eb -r aca12a61d2b1 SPI_TFTx2_ILI9341.cpp
--- 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;
diff -r 522e742e62eb -r aca12a61d2b1 SPI_TFTx2_ILI9341.h
--- a/SPI_TFTx2_ILI9341.h	Mon May 12 03:18:44 2014 +0000
+++ b/SPI_TFTx2_ILI9341.h	Sun May 18 12:45:24 2014 +0000
@@ -9,13 +9,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
- 
+
  /* change the char position handling
   * use pixel (x,y) instadt of colum row */
- 
+
 
-#ifndef MBED_SPI_TFTx2_H
-#define MBED_SPI_TFTx2_H
+#ifndef MBED_SPI_TFTx2_ILI9341_H
+#define MBED_SPI_TFTx2_ILI9341_H
 
 #include "mbed.h"
 #include "GraphicsDisplay.h"
@@ -51,26 +51,26 @@
  * @code
  * #include "stdio.h"
  * #include "mbed.h"
- * #include "SPI_TFTx2.h"
+ * #include "SPI_TFTx2_ILI9341.h"
  * #include "string"
  * #include "Arial12x12.h"
  * #include "Arial24x23.h"
- * 
+ *
  *
  *
  * // the TFT is connected to SPI pin 5-7 and IO's 8-10
- * SPI_TFTx2 TFT(p5, p6, p7, p8, p9, p10,"TFT"); // mosi, miso, sclk, cs, reset, dc
- * If your display need a signal for switch the backlight use a aditional IO pin in your program 
+ * SPI_TFTx2_ILI9341 TFT(p5, p6, p7, p8, p9, p10,"TFT"); // mosi, miso, sclk, cs, reset, dc
+ * If your display need a signal for switch the backlight use a aditional IO pin in your program
  *
  * int main() {
- *     TFT.claim(stdout);      // send stdout to the TFT display 
+ *     TFT.claim(stdout);      // send stdout to the TFT display
  *     //TFT.claim(stderr);      // send stderr to the TFT display
  *
  *     TFT.background(Black);    // set background to black
  *     TFT.foreground(White);    // set chars to white
  *     TFT.cls();                // clear the screen
  *     TFT.set_font((unsigned char*) Arial12x12);  // select the font
- *     
+ *
  *     TFT.set_orientation(0);
  *     printf("  Hello Mbed 0");
  *     TFT.set_font((unsigned char*) Arial24x23);  // select font 2
@@ -79,117 +79,117 @@
  *  }
  * @endcode
  */
- class SPI_TFTx2 : public GraphicsDisplay {
+ class SPI_TFTx2_ILI9341 : public GraphicsDisplay {
  public:
 
-  /** Create a SPI_TFTx2 object connected to SPI and three pins
+  /** Create a SPI_TFTx2_ILI9341 object connected to SPI and three pins
    *
    * @param mosi pin connected to SDO of display
    * @param miso pin connected to SDI of display
-   * @param sclk pin connected to RS of display 
+   * @param sclk pin connected to RS of display
    * @param cs0 pin connected to CS of display
    * @param cs1 pin connected to CS of display
    * @param reset pin connected to RESET of display
    * @param dc pin connected to WR of display
-   * the IM pins have to be set to 1110 (3-0) 
-   */ 
-  SPI_TFTx2(PinName mosi, PinName miso, PinName sclk, PinName cs0, PinName cs1, PinName reset, PinName dc, const char* name ="TFT");
-    
+   * the IM pins have to be set to 1110 (3-0)
+   */
+  SPI_TFTx2_ILI9341(PinName mosi, PinName miso, PinName sclk, PinName cs0, PinName cs1, PinName reset, PinName dc, const char* name ="TFT");
+
   /** Get the width of the screen in pixel
    *
    * @returns width of screen in pixel
    *
-   */    
+   */
   virtual int width();
 
   /** Get the height of the screen in pixel
    *
-   * @returns height of screen in pixel 
+   * @returns height of screen in pixel
    *
-   */     
+   */
   virtual int height();
-    
-  /** Draw a pixel at x,y with color 
-   *  
+
+  /** Draw a pixel at x,y with color
+   *
    * @param x horizontal position
    * @param y vertical position
    * @param color 16 bit pixel color
-   */    
+   */
   virtual void pixel(int x, int y,int colour);
-    
+
   /** draw a circle
    *
    * @param x0,y0 center
    * @param r radius
    * @param color 16 bit color                                                                 *
    *
-   */    
-  void circle(int x, int y, int r, int colour); 
-  
+   */
+  void circle(int x, int y, int r, int colour);
+
   /** draw a filled circle
    *
    * @param x0,y0 center
    * @param r radius
    * @param color 16 bit color                                                                 *
-   */    
-  void fillcircle(int x, int y, int r, int colour); 
- 
-    
+   */
+  void fillcircle(int x, int y, int r, int colour);
+
+
   /** draw a 1 pixel line
    *
    * @param x0,y0 start point
    * @param x1,y1 stop point
    * @param color 16 bit color
    *
-   */    
+   */
   void line(int x0, int y0, int x1, int y1, int colour);
-    
+
   /** draw a rect
    *
    * @param x0,y0 top left corner
    * @param x1,y1 down right corner
    * @param color 16 bit color
    *                                                   *
-   */    
+   */
   void rect(int x0, int y0, int x1, int y1, int colour);
-    
+
   /** draw a filled rect
    *
    * @param x0,y0 top left corner
    * @param x1,y1 down right corner
    * @param color 16 bit color
    *
-   */    
+   */
   void fillrect(int x0, int y0, int x1, int y1, int colour);
-    
+
   /** setup cursor position
    *
    * @param x x-position (top left)
-   * @param y y-position 
-   */   
+   * @param y y-position
+   */
   virtual void locate(int x, int y);
-    
+
   /** Fill the screen with _backgroun color
    *
-   */   
-  virtual void cls (void);   
-    
+   */
+  virtual void cls (void);
+
   /** calculate the max number of char in a line
    *
    * @returns max columns
    * depends on actual font size
    *
-   */    
+   */
   virtual int columns(void);
-    
+
   /** calculate the max number of columns
    *
    * @returns max column
    * depends on actual font size
    *
-   */   
+   */
   virtual int rows(void);
-    
+
   /** put a char on the screen
    *
    * @param value char to print
@@ -197,108 +197,108 @@
    *
    */
   virtual int _putc(int value);
-    
+
   /** draw a character on given position out of the active font to the TFT
    *
-   * @param x x-position of char (top left) 
+   * @param x x-position of char (top left)
    * @param y y-position
    * @param c char to print
    *
-   */    
+   */
   virtual void character(int x, int y, int c);
-    
-  /** paint a bitmap on the TFT 
+
+  /** paint a bitmap on the TFT
    *
-   * @param x,y : upper left corner 
+   * @param x,y : upper left corner
    * @param w width of bitmap
    * @param h high of bitmap
    * @param *bitmap pointer to the bitmap data
    *
    *   bitmap format: 16 bit R5 G6 B5
-   * 
-   *   use Gimp to create / load , save as BMP, option 16 bit R5 G6 B5            
+   *
+   *   use Gimp to create / load , save as BMP, option 16 bit R5 G6 B5
    *   use winhex to load this file and mark data stating at offset 0x46 to end
    *   use edit -> copy block -> C Source to export C array
    *   paste this array into your program
-   * 
+   *
    *   define the array as static const unsigned char to put it into flash memory
    *   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);
-    
-    
-   /** paint a 16 bit BMP from filesytem on the TFT (slow) 
+
+
+   /** paint a 16 bit BMP from filesytem on the TFT (slow)
    *
-   * @param x,y : position of upper left corner 
+   * @param x,y : position of upper left corner
    * @param *Name_BMP name of the BMP file with drive: "/local/test.bmp"
    *
    * @returns 1 if bmp file was found and painted
    * @returns  0 if bmp file was found not found
    * @returns -1 if file is no bmp
    * @returns -2 if bmp file is no 16 bit bmp
-   * @returns -3 if bmp file is to big for screen 
+   * @returns -3 if bmp file is to big for screen
    * @returns -4 if buffer malloc go wrong
    *
    *   bitmap format: 16 bit R5 G6 B5
-   * 
+   *
    *   use Gimp to create / load , save as BMP, option 16 bit R5 G6 B5
-   *   copy to internal file system or SD card           
-   */      
-    
-  int BMP_16(unsigned int x, unsigned int y, const char *Name_BMP);  
-    
-    
-    
+   *   copy to internal file system or SD card
+   */
+
+  int BMP_16(unsigned int x, unsigned int y, const char *Name_BMP);
+
+
+
   /** select the font to use
    *
-   * @param f pointer to font array 
-   *                                                                              
+   * @param f pointer to font array
+   *
    *   font array can created with GLCD Font Creator from http://www.mikroe.com
-   *   you have to add 4 parameter at the beginning of the font array to use: 
+   *   you have to add 4 parameter at the beginning of the font array to use:
    *   - the number of byte / char
    *   - the vertial size in pixel
    *   - the horizontal size in pixel
    *   - the number of byte per vertical line
    *   you also have to change the array to char[]
    *
-   */  
+   */
   void set_font(unsigned char* f);
-   
+
   /** Set the orientation of the screen
-   *  x,y: 0,0 is always top left 
+   *  x,y: 0,0 is always top left
    *
-   * @param o direction to use the screen (0-3)  
+   * @param o direction to use the screen (0-3)
    *
-   */  
+   */
   void set_orientation(unsigned int o);
-  
+
     /* Select between two displays */
   void set_display(unsigned int o);
 
   /** read out the manufacturer ID of the LCD
    *  can used for checking the connection to the display
    *  @returns ID
-   */ 
+   */
   int Read_ID(void);
-  
-  
-    
+
+
+
   SPI _spi;
-  DigitalOut _cs0; 
-  DigitalOut _cs1; 
+  DigitalOut _cs0;
+  DigitalOut _cs1;
   DigitalOut _reset;
   DigitalOut _dc;
   unsigned char* font;
-  
-  
-  
-   
+
+
+
+
 protected:
 
   /** Set draw window region to whole screen
    *
-   */  
+   */
   void WindowMax (void);
 
 
@@ -307,102 +307,102 @@
    * @param x0 horizontal start
    * @param x1 horizontal stop
    * @param y vertical position
-   * @param color 16 bit color                                               
+   * @param color 16 bit color
    *
    */
   void hline(int x0, int x1, int y, int colour);
-    
+
   /** draw a vertical line
    *
    * @param x horizontal position
-   * @param y0 vertical start 
+   * @param y0 vertical start
    * @param y1 vertical stop
    * @param color 16 bit color
    */
   void vline(int y0, int y1, int x, int colour);
-    
+
   /** Set draw window region
    *
    * @param x horizontal position
    * @param y vertical position
    * @param w window width in pixel
    * @param h window height in pixels
-   */    
+   */
   virtual void window (unsigned int x,unsigned int y, unsigned int w, unsigned int h);
-    
- 
-    
-  /** Init the ILI9341 controller 
+
+
+
+  /** Init the ILI9341 controller
    *
-   */    
+   */
   void tft_reset();
-    
+
    /** Write data to the LCD controller
    *
    * @param dat data written to LCD controller
-   * 
-   */   
+   *
+   */
   //void wr_dat(unsigned int value);
   void wr_dat(unsigned char value);
-    
-  /** Write a command the LCD controller 
+
+  /** Write a command the LCD controller
    *
-   * @param cmd: command to be written   
+   * @param cmd: command to be written
    *
-   */   
+   */
   void wr_cmd(unsigned char value);
-    
+
    /** Start data sequence to the LCD controller
-   * 
-   */   
+   *
+   */
   //void wr_dat_start();
-    
+
   /** Stop of data writing to the LCD controller
-   *   
-   */  
+   *
+   */
   //void wr_dat_stop();
-    
+
   /** write data to the LCD controller
    *
-   * @param data to be written 
+   * @param data to be written
    *                                           *
-   */    
+   */
   //void wr_dat_only(unsigned short dat);
-    
+
   /** Read byte from the LCD controller
    *
    * @param cmd comand to controller
    * @returns data from LCD controller
-   *  
-   */    
+   *
+   */
    char rd_byte(unsigned char cmd);
-    
-  
-  int rd_32(unsigned char cmd);  
-    
-    
+
+
+  int rd_32(unsigned char cmd);
+
+
   /** Write a value to the to a LCD register
    *
    * @param reg register to be written
    * @param val data to be written
-   */   
+   */
   //void wr_reg (unsigned char reg, unsigned char val);
-    
+
   /** Read a LCD register
    *
    * @param reg register to be read
-   * @returns value of the register 
-   */    
+   * @returns value of the register
+   */
   //unsigned short rd_reg (unsigned char reg);
-    
-  unsigned char spi_port; 
+
+  unsigned char spi_port;
   unsigned int orientation;
   unsigned int seldisp;
   unsigned int char_x;
   unsigned int char_y;
   PinName clk;
- 
-    
+
+
 };
 
-#endif
+#endif  /* MBED_SPI_TFTx2_ILI9341_H */