Diff: main.cpp

Revision:

1:3644b10bce2f

Parent:

0:f2565808eea5

Child:

3:bc163d555ddc

--- a/main.cpp	Sat Jun 04 04:40:58 2016 +0000
+++ b/main.cpp	Thu Jun 09 05:30:21 2016 +0000
@@ -8,13 +8,13 @@
 
 
 CAN can1(D9, D10);
-/*
 USBSerial virtualUART(VID, PID, VERSION, false);
 USBSLCAN slcan(virtualUART, can1);
-*/
 
+/*
 Serial hwUART(USBTX, USBRX);
 SerialSLCAN slcan(hwUART, can1);
+*/
 
 Timer timer;
 DigitalOut led(LED1);
@@ -25,15 +25,15 @@
     //can1.frequency(500000);
     //can1.mode(CAN::Silent);
     
-    //virtualUART.connect(false);
-    hwUART.baud(115200);
+    virtualUART.connect(false);
+    //hwUART.baud(115200);
 
     led = 0;
     led2 = 1;
     while(1) {
         bool active = false;
-        active = slcan.update();
-        /*
+        //active = slcan.update();
+        
         if (virtualUART.configured()) {
             led2 = 0;
             active = slcan.update();
@@ -41,7 +41,7 @@
             led2 = 1;
             virtualUART.connect(false);
         }
-        */
+        
         
         if (active) {
             timer.reset();