Merge branch 'ide-1.5.x-discovery' of https://github.com/arduino/DogStick into ide-1.5.x-discovery

Conflicts:

hardware/arduino/avr/libraries/Bridge/examples/YunSerialTerminal/YunSeri
alTerminal.ino

2 files changed, 5 insertions, 3 deletions

diff --git a/libraries/Bridge/Bridge.h b/libraries/Bridge/Bridge.h
index f85fa07..dbe9c7d 100644
--- a/libraries/Bridge/Bridge.h
+++ b/libraries/Bridge/Bridge.h
@@ -94,7 +94,7 @@ public:
   }
   
   void begin() {
-    serial.begin(115200);
+    serial.begin(57600);
     BridgeClass::begin();
   }
   
diff --git a/libraries/Bridge/examples/YunSerialTerminal/YunSerialTerminal.ino b/libraries/Bridge/examples/YunSerialTerminal/YunSerialTerminal.ino
index a85f179..019babf 100644
--- a/libraries/Bridge/examples/YunSerialTerminal/YunSerialTerminal.ino
+++ b/libraries/Bridge/examples/YunSerialTerminal/YunSerialTerminal.ino
@@ -20,7 +20,11 @@
  This example code is in the public domain.
  */
 
+<<<<<<< HEAD
 long baud = 9600;
+=======
+long baud = 57600;
+>>>>>>> 113e28d86188899e529ced3fed04e4116e3f5a88
 
 // Pin 13 has an LED connected on most Arduino boards.
 // give it a name:
@@ -31,8 +35,6 @@ 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);