[artf3717] Added isEnabled to Teleop Loops in Samples.

Anywhere in the sample programs where there was just a
isOperatorControl() in the while loop for Teleop, added an "&&
isEnabled()".

Change-Id: Ib81e8bab79923e262c314a073a591855cbf06846
This commit is contained in:
James Kuszmaul
2014-10-27 15:52:37 -04:00
parent 5b2520c35f
commit 767686ae2e
13 changed files with 13 additions and 13 deletions

View File

@@ -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.

View File

@@ -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());

View File

@@ -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
}

View File

@@ -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
}