Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery

Conflicts:
	app/src/processing/app/Preferences.java
	app/src/processing/app/debug/Uploader.java

2 files changed, 0 insertions, 87 deletions

diff --git a/libraries/Robot_Control/examples/learn/keyboardTest/keyboardTest.ino b/libraries/Robot_Control/examples/learn/keyboardTest/keyboardTest.ino
deleted file mode 100644
index 5bbc0e5..0000000
--- a/libraries/Robot_Control/examples/learn/keyboardTest/keyboardTest.ino
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- Keyboard Test
- 
- Check how the robot's keyboard works. This example
- sends the data about the key pressed through the
- serial port.
-
- All the buttons on the Control Board are tied up to a
- single analog input pin, in this way it is possible to multiplex a
- whole series of buttons on one single pin.
-
- It is possible to recalibrate the thresholds of the buttons using
- the Robot.keyboardCalibrate() function, that takes a 5 ints long
- array as parameter
- 
- Circuit:
- * Arduino Robot
- 
- created 1 May 2013
- by X. Yang
- modified 12 May 2013
- by D. Cuartielles
- 
- This example is in the public domain
- */
-
-#include <ArduinoRobot.h>
-
-void setup() {
-  // initialize the serial port
-  Serial.begin(9600);
-}
-
-void loop() {
-  // print out the keyboard readings
-  Serial.println(Robot.keyboardRead());
-  delay(100);
-}
diff --git a/libraries/Robot_Control/examples/learn/keyboardTest/keyboardTest.ino.orig b/libraries/Robot_Control/examples/learn/keyboardTest/keyboardTest.ino.orig
deleted file mode 100644
index 6ee6c05..0000000
--- a/libraries/Robot_Control/examples/learn/keyboardTest/keyboardTest.ino.orig
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- Keyboard Test
- 
- Check how the robot's keyboard works. This example
- sends the data about the key pressed through the
- serial port.
-
- All the buttons on the Control Board are tied up to a
- single analog input pin, in this way it is possible to multiplex a
- whole series of buttons on one single pin.
-
- It is possible to recalibrate the thresholds of the buttons using
- the Robot.keyboardCalibrate() function, that takes a 5 ints long
- array as parameter
- 
- Circuit:
- * Arduino Robot
- 
- created 1 May 2013
- by X. Yang
- modified 12 May 2013
- by D. Cuartielles
- 
- This example is in the public domain
- */
-
-#include <ArduinoRobot.h>
-
-<<<<<<< HEAD
-// it is possible to use an array to calibrate
-//int vals[] = { 0, 133, 305, 481, 724 };
-
-void setup() {
-  // initialize the serial port
-  Serial.begin(9600);
-
-  // calibrate the keyboard
-  //Robot.keyboardCalibrate(vals);//For the new robot only.
-=======
-void setup(){
-  Serial.begin(9600);
->>>>>>> f062f704463222e83390b4a954e211f0f7e6e66f
-}
-
-void loop() {
-  // print out the keyboard readings
-  Serial.println(Robot.keyboardRead());
-  delay(100);
-}