Diff: main.cpp

Revision:

3:9b242573a271

Parent:

0:91c6ab790bd7

Child:

4:86d291139659

--- a/main.cpp	Wed Jun 07 09:16:28 2017 +0200
+++ b/main.cpp	Mon Jun 26 13:25:39 2017 +0000
@@ -1,13 +1,18 @@
 #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;
+//LCD_DISCO_F429ZI lcd;
+//TS_DISCO_F429ZI ts;    
+SWO_Channel swo; //solder binding SB9 on disco required
 
 int main()
 {
-    TS_StateTypeDef TS_State;
+    swo.printf("init usbser\r\n");
+    USBSerial usbser;
+    /* TS_StateTypeDef TS_State;
     uint16_t x, y;
     uint8_t text[30];
     uint8_t status;
@@ -44,7 +49,8 @@
     
     while(1)
     {
-      
+      swo.printf("test\r\n");
+      usbser.printf("test from usb\r\n");
       ts.GetState(&TS_State);      
       if (TS_State.TouchDetected)
       {
@@ -53,5 +59,10 @@
         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");
     }
 }