From 35e19c59f80db44890fc798ba71b9c4d2d193534 Mon Sep 17 00:00:00 2001 From: Harel Dor Date: Sat, 12 Mar 2016 12:51:47 -0800 Subject: [PATCH] Swap left and right, add option to do nothing in auton --- src/org/usfirst/frc/team3501/robot/Constants.java | 8 ++++---- src/org/usfirst/frc/team3501/robot/Robot.java | 10 +++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java index e5c4c4e7..7729a2ff 100644 --- a/src/org/usfirst/frc/team3501/robot/Constants.java +++ b/src/org/usfirst/frc/team3501/robot/Constants.java @@ -45,10 +45,10 @@ public class Constants { public static final double kADJUST = 8; // Drivetrain Motor related ports - public static final int DRIVE_FRONT_LEFT = 1; - public static final int DRIVE_REAR_LEFT = 2; - public static final int DRIVE_FRONT_RIGHT = 6; - public static final int DRIVE_REAR_RIGHT = 5; + public static final int DRIVE_FRONT_LEFT = 6; + public static final int DRIVE_REAR_LEFT = 5; + public static final int DRIVE_FRONT_RIGHT = 1; + public static final int DRIVE_REAR_RIGHT = 2; // Drivetrain shifter related ports public static final int LEFT_SHIFT_MODULE = PCM_MODULE_B; diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index bb06782c..7cde18d7 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -47,7 +47,8 @@ public class Robot extends IterativeRobot { } private void addPositionChooserOptions() { - positionChooser.addDefault("Position 1", 1); + positionChooser.addDefault("None", 0); + positionChooser.addObject("Position 1", 1); positionChooser.addObject("Position 2", 2); positionChooser.addObject("Position 3", 3); positionChooser.addObject("Position 4", 4); @@ -100,8 +101,11 @@ public class Robot extends IterativeRobot { else if (chosenPosition == 5) chosenDefense = (Defense) positionFiveDefense.getSelected(); - Scheduler.getInstance().add( - new ChooseStrategy(chosenPosition, chosenDefense)); + if (chosenPosition != 0) + Scheduler.getInstance().add( + new ChooseStrategy(chosenPosition, chosenDefense)); + + // Scheduler.getInstance().add(new TimeDrive(.6, 4)); } @Override -- 2.30.2