Merged 1.0.2

Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	app/src/processing/app/debug/AvrdudeUploader.java
	build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino
	build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
	build/shared/examples/09.USB/Keyboard/KeyboardSerial/KeyboardSerial.ino
	build/shared/examples/09.USB/Mouse/ButtonMouseControl/ButtonMouseControl.ino
	build/shared/examples/09.USB/Mouse/JoystickMouseControl/JoystickMouseControl.ino
	hardware/arduino/boards.txt

build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino

@@ -0,0 +1,96 @@
+/*
+  Keyboard logout
+ 
+ This sketch demonstrates the Keyboard library.
+ 
+ When you connect pin 2 to ground, it performs a logout.  
+ It uses keyboard combinations to do this, as follows:
+ 
+ On Windows, CTRL-ALT-DEL followed by ALT-l
+ On Ubuntu, CTRL-ALT-DEL, and ENTER
+ On OSX, CMD-SHIFT-q
+ 
+ To wake: Spacebar. 
+ 
+ Circuit:
+ * Arduino Leonardo or Micro
+ * wire to connect D2 to ground.
+ 
+ created 6 Mar 2012
+ modified 27 Mar 2012
+ by Tom Igoe
+ 
+ This example is in the public domain
+ 
+ http://www.arduino.cc/en/Tutorial/KeyboardLogout
+ */
+ 
+#define OSX 0
+#define WINDOWS 1
+#define UBUNTU 2
+
+// change this to match your platform:
+int platform = OSX;
+
+void setup() {
+  // make pin 2 an input and turn on the 
+  // pullup resistor so it goes high unless
+  // connected to ground:
+  pinMode(2, INPUT_PULLUP);
+  Keyboard.begin();
+}
+ 
+void loop() {
+  while (digitalRead(2) == HIGH) {
+    // do nothing until pin 2 goes low
+    delay(500);
+  }
+  delay(1000);
+
+  switch (platform) {
+  case OSX:
+    Keyboard.press(KEY_LEFT_GUI);
+    // Shift-Q logs out:
+    Keyboard.press(KEY_LEFT_SHIFT); 
+    Keyboard.press('Q');
+    delay(100);
+    Keyboard.releaseAll();
+    // enter:
+    Keyboard.write(KEY_RETURN);  
+    break;
+  case WINDOWS:
+    // CTRL-ALT-DEL:
+    Keyboard.press(KEY_LEFT_CTRL);
+    Keyboard.press(KEY_LEFT_ALT);
+    Keyboard.press(KEY_DELETE);
+    delay(100);
+    Keyboard.releaseAll();
+    //ALT-s:
+    delay(2000);
+    Keyboard.press(KEY_LEFT_ALT);
+    Keyboard.press('l');
+    Keyboard.releaseAll();
+    break;
+  case UBUNTU:
+    // CTRL-ALT-DEL:
+    Keyboard.press(KEY_LEFT_CTRL);
+    Keyboard.press(KEY_LEFT_ALT);
+    Keyboard.press(KEY_DELETE);
+    delay(1000);
+    Keyboard.releaseAll();
+    // Enter to confirm logout:
+    Keyboard.write(KEY_RETURN);
+    break;
+  }
+
+  // do nothing:
+  while(true);
+}
+
+
+
+
+
+
+
+

build/shared/examples/09.USB/Keyboard/KeyboardMessage/KeyboardMessage.ino

@@ -1,7 +1,7 @@
 /* 
  Keyboard Button test
 
- For Leonardo and Due boards only.
+ For the Arduino Leonardo, Micro and Due boards.
  
  Sends a text string when a button is pressed.
  

build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino

@@ -13,7 +13,7 @@
  a final key combination (CTRL-U).
  
  Circuit:
- * Arduino Leonardo or Arduino Due
+ * Arduino Leonardo, Micro or Due
  * wire to connect D2 to ground.
  
  created 5 Mar 2012

build/shared/examples/09.USB/Keyboard/KeyboardSerial/KeyboardSerial.ino

@@ -1,7 +1,7 @@
 /* 
  Keyboard test
  
- For Leonardo and Due boards only
+ For the Arduino Leonardo, Micro or Due
  
  Reads a byte from the serial port, sends a keystroke back.
  The sent keystroke is one higher than what's received, e.g.
@@ -14,14 +14,14 @@
  modified 27 Mar 2012
  by Tom Igoe
  
-This example code is in the public domain.
+ This example code is in the public domain.
  
  http://www.arduino.cc/en/Tutorial/KeyboardSerial
  */
 
 void setup() {
   // open the serial port:
-Serial.begin(9600);
+  Serial.begin(9600);
   // initialize control over the keyboard:
   Keyboard.begin();
 }

build/shared/examples/09.USB/KeyboardAndMouseControl/KeyboardAndMouseControl.ino

@@ -2,14 +2,11 @@
 /*
   KeyboardAndMouseControl
 
- For Leonardo and Due boards only.
- 
- Controls the mouse from five pushbuttons on an Arduino Leonardo.
+ Controls the mouse from five pushbuttons on an Arduino Leonardo, Micro or Due.
  
  Hardware:
  * 5 pushbuttons attached to D2, D3, D4, D5, D6
  
- 
  The mouse movement is always relative. This sketch reads 
  four pushbuttons, and uses them to set the movement of the mouse.
  

build/shared/examples/09.USB/Mouse/ButtonMouseControl/ButtonMouseControl.ino

@@ -4,7 +4,7 @@
 
  For Leonardo and Due boards only.  
  
- Controls the mouse from five pushbuttons on an Arduino Leonardo or Due.
+ Controls the mouse from five pushbuttons on an Arduino Leonardo, Micro or Due.
  
  Hardware:
  * 5 pushbuttons attached to D2, D3, D4, D5, D6

build/shared/examples/09.USB/Mouse/JoystickMouseControl/JoystickMouseControl.ino

@@ -1,9 +1,7 @@
 /*
   JoystickMouseControl
  
- For Leonardo and Due boards only. 
- 
- Controls the mouse from a joystick on an Arduino Leonardo or Due.
+ Controls the mouse from a joystick on an Arduino Leonardo, Micro or Due.
  Uses a pushbutton to turn on and off mouse control, and
  a second pushbutton to click the left mouse button