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

1 files changed, 0 insertions, 44 deletions

diff --git a/libraries/Stepper/examples/stepper_oneStepAtATime/stepper_oneStepAtATime.ino b/libraries/Stepper/examples/stepper_oneStepAtATime/stepper_oneStepAtATime.ino
deleted file mode 100644
index 36d3299..0000000
--- a/libraries/Stepper/examples/stepper_oneStepAtATime/stepper_oneStepAtATime.ino
+++ /dev/null
@@ -1,44 +0,0 @@
-
-/* 
- Stepper Motor Control - one step at a time
- 
- This program drives a unipolar or bipolar stepper motor. 
- The motor is attached to digital pins 8 - 11 of the Arduino.
- 
- The motor will step one step at a time, very slowly.  You can use this to
- test that you've got the four wires of your stepper wired to the correct
- pins. If wired correctly, all steps should be in the same direction.
- 
- Use this also to count the number of steps per revolution of your motor,
- if you don't know it.  Then plug that number into the oneRevolution
- example to see if you got it right.
- 
- Created 30 Nov. 2009
- by Tom Igoe
- 
- */
-
-#include <Stepper.h>
-
-const int stepsPerRevolution = 200;  // change this to fit the number of steps per revolution
-                                     // for your motor
-
-// initialize the stepper library on pins 8 through 11:
-Stepper myStepper(stepsPerRevolution, 8,9,10,11);            
-
-int stepCount = 0;         // number of steps the motor has taken
-
-void setup() {
-  // initialize the serial port:
-  Serial.begin(9600);
-}
-
-void loop() {
-  // step one step:
-  myStepper.step(1);
-  Serial.print("steps:" );
-  Serial.println(stepCount);
-  stepCount++;
-  delay(500);
-}
-