[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

@@ -28,7 +28,7 @@ public:
*/
void OperatorControl()
{
while (IsOperatorControl())
while (IsOperatorControl() && IsEnabled())
{
myRobot.ArcadeDrive(stick); // drive with arcade style (use right stick)
Wait(0.005); // wait for a motor update time

View File

@@ -27,7 +27,7 @@ public:
*/
void OperatorControl()
{
while (IsOperatorControl())
while (IsOperatorControl() && IsEnabled())
{
// Get the current going through channel 7, in Amperes.
// The PDP returns the current in increments of 0.125A.

View File

@@ -66,7 +66,7 @@ public:
*/
void OperatorControl()
{
while (IsOperatorControl())
while (IsOperatorControl() && IsEnabled())
{
// Retrieve the net displacement of the Encoder since the lsat Reset.
SmartDashboard::PutNumber("Encoder Distance", m_encoder.GetDistance());

View File

@@ -34,7 +34,7 @@ public:
void OperatorControl()
{
robotDrive.SetSafetyEnabled(false);
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

@@ -31,7 +31,7 @@ public:
* Runs the motor from the output of a Joystick.
*/
void OperatorControl() {
while (IsOperatorControl()) {
while (IsOperatorControl() && IsEnabled()) {
// Set the motor controller's output.
// This takes a number from -1 (100% speed in reverse) to +1 (100% speed forwards).
m_motor.Set(m_stick.GetY());

View File

@@ -39,7 +39,7 @@ public:
* Simultaneously displays encoder values on the SmartDashboard.
*/
void OperatorControl() {
while (IsOperatorControl()) {
while (IsOperatorControl() && IsEnabled()) {
// Set the motor controller's output.
// This takes a number from -1 (100% speed in reverse) to +1 (100% speed forwards).
m_motor.Set(m_stick.GetY());

View File

@@ -39,7 +39,7 @@ public:
*/
void OperatorControl()
{
while (IsOperatorControl())
while (IsOperatorControl() && IsEnabled())
{
// Retrieve the button values. GetRawButton will return
// true if the button is pressed and false if not.

View File

@@ -51,7 +51,7 @@ public:
*/
void OperatorControl()
{
while (IsOperatorControl())
while (IsOperatorControl() && IsEnabled())
{
// The output of GetRawButton is true/false depending on whether
// the button is pressed; Set takes a boolean for for whether to

View File

@@ -40,7 +40,7 @@ public:
void OperatorControl()
{
myRobot.SetSafetyEnabled(true);
while (IsOperatorControl())
while (IsOperatorControl() && IsEnabled())
{
myRobot.ArcadeDrive(stick); // drive with arcade style (use right stick)
Wait(0.005); // wait for a motor update time