Revision 7:3da729e3e2c6, committed 2019-04-03

Comitter:

lolo2

Date:

Wed Apr 03 12:31:48 2019 +0000

Parent:

6:6acbe3629822

Commit message:

e

Changed in this revision

diff -r 6acbe3629822 -r 3da729e3e2c6 main.cpp
--- a/main.cpp	Tue Feb 12 11:02:05 2019 +0000
+++ b/main.cpp	Wed Apr 03 12:31:48 2019 +0000
@@ -1,19 +1,3 @@
-/**********************************************************************************************
- Copyright (c) 2014 DisplayModule. All rights reserved.
-
- Redistribution and use of this source code, part of this source code or any compiled binary
- based on this source code is permitted as long as the above copyright notice and following
- disclaimer is retained.
-
- DISCLAIMER:
- THIS SOFTWARE IS SUPPLIED "AS IS" WITHOUT ANY WARRANTIES AND SUPPORT. DISPLAYMODULE ASSUMES
- NO RESPONSIBILITY OR LIABILITY FOR THE USE OF THE SOFTWARE.
- ********************************************************************************************/
-
-/******************************************************************************
- * Includes
- *****************************************************************************/
-
 #include "mbed.h"
 
 #include "DmTftHX8353C.h"
@@ -42,7 +26,7 @@
 //DmTftHX8353C tft(D2, D3, D4, D5, D6);  /* DmTftHX8353C(PinName mosi, PinName clk, PinName cs, PinName dc, PinName rst) DM_TFT18_101 */
 //DmTftS6D0164 tft(A4, A3, A5, A2);  /* DmTftS6D0164(PinName wr, PinName cs, PinName dc, PinName rst) DM_TFT22_102 */
 //DmTftIli9325 tft(A4, A3, A5, A2);  /* DmTftIli9325(PinName wr, PinName cs, PinName dc, PinName rst) DM_TFT28_103 and DM_TFT24_104 */
-DmTftIli9341 tft(D10, D9, D11, D12, D13);  /* DmTftIli9341(PinName cs, PinName dc, PinName mosi, PinName miso, PinName clk)  DM_TFT28_105 */
+DmTftIli9341 tft(D10, D12, D11, D12, D13);  /* DmTftIli9341(PinName cs, PinName dc, PinName mosi, PinName miso, PinName clk)  DM_TFT28_105 */
 //DmTftSsd2119 tft(D10, D9, D11, D12, D13);  /* DmTftSsd2119(PinName cs, PinName dc, PinName mosi, PinName miso, PinName clk) DM_TFT35_107 */
 //DmTftRa8875  tft(D10, D9, D11, D12, D13);  /* DmTftRa8875(PinName cs, PinName sel, PinName mosi, PinName miso, PinName clk) DM_TFT43_108 and DM_TFT50_111   For DmTftRa8875 driver, The panel resolution should be config in DmTftRa8875::init() function on the DmTftRa8875.cpp file. */
 
@@ -181,19 +165,17 @@
   log("init tft \r\n");
   tft.init();
 
-  tft.drawString(0,32,"bonjour.");
-  tft.drawString(0,48,"je suis cubya ");
-  tft.drawString(0,64,"que faite vous ?");
-  tft.drawString(0,80,"je suis interactif");
-  tft.drawString(0,96,"tout savoir sur ");
-  tft.drawString(0,112,"www.cubya.com   ");
-  tft.drawString(0,128,"                ");
-  tft.drawString(0,144,"                ");
+  tft.drawString(0,00,"                ");  
+  tft.drawString(0,16,"                ");
+  tft.drawString(0,32,"Bonjour,        ");
+  tft.drawString(0,48,"je suis cubya!  ");
+  tft.drawString(0,64,"Que faites vous?");
+  tft.drawString(0,80,"Je suis la pour ");
+  tft.drawString(0,96,"vous aider.     ");
+  tft.drawString(0,112,"Comment        ");
+  tft.drawString(0,128,"allez-vous ?   ");
+  tft.drawString(0,144,"               ");
 
-  //tft.drawRectangle(20,85,40,105,GREEN);
-  //tft.drawCircle(60,95,10,BLUE);
-  //tft.drawTriangle(90,85, 80,105, 100,105, RED);
-  //tft.drawTriangle(100,95, 90,115, 110,115, RED);
 
   if (! bmpReadHeader()) {
     log("bad bmp\r\n");