Revision 4:12d93f360e6c, committed 2014-10-01

Comitter:

embeddedartists

Date:

Wed Oct 01 11:28:38 2014 +0000

Parent:

3:0ed7f56318a5

Commit message:

Cleanup

Changed in this revision

--- a/DmTftLibrary.lib	Wed Jul 09 08:35:46 2014 +0000
+++ b/DmTftLibrary.lib	Wed Oct 01 11:28:38 2014 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/displaymodule/code/DmTftLibrary/#d263094e666d
+http://mbed.org/users/embeddedartists/code/DmTftLibrary/#eb97ccfe7c3f

--- a/main.cpp	Wed Jul 09 08:35:46 2014 +0000
+++ b/main.cpp	Wed Oct 01 11:28:38 2014 +0000
@@ -26,21 +26,14 @@
 
 
 #if 0
-  /* Displays without adapter */
-  #define DM_PIN_SPI_MOSI   D11
-  #define DM_PIN_SPI_MISO   D12
-  #define DM_PIN_SPI_SCLK   D13
+  /* Displays without adapter (DM_TFT28_105 & DM_TFT35_107) */
   #define DM_PIN_CS_TOUCH   D4
   #define DM_PIN_CS_TFT     D10
   #define DM_PIN_CS_SDCARD  D8
   #define DM_PIN_CS_FLASH   D6
 #else
-  /* Displays with adapter */
-  #define DM_PIN_SPI_MOSI   A0
-  #define DM_PIN_SPI_MISO   D9
-  #define DM_PIN_SPI_SCLK   A1
-  #define DM_PIN_CS_TOUCH   D8
-  #define DM_PIN_CS_TFT     A3
+  /* Displays with adapter (all other displays) */
+  #define DM_PIN_CS_TFT     D4
   #define DM_PIN_CS_SDCARD  D10
 #endif
 
@@ -51,13 +44,17 @@
 static InterruptIn buttonInterrupt(P2_10);
 static DigitalOut led(LED1);
 
-//DmTftHX8353C tft;  /* DM_TFT18_101 */
-//DmTftS6D0164 tft;  /* DM_TFT22_102 */
-DmTftIli9325 tft;  /* DM_TFT28_103 and DM_TFT24_104 */
-//DmTftIli9341 tft;  /* DM_TFT28_105 */
-//DmTftSsd2119 tft;   /* DM_TFT35_107 */
 
-DigitalInOut csTouch(DM_PIN_CS_TOUCH, PIN_OUTPUT, PullUp, 1);
+//DmTftHX8353C tft(p5, p7, p30, p17, p16);  /* DM-TFT18-101 if inserted in the 40-pin J12 contact */
+DmTftHX8353C tft;                         /* DM-TFT18-101 with adapter in arduino J1 contact */
+//DmTftS6D0164 tft;                         /* DM_TFT22_102 with adapter in arduino J1 contact */
+//DmTftIli9325 tft;                         /* DM_TFT28_103 and DM_TFT24_104 with adapter in arduino J1 contact */
+//DmTftIli9341 tft;                         /* DM_TFT28_105 directly in arduino J1 contact (no adapter) */
+//DmTftSsd2119 tft;                         /* DM_TFT35_107 directly in arduino J1 contact (no adapter) */
+
+#ifdef DM_PIN_CS_TOUCH
+  DigitalInOut csTouch(DM_PIN_CS_TOUCH, PIN_OUTPUT, PullUp, 1);
+#endif
 DigitalInOut csDisplay(DM_PIN_CS_TFT, PIN_OUTPUT, PullUp, 1);
 DigitalInOut csSDCard(DM_PIN_CS_SDCARD, PIN_OUTPUT, PullUp, 1);
 #ifdef DM_PIN_CS_FLASH
@@ -72,6 +69,27 @@
  * Main
  *****************************************************************************/
 
+/*
+ Hardware Setup:
+ 
+ - Jumpers JP1..JP6 should be in position 1-2
+ - Jumpers in J14 should NOT be inserted
+ - Jumper J7 should be inserted
+ - Display in connector J12 (display will be outside of base boards boundaries)
+   or in arduino socket J1 depending on display
+*/
+
+/*
+ Test Comments:
+ 
+ - This example can be used with the DM-TFT18-101 1.8" either in the 40-pin J12
+   connector or on top of the DM-ADTAU-001 board in the arduino J1 socket.
+ - The DM-TFT22-102, DM-TFT28-103 and DM-TFT24-104 must all be used on top
+   of the DM-ADTAU-001 board in the arduino J1 socket.
+ - The DM-TFT28-105 and DM-TFT35-107 displays have direct arduino pinning and
+   can be inserted directly in the J1 socket.
+*/
+
 int main (void)
 {
     tft.init();

--- a/mbed.bld	Wed Jul 09 08:35:46 2014 +0000
+++ b/mbed.bld	Wed Oct 01 11:28:38 2014 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/mbed/builds/04dd9b1680ae
\ No newline at end of file
+http://mbed.org/users/mbed_official/code/mbed/builds/552587b429a1
\ No newline at end of file