noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
tigoe 2013-05-30 23:11:13 -04:00
parent a49a2e3c2e 113e28d861
commit bcacf68108
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/arduino/avr/libraries/Bridge/Bridge.h
View File

@ -94,7 +94,7 @@ public:
}
void begin() {
serial.begin(115200);
serial.begin(57600);
BridgeClass::begin();
}

6
hardware/arduino/avr/libraries/Bridge/examples/YunSerialTerminal/YunSerialTerminal.ino
View File

@ -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);