Diff: main.cpp

Revision:

4:86d291139659

Parent:

3:9b242573a271

Child:

5:b69870b843f3

--- a/main.cpp	Mon Jun 26 13:25:39 2017 +0000
+++ b/main.cpp	Tue Jun 27 12:24:54 2017 +0000
@@ -1,18 +1,28 @@
+//#define USB_STM_HAL
+//#define DISCO
+
 #include "mbed.h"
 #include "TS_DISCO_F429ZI.h"
 #include "LCD_DISCO_F429ZI.h"
-#include "SWO.h"
 #include "USBSerial.h"
 
-//LCD_DISCO_F429ZI lcd;
-//TS_DISCO_F429ZI ts;    
-SWO_Channel swo; //solder binding SB9 on disco required
+LCD_DISCO_F429ZI lcd;
+TS_DISCO_F429ZI ts;
+
+USBSerial ser;
 
 int main()
 {
-    swo.printf("init usbser\r\n");
-    USBSerial usbser;
-    /* TS_StateTypeDef TS_State;
+    while (1) {
+        ser.printf("test OK\r\n");
+    }
+}
+
+
+/*
+int main()
+{
+    TS_StateTypeDef TS_State;
     uint16_t x, y;
     uint8_t text[30];
     uint8_t status;
@@ -49,8 +59,7 @@
     
     while(1)
     {
-      swo.printf("test\r\n");
-      usbser.printf("test from usb\r\n");
+      
       ts.GetState(&TS_State);      
       if (TS_State.TouchDetected)
       {
@@ -59,10 +68,6 @@
         sprintf((char*)text, "x=%d y=%d    ", x, y);
         lcd.DisplayStringAt(0, LINE(0), (uint8_t *)&text, LEFT_MODE);
       }
-    }*/
-    while(1)
-    {
-      swo.printf("test\r\n");
-      usbser.printf("test from usb\r\n");
     }
 }
+*/
\ No newline at end of file