Merge branch 'ide-1.5.x' into ide-1.5.x-avr-toolchain-gcc-4.8.1

Author: Federico Fissore

README.md

@@ -40,5 +40,5 @@ Gianluca Martino, Daniela Antonietti, and David A. Mellis.
 Arduino uses the [GNU avr-gcc toolchain](http://gcc.gnu.org/wiki/avr-gcc), [avrdude](http://www.nongnu.org/avrdude/), [avr-libc](http://www.nongnu.org/avr-libc/), and code from
 [Processing](http://www.processing.org) and [Wiring](http://wiring.org.co).
 
-Icon and about image designed by ToDo: http://www.todo.to.it/
+Icon and about image designed by [ToDo](http://www.todo.to.it/)
 

hardware/arduino/avr/cores/arduino/HardwareSerial.cpp

@@ -72,7 +72,7 @@ void serialEventRun(void)
   if (Serial2_available && serialEvent2 && Serial2_available()) serialEvent2();
 #endif
 #if defined(HAVE_HWSERIAL3)
-  if (Serial3_available && serialEvent2 && Serial3_available()) serialEvent3();
+  if (Serial3_available && serialEvent3 && Serial3_available()) serialEvent3();
 #endif
 }
 

libraries/Bridge/examples/SpacebrewYun/inputOutput/inputOutput.ino

@@ -2,23 +2,23 @@
   Input Output
 
  Demonstrates how to create a sketch that sends and receives all standard
- spacebrew data types, and a custom data type. Every time data is
+ spacebrew data types, and a custom data type. Every time data is 
  received it is output to the Serial monitor.
 
- Make sure that your Yun is connected to the internet for this example
+ Make sure that your Yun is connected to the internet for this example 
  to function properly.
-
+ 
  The circuit:
  - No circuit required
-
+ 
  created 2013
  by Julio Terra
-
+ 
  This example code is in the public domain.
-
- More information about Spacebrew is available at:
+ 
+ More information about Spacebrew is available at: 
  http://spacebrew.cc/
-
+ 
  */
 
 #include <Bridge.h>
@@ -33,100 +33,100 @@ int interval = 2000;
 
 int counter = 0;
 
-void setup() {
-
-  // start the serial port
-  Serial.begin(57600);
+void setup() { 
 
-  // for debugging, wait until a serial console is connected
-  delay(4000);
-  while (!Serial) {
-    ;
-  }
+	// start the serial port
+	Serial.begin(57600);
 
-  // start-up the bridge
-  Bridge.begin();
+	// for debugging, wait until a serial console is connected
+	delay(4000);
+	while (!Serial) { ; }
 
-  // configure the spacebrew object to print status messages to serial
-  sb.verbose(true);
+	// start-up the bridge
+	Bridge.begin();
 
-  // configure the spacebrew publisher and subscriber
-  sb.addPublish("string test", "string");
-  sb.addPublish("range test", "range");
-  sb.addPublish("boolean test", "boolean");
-  sb.addPublish("custom test", "crazy");
-  sb.addSubscribe("string test", "string");
-  sb.addSubscribe("range test", "range");
-  sb.addSubscribe("boolean test", "boolean");
-  sb.addSubscribe("custom test", "crazy");
+	// configure the spacebrew object to print status messages to serial
+	sb.verbose(true);
 
-  // register the string message handler method
-  sb.onRangeMessage(handleRange);
-  sb.onStringMessage(handleString);
-  sb.onBooleanMessage(handleBoolean);
-  sb.onCustomMessage(handleCustom);
+	// configure the spacebrew publisher and subscriber
+	sb.addPublish("string test", "string");
+	sb.addPublish("range test", "range");
+	sb.addPublish("boolean test", "boolean");
+	sb.addPublish("custom test", "crazy");
+	sb.addSubscribe("string test", "string");
+	sb.addSubscribe("range test", "range");
+	sb.addSubscribe("boolean test", "boolean");
+	sb.addSubscribe("custom test", "crazy");
 
-  // connect to cloud spacebrew server at "sandbox.spacebrew.cc"
-  sb.connect("sandbox.spacebrew.cc");
+	// register the string message handler method 
+	sb.onRangeMessage(handleRange);
+	sb.onStringMessage(handleString);
+	sb.onBooleanMessage(handleBoolean);
+	sb.onCustomMessage(handleCustom);
 
-}
+	// connect to cloud spacebrew server at "sandbox.spacebrew.cc"
+	sb.connect("sandbox.spacebrew.cc"); 
+	// we give some time to arduino to connect to sandbox, otherwise the first sb.monitor(); call will give an error
+	delay(1000);
+} 
 
 
-void loop() {
-  // monitor spacebrew connection for new data
-  sb.monitor();
+void loop() { 
+	// monitor spacebrew connection for new data
+	sb.monitor();
 
-  // connected to spacebrew then send a string every 2 seconds
-  if ( sb.connected() ) {
+	// connected to spacebrew then send a string every 2 seconds
+	if ( sb.connected() ) {
 
-    // check if it is time to send a new message
-    if ( (millis() - last) > interval ) {
-      String test_str_msg = "testing, testing, ";
-      test_str_msg += counter;
-      counter ++;
+		// check if it is time to send a new message
+		if ( (millis() - last) > interval ) {
+			String test_str_msg = "testing, testing, ";
+			test_str_msg += counter;
+			counter ++;
 
-      sb.send("string test", test_str_msg);
-      sb.send("range test", 500);
-      sb.send("boolean test", true);
-      sb.send("custom test", "youre loco");
+			sb.send("string test", test_str_msg);
+			sb.send("range test", 500);
+			sb.send("boolean test", true);
+			sb.send("custom test", "youre loco");
 
-      last = millis();
+			last = millis();
 
-    }
-  }
-}
+		}
+	}
+	delay(1000);
+} 
 
 // define handler methods, all standard data type handlers take two appropriate arguments
 
 void handleRange (String route, int value) {
-  Serial.print("Range msg ");
-  Serial.print(route);
-  Serial.print(", value ");
-  Serial.println(value);
+	Serial.print("Range msg ");
+	Serial.print(route);
+	Serial.print(", value ");
+	Serial.println(value);
 }
 
 void handleString (String route, String value) {
-  Serial.print("String msg ");
-  Serial.print(route);
-  Serial.print(", value ");
-  Serial.println(value);
+	Serial.print("String msg ");
+	Serial.print(route);
+	Serial.print(", value ");
+	Serial.println(value);
 }
 
 void handleBoolean (String route, boolean value) {
-  Serial.print("Boolen msg ");
-  Serial.print(route);
-  Serial.print(", value ");
-  Serial.println(value ? "true" : "false");
+	Serial.print("Boolen msg ");
+	Serial.print(route);
+	Serial.print(", value ");
+	Serial.println(value ? "true" : "false");
 }
 
 // custom data type handlers takes three String arguments
 
 void handleCustom (String route, String value, String type) {
-  Serial.print("Custom msg ");
-  Serial.print(route);
-  Serial.print(" of type ");
-  Serial.print(type);
-  Serial.print(", value ");
-  Serial.println(value);
+	Serial.print("Custom msg ");
+	Serial.print(route);
+	Serial.print(" of type ");
+	Serial.print(type);
+	Serial.print(", value ");
+	Serial.println(value);
 }
 

libraries/Bridge/examples/SpacebrewYun/spacebrewBoolean/spacebrewBoolean.ino

@@ -1,26 +1,26 @@
 /*
   Spacebrew Boolean
-
+ 
  Demonstrates how to create a sketch that sends and receives a
- boolean value to and from Spacebrew. Every time the buttton is
- pressed (or other digital input component) a spacebrew message
- is sent. The sketch also accepts analog range messages from
+ boolean value to and from Spacebrew. Every time the buttton is 
+ pressed (or other digital input component) a spacebrew message 
+ is sent. The sketch also accepts analog range messages from 
  other Spacebrew apps.
 
- Make sure that your Yun is connected to the internet for this example
+ Make sure that your Yun is connected to the internet for this example 
  to function properly.
-
+ 
  The circuit:
  - Button connected to Yun, using the Arduino's internal pullup resistor.
-
+ 
  created 2013
  by Julio Terra
-
+ 
  This example code is in the public domain.
-
- More information about Spacebrew is available at:
+ 
+ More information about Spacebrew is available at: 
  http://spacebrew.cc/
-
+ 
  */
 
 #include <Bridge.h>
@@ -33,59 +33,57 @@ SpacebrewYun sb = SpacebrewYun("spacebrewYun Boolean", "Boolean sender and recei
 int last_value = 0;
 
 // create variables to manage interval between each time we send a string
-void setup() {
+void setup() { 
 
-  // start the serial port
-  Serial.begin(57600);
+	// start the serial port
+	Serial.begin(57600);
 
-  // for debugging, wait until a serial console is connected
-  delay(4000);
-  while (!Serial) {
-    ;
-  }
+	// for debugging, wait until a serial console is connected
+	delay(4000);
+	while (!Serial) { ; }
 
-  // start-up the bridge
-  Bridge.begin();
+	// start-up the bridge
+	Bridge.begin();
 
-  // configure the spacebrew object to print status messages to serial
-  sb.verbose(true);
+	// configure the spacebrew object to print status messages to serial
+	sb.verbose(true);
 
-  // configure the spacebrew publisher and subscriber
-  sb.addPublish("physical button", "boolean");
-  sb.addSubscribe("virtual button", "boolean");
+	// configure the spacebrew publisher and subscriber
+	sb.addPublish("physical button", "boolean");
+	sb.addSubscribe("virtual button", "boolean");
 
-  // register the string message handler method
-  sb.onBooleanMessage(handleBoolean);
+	// register the string message handler method 
+	sb.onBooleanMessage(handleBoolean);
 
-  // connect to cloud spacebrew server at "sandbox.spacebrew.cc"
-  sb.connect("sandbox.spacebrew.cc");
+	// connect to cloud spacebrew server at "sandbox.spacebrew.cc"
+	sb.connect("sandbox.spacebrew.cc"); 
 
-  pinMode(3, INPUT);
-  digitalWrite(3, HIGH);
-}
+	pinMode(3, INPUT);
+	digitalWrite(3, HIGH);
+} 
 
 
-void loop() {
-  // monitor spacebrew connection for new data
-  sb.monitor();
+void loop() { 
+	// monitor spacebrew connection for new data
+	sb.monitor();
 
-  // connected to spacebrew then send a new value whenever the pot value changes
-  if ( sb.connected() ) {
-    int cur_value = digitalRead(3);
-    if ( last_value != cur_value ) {
-      if (cur_value == HIGH) sb.send("physical button", false);
-      else sb.send("physical button", true);
-      last_value = cur_value;
-    }
-  }
-}
+	// connected to spacebrew then send a new value whenever the pot value changes
+	if ( sb.connected() ) {
+		int cur_value = digitalRead(3);
+		if ( last_value != cur_value ) {
+			if (cur_value == HIGH) sb.send("physical button", false);
+			else sb.send("physical button", true);
+			last_value = cur_value;
+		}
+	}
+} 
 
-// handler method that is called whenever a new string message is received
+// handler method that is called whenever a new string message is received 
 void handleBoolean (String route, boolean value) {
-  // print the message that was received
-  Serial.print("From ");
-  Serial.print(route);
-  Serial.print(", received msg: ");
-  Serial.println(value ? "true" : "false");
+	// print the message that was received
+	Serial.print("From ");
+	Serial.print(route);
+	Serial.print(", received msg: ");
+	Serial.println(value ? "true" : "false");
 }