Nathan Yonkee / Mbed OS dm_bubbles

bubbles example

Dependencies:   DmTftLibrary

Fork of dm_bubbles by Display Module

Files at this revision

API Documentation at this revision

Revision 1:e286034c8f6a, committed 2014-07-04

Comitter:
displaymodule
Date:
Fri Jul 04 10:32:50 2014 +0000
Parent:
0:70db0a4adfce
Child:
2:43fe0d1d9259
Commit message:
Misc bugfixes

Changed in this revision

DmTftLibrary.lib Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
mbed.bld Show annotated file Show diff for this revision Revisions of this file 
--- a/DmTftLibrary.lib	Tue May 20 15:33:57 2014 +0000
+++ b/DmTftLibrary.lib	Fri Jul 04 10:32:50 2014 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/displaymodule/code/DmTftLibrary/#59be7fca4581
+http://mbed.org/users/displaymodule/code/DmTftLibrary/#6cd8c36cbdb3

--- a/main.cpp	Tue May 20 15:33:57 2014 +0000
+++ b/main.cpp	Fri Jul 04 10:32:50 2014 +0000
@@ -25,23 +25,23 @@
   } while(false)
 
 
-#if 1 /* Displays without adapter */
-#define DM_PIN_SPI_MOSI   D11
-#define DM_PIN_SPI_MISO   D12
-#define DM_PIN_SPI_SCLK   D13
-
-#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
-#define DM_PIN_CS_SDCARD  D10
+#if 1
+  /* Displays without adapter */
+  #define DM_PIN_SPI_MOSI   D11
+  #define DM_PIN_SPI_MISO   D12
+  #define DM_PIN_SPI_SCLK   D13
+  #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
+  #define DM_PIN_CS_SDCARD  D10
 #endif
 
 /******************************************************************************
@@ -54,15 +54,15 @@
 //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 */
+//DmTftIli9341 tft;  /* DM_TFT28_105 */
+DmTftSsd2119 tft;   /* DM_TFT35_107 */
 
 DigitalInOut csTouch(DM_PIN_CS_TOUCH, PIN_OUTPUT, PullUp, 1);
 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
   DigitalInOut csFlash(DM_PIN_CS_FLASH, PIN_OUTPUT, PullUp, 1);
-#endif  
+#endif
 
 /******************************************************************************
  * Global variables

--- a/mbed.bld	Tue May 20 15:33:57 2014 +0000
+++ b/mbed.bld	Fri Jul 04 10:32:50 2014 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/mbed/builds/0b3ab51c8877
\ No newline at end of file
+http://mbed.org/users/mbed_official/code/mbed/builds/04dd9b1680ae
\ No newline at end of file