Diff: main.cpp

Revision:

2:ce7ced8a93bc

Parent:

0:7136ca870582

Child:

3:6cddb29fc8d0

--- a/main.cpp	Sat Jan 07 18:10:25 2017 +0000
+++ b/main.cpp	Mon Nov 27 20:36:32 2017 +0000
@@ -1,4 +1,3 @@
-#include "stm32f103c8t6.h"
 #include "mbed.h"
 #include "Arial12x12.h"
 #include "Arial24x23.h"
@@ -10,7 +9,7 @@
 const unsigned short  FOREGROUND_COLORS[] = {White, Cyan, Red, Magenta, Yellow, Orange, GreenYellow};
 const unsigned short  BACKGROUND_COLORS[] = {Black, Navy, DarkGreen, DarkCyan, Maroon};
 
-Serial          pc(PA_2, PA_3);     // serial interface with PC
+Serial          pc(USBTX, USBRX);     // serial interface with PC
 ILI9341*        tft;                // ILI9341 driver
 Timer           t;
 unsigned short  backgroundColor;
@@ -22,9 +21,8 @@
 
 int main()
 {
-    confSysClock();     //Configure system clock (72MHz HSE clock, 48MHz USB clock)
-
-    tft = new ILI9341(SPI_8, 20000000, PB_5, PB_4, PB_3, PA_15, PA_12, PA_11, "tft"); // SPI type, SPI speed, mosi, miso, sclk, cs, reset, dc
+    //tft = new ILI9341(SPI_8, 20000000, PB_5, PB_4, PB_3, PA_15, PA_12, PA_11, "tft"); // SPI type, SPI speed, mosi, miso, sclk, cs, reset, dc
+    tft = new ILI9341(SPI_8, 20000000, PA_7, PA_6, PA_1, PB_0, PB_7, PB_6, "tft"); // SPI type, SPI speed, mosi, miso, sclk, cs, reset, dc
     tft->set_orientation(orient);
     int time, time2;
     pc.baud (115200);