Merge "[artf3717] Added isEnabled to Teleop Loops in Samples."

eclipse-plugins/edu.wpi.first.wpilib.plugins.java/resources/templates/examples/MecanumDrive/src/org/usfirst/frc/team190/robot/Robot.java

@@ -39,7 +39,7 @@ public class Robot extends SampleRobot {
      */
     public void operatorControl() {
         robotDrive.setSafetyEnabled(true);
-        while (isOperatorControl()) {
+        while (isOperatorControl() && isEnabled()) {
         	
         	// Use the joystick X axis for lateral movement, Y axis for forward movement, and Z axis for rotation.
         	// This sample does not use field-oriented drive, so the gyro input is set to zero.

eclipse-plugins/edu.wpi.first.wpilib.plugins.java/resources/templates/examples/MotorControl/src/org/usfirst/frc/team190/robot/Robot.java

@@ -32,7 +32,7 @@ public class Robot extends SampleRobot {
      * Runs the motor from a joystick.
      */
     public void operatorControl() {
-        while (isOperatorControl()) {
+        while (isOperatorControl() && isEnabled()) {
         	// Set the motor's output.
         	// This takes a number from -1 (100% speed in reverse) to +1 (100% speed going forward)
         	motor.set(stick.getY());

eclipse-plugins/edu.wpi.first.wpilib.plugins.java/resources/templates/examples/TankDrive/src/org/usfirst/frc/team190/robot/Robot.java

@@ -37,7 +37,7 @@ public class Robot extends SampleRobot {
      */
     public void operatorControl() {
         myRobot.setSafetyEnabled(true);
-        while (isOperatorControl()) {
+        while (isOperatorControl() && isEnabled()) {
         	myRobot.tankDrive(leftStick, rightStick);
             Timer.delay(0.005);		// wait for a motor update time
         }

eclipse-plugins/edu.wpi.first.wpilib.plugins.java/resources/templates/sample/Robot.java

@@ -48,7 +48,7 @@ public class Robot extends SampleRobot {
      */
     public void operatorControl() {
         myRobot.setSafetyEnabled(true);
-        while (isOperatorControl()) {
+        while (isOperatorControl() && isEnabled()) {
             myRobot.arcadeDrive(stick); // drive with arcade style (use right stick)
             Timer.delay(0.005);		// wait for a motor update time
         }