Updated YunSerialTerminal

1 files changed, 3 insertions, 5 deletions

diff --git a/libraries/Bridge/examples/YunSerialTerminal/YunSerialTerminal.ino b/libraries/Bridge/examples/YunSerialTerminal/YunSerialTerminal.ino
index 019babf..dea2ef5 100644
--- a/libraries/Bridge/examples/YunSerialTerminal/YunSerialTerminal.ino
+++ b/libraries/Bridge/examples/YunSerialTerminal/YunSerialTerminal.ino
@@ -20,11 +20,7 @@
  This example code is in the public domain.
  */
 
-<<<<<<< HEAD
-long baud = 9600;
-=======
-long baud = 57600;
->>>>>>> 113e28d86188899e529ced3fed04e4116e3f5a88
+long baud = 115200;
 
 // Pin 13 has an LED connected on most Arduino boards.
 // give it a name:
@@ -35,6 +31,8 @@ int ledState = HIGH;   // whether the LED is high or low
 void setup() {
   Serial.begin(baud);        // open serial connection to Linino
   Serial1.begin(baud);       // open serial connection via USB-Serial
+  Serial.println("Prova");   // Hello USB
+  Serial1.println("Prova1"); // Hello Linino
 
   // initialize the digital pin as an output.
   pinMode(led, OUTPUT);