Diff: main.cpp

Revision:

9:dcec1d7491f2

Parent:

8:8d49c965b3ec

--- a/main.cpp	Mon Dec 18 18:46:21 2017 +0000
+++ b/main.cpp	Wed Jan 15 08:12:20 2020 +0000
@@ -10,30 +10,19 @@
 #include "mbed.h"
 #include "mbed_logo.h"
 #include "SSD1308.h"
+#include "USBSerial.h"
+ 
+// Host PC Communication channels
+USBSerial pc;
 
-#if defined(TARGET_LPC1768)
-//Pin Defines for I2C Bus
-//#define D_SDA                  p9
-//#define D_SCL                  p10
-#define D_SDA                  p28
-#define D_SCL                  p27
-#endif
-
-#if defined(TARGET_NUCLEO_F401RE)
 #define D_SDA                  PB_9
 #define D_SCL                  PB_8
-#endif
 
-#if defined(TARGET_KL25Z)
-// I2C for KL25Z
-#define D_SCL                  PTE1
-#define D_SDA                  PTE0
-#endif
 
 I2C i2c(D_SDA, D_SCL);
 
 //Host PC Baudrate (Virtual Com Port on USB)
-#define D_BAUDRATE            9600
+//#define D_BAUDRATE            9600
 //#define D_BAUDRATE            57600
 
 // mbed Interface Hardware definitions
@@ -42,8 +31,6 @@
 DigitalOut myled3(LED3);
 DigitalOut heartbeatLED(LED4);
 
-// Host PC Communication channels
-Serial pc(USBTX, USBRX); // tx, rx
 
 // Instantiate OLED
 SSD1308 oled = SSD1308(&i2c, SSD1308_SA0);
@@ -76,24 +63,8 @@
 void oled_Test() {
   pc.printf("OLED test start\r"); 
 
-#if defined(TARGET_LPC1768)
-  pc.printf("\r\nHello World from LPC1768\r\n");
-#endif  
-#if defined(TARGET_KL25Z)
-  pc.printf("\r\nHello World from KL25Z\r\n");
-#endif  
-#if defined(TARGET_LPC812)
-  pc.printf("\r\nHello World from LPC812\r\n");
-#endif
-#if defined(TARGET_LPC1549)
-  pc.printf("Hello World from LPC1549\n\r");    
-#endif  
-#if defined(TARGET_NUCLEO_F401RE)
-  pc.printf("Hello World from ST32F401RE\n\r");    
-#endif  
-#if defined(TARGET_NUCLEO_F103RB)
-  pc.printf("Hello World from ST32F103RB\n\r");    
-#endif  
+
+  pc.printf("Hello World from ST32F401RE\n\r");      
  
   
 //  oled.writeString(0, 0, 13, "Hello World !");
@@ -147,11 +118,6 @@
 
 
 void init_interfaces() {
-    // Init Host PC communication, default is 9600
-    pc.baud(D_BAUDRATE);
-      
-    // Init I/F hardware
-//    i2c.frequency(100000);
     i2c.frequency(400000); // according to the spec the max bitrate for the SSD1308 is 400 kbit/s
 }