fix merge conflicts position-aware-autonomous
authorDavid <david.dobervich@gmail.com>
Fri, 20 Nov 2015 18:34:54 +0000 (10:34 -0800)
committerDavid <david.dobervich@gmail.com>
Fri, 20 Nov 2015 18:34:54 +0000 (10:34 -0800)
14 files changed:
1  2 
.gitignore
src/org/usfirst/frc3501/RiceCatRobot/commands/CloseClaw.java
src/org/usfirst/frc3501/RiceCatRobot/commands/DriveFor.java
src/org/usfirst/frc3501/RiceCatRobot/commands/MoveArmFor.java
src/org/usfirst/frc3501/RiceCatRobot/commands/OpenClaw.java
src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleClaw.java
src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleCompressor.java
src/org/usfirst/frc3501/RiceCatRobot/commands/TurnFor.java
src/org/usfirst/frc3501/RiceCatRobot/robot/OI.java
src/org/usfirst/frc3501/RiceCatRobot/robot/Robot.java
src/org/usfirst/frc3501/RiceCatRobot/robot/RobotMap.java
src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java
src/org/usfirst/frc3501/RiceCatRobot/subsystems/Claw.java
src/org/usfirst/frc3501/RiceCatRobot/subsystems/DriveTrain.java

diff --cc .gitignore
index 227a01040b143d348eaaaddfe59f53c2c2213ec1,0686dad847402fbf6a328b8b8fda535f9e62358f..2040e4c462d34b435fc1819c0821c57e25a58bd6
@@@ -1,8 -1,15 +1,21 @@@
++<<<<<<< HEAD
++=======
+ # -*- mode: gitignore; -*-
+ *~
+ \#*\#
+ .\#*
++>>>>>>> c7a54f8e92507c36aeefbd99783e0811402b34b5
  *.pydevproject
  .metadata
  .gradle
  bin/
  tmp/
++<<<<<<< HEAD
++=======
+ build/
+ dist/
+ sysProps.xml
++>>>>>>> c7a54f8e92507c36aeefbd99783e0811402b34b5
  *.tmp
  *.bak
  *.swp
@@@ -39,4 -46,4 +52,8 @@@ local.propertie
  .texlipse
  
  # STS (Spring Tool Suite)
- .springBeans
++<<<<<<< HEAD
+ .springBeans
++=======
++.springBeans
++>>>>>>> c7a54f8e92507c36aeefbd99783e0811402b34b5
index 6bebe5445fcff4c3ac02fce576614f2f1a109c44,0000000000000000000000000000000000000000..9c391da8b03d72748a7ae832f7e63c107121c63a
mode 100644,000000..100644
--- /dev/null
@@@ -1,31 -1,0 +1,31 @@@
-     public static Joystick leftJoystick;
-     public static Joystick rightJoystick;
-     public static JoystickButton trigger;
-     public static JoystickButton toggleCompressor;
-     public static JoystickButton toggleClaw;
 +package org.usfirst.frc3501.RiceCatRobot.robot;
 +
 +import org.usfirst.frc3501.RiceCatRobot.commands.ToggleClaw;
 +import org.usfirst.frc3501.RiceCatRobot.commands.ToggleCompressor;
 +
 +import edu.wpi.first.wpilibj.Joystick;
 +import edu.wpi.first.wpilibj.buttons.JoystickButton;
 +
 +public class OI {
-     public OI() {
-         System.out.println("OI is open");
-         leftJoystick = new Joystick(RobotMap.LEFT_STICK_PORT);
-         rightJoystick = new Joystick(RobotMap.RIGHT_STICK_PORT);
++  public static Joystick leftJoystick;
++  public static Joystick rightJoystick;
++  public static JoystickButton trigger;
++  public static JoystickButton toggleCompressor;
++  public static JoystickButton toggleClaw;
 +
-         trigger = new JoystickButton(rightJoystick, RobotMap.TRIGGER_PORT);
++  public OI() {
++    System.out.println("OI is open");
++    leftJoystick = new Joystick(RobotMap.LEFT_STICK_PORT);
++    rightJoystick = new Joystick(RobotMap.RIGHT_STICK_PORT);
 +
-         toggleClaw = new JoystickButton(rightJoystick, RobotMap.TOGGLE_PORT);
-         toggleClaw.whenPressed(new ToggleClaw());
++    trigger = new JoystickButton(rightJoystick, RobotMap.TRIGGER_PORT);
 +
-         toggleCompressor = new JoystickButton(rightJoystick,
-                 RobotMap.TOGGLE_COMPRESSOR_PORT);
-         toggleCompressor.whenPressed(new ToggleCompressor());
++    toggleClaw = new JoystickButton(rightJoystick, RobotMap.TOGGLE_PORT);
++    toggleClaw.whenPressed(new ToggleClaw());
 +
-     }
++    toggleCompressor = new JoystickButton(rightJoystick,
++        RobotMap.TOGGLE_COMPRESSOR_PORT);
++    toggleCompressor.whenPressed(new ToggleCompressor());
 +
++  }
 +}
index 1191d0e17b00f393cd8a03caa7aeba51fe61d54c,0000000000000000000000000000000000000000..e83f800531d8d2c901e41e88b4e8eac5caaac0f7
mode 100644,000000..100644
--- /dev/null
@@@ -1,69 -1,0 +1,69 @@@
-     static Timer timer;
-     public static OI oi;
-     public static DriveTrain driveTrain;
-     public static Arm arm;
-     public static Claw claw;
-     public static Compressor compressor;
 +package org.usfirst.frc3501.RiceCatRobot.robot;
 +
 +import org.usfirst.frc3501.RiceCatRobot.subsystems.Arm;
 +import org.usfirst.frc3501.RiceCatRobot.subsystems.Claw;
 +import org.usfirst.frc3501.RiceCatRobot.subsystems.DriveTrain;
 +
 +import edu.wpi.first.wpilibj.Compressor;
 +import edu.wpi.first.wpilibj.IterativeRobot;
 +import edu.wpi.first.wpilibj.Timer;
 +import edu.wpi.first.wpilibj.command.Scheduler;
 +
 +public class Robot extends IterativeRobot {
-     public void robotInit() {
-         RobotMap.init();
-         driveTrain = new DriveTrain();
-         arm = new Arm();
-         claw = new Claw();
-         oi = new OI();
-         compressor = new Compressor(RobotMap.COMPRESSOR_PORT);
-     }
++  static Timer timer;
++  public static OI oi;
++  public static DriveTrain driveTrain;
++  public static Arm arm;
++  public static Claw claw;
++  public static Compressor compressor;
 +
-     public void autonomousInit() {
-     }
++  public void robotInit() {
++    RobotMap.init();
++    driveTrain = new DriveTrain();
++    arm = new Arm();
++    claw = new Claw();
++    oi = new OI();
++    compressor = new Compressor(RobotMap.COMPRESSOR_PORT);
++  }
 +
-     public void autonomousPeriodic() {
-         Scheduler.getInstance().run();
-     }
++  public void autonomousInit() {
++  }
 +
-     public void teleopInit() {
-         System.out.println("running teleopInit");
-     }
++  public void autonomousPeriodic() {
++    Scheduler.getInstance().run();
++  }
 +
-     public void teleopPeriodic() {
-         Scheduler.getInstance().run();
++  public void teleopInit() {
++    System.out.println("running teleopInit");
++  }
 +
-     }
++  public void teleopPeriodic() {
++    Scheduler.getInstance().run();
 +
-     public void operate() {
-         driveTrain.arcadeDrive(OI.rightJoystick.getY(),
-                 OI.rightJoystick.getTwist());
-         claw.doTriggerAction();
-         if (OI.leftJoystick.getRawButton(8)) {
-             arm.setArmSpeeds(0.3);
-         } else if (OI.leftJoystick.getRawButton(9)) {
-             arm.setArmSpeeds(-0.3);
-         } else if (OI.leftJoystick.getRawButton(6)) {
-             arm.setLeft(0.3);
-         } else if (OI.leftJoystick.getRawButton(7)) {
-             arm.setLeft(-0.3);
-         } else if (OI.leftJoystick.getRawButton(11)) {
-             arm.setRight(-0.3);
-         } else if (OI.leftJoystick.getRawButton(10)) {
-             arm.setRight(0.3);
-         }
-         if (Math.abs(OI.leftJoystick.getY()) < 0.05) {
-             arm.setArmSpeeds(0);
++  }
 +
-         } else {
-             arm.fineTuneControl(OI.leftJoystick.getY());
-         }
++  public void operate() {
++    driveTrain
++        .arcadeDrive(OI.rightJoystick.getY(), OI.rightJoystick.getTwist());
++    claw.doTriggerAction();
++    if (OI.leftJoystick.getRawButton(8)) {
++      arm.setArmSpeeds(0.3);
++    } else if (OI.leftJoystick.getRawButton(9)) {
++      arm.setArmSpeeds(-0.3);
++    } else if (OI.leftJoystick.getRawButton(6)) {
++      arm.setLeft(0.3);
++    } else if (OI.leftJoystick.getRawButton(7)) {
++      arm.setLeft(-0.3);
++    } else if (OI.leftJoystick.getRawButton(11)) {
++      arm.setRight(-0.3);
++    } else if (OI.leftJoystick.getRawButton(10)) {
++      arm.setRight(0.3);
++    }
++    if (Math.abs(OI.leftJoystick.getY()) < 0.05) {
++      arm.setArmSpeeds(0);
 +
++    } else {
++      arm.fineTuneControl(OI.leftJoystick.getY());
 +    }
++  }
 +}
index 95604c371f7a05dc6396ecd854a04d01fde2f6f5,0000000000000000000000000000000000000000..90f10ec2d9ebe2e1f38afc8fce41ab8624e73a99
mode 100644,000000..100644
--- /dev/null
@@@ -1,41 -1,0 +1,42 @@@
-     public final static int LEFT_STICK_PORT = 0, RIGHT_STICK_PORT = 1;
-     public final static int TRIGGER_PORT = 1, TOGGLE_PORT = 2,
-             TOGGLE_COMPRESSOR_PORT = 11;
-     public static final int DRIVE_FRONT_LEFT = 4, DRIVE_FRONT_RIGHT = 5,
-             DRIVE_REAR_LEFT = 3, DRIVE_REAR_RIGHT = 6;
-     public static final int DRIVE_LEFT_A = 3, DRIVE_LEFT_B = 4,
-             DRIVE_RIGHT_A = 2, DRIVE_RIGHT_B = 1;
 +package org.usfirst.frc3501.RiceCatRobot.robot;
 +
 +import edu.wpi.first.wpilibj.DoubleSolenoid;
 +import edu.wpi.first.wpilibj.DoubleSolenoid.Value;
 +
 +/**
 + * The RobotMap is a mapping from the ports sensors and actuators are wired into
 + * to a variable name. This provides flexibility changing wiring, makes checking
 + * the wiring easier and significantly reduces the number of magic numbers
 + * floating around.
 + */
 +public class RobotMap {
-     public static final double DISTANCE_PER_PULSE = ((3.66 / 5.14) * 6 * Math.PI) / 256;
++  public final static int LEFT_STICK_PORT = 0, RIGHT_STICK_PORT = 1;
++  public final static int TRIGGER_PORT = 1, TOGGLE_PORT = 2,
++      TOGGLE_COMPRESSOR_PORT = 11;
++  public static final int DRIVE_FRONT_LEFT = 4, DRIVE_FRONT_RIGHT = 5,
++      DRIVE_REAR_LEFT = 3, DRIVE_REAR_RIGHT = 6;
++  public static final int DRIVE_LEFT_A = 3, DRIVE_LEFT_B = 4,
++      DRIVE_RIGHT_A = 2, DRIVE_RIGHT_B = 1;
 +
-     public static final int ARM_LEFT = 2, ARM_RIGHT = 7;
-     public static final double ARM_HIGH_SPEED = 0.5, ARM_LOW_SPEED = 0.5;
++  public static final double DISTANCE_PER_PULSE =
++    ((3.66 / 5.14) * 6 * Math.PI) / 256;
 +
-     // Claw
-     public static final int SOLENOID_FORWARD = 0, SOLENOID_REVERSE = 1,
-             MODULE_NUMBER = 0;
-     public final static Value open = DoubleSolenoid.Value.kForward,
-             close = DoubleSolenoid.Value.kReverse;
-     public static double DRIVE_DEAD_ZONE = 0.25;
-     // Compressor
-     public static final int COMPRESSOR_PORT = 0;
++  public static final int ARM_LEFT = 2, ARM_RIGHT = 7;
++  public static final double ARM_HIGH_SPEED = 0.5, ARM_LOW_SPEED = 0.5;
 +
-     public static void init() {
-     }
++  // Claw
++  public static final int SOLENOID_FORWARD = 0, SOLENOID_REVERSE = 1,
++      MODULE_NUMBER = 0;
++  public final static Value open = DoubleSolenoid.Value.kForward,
++      close = DoubleSolenoid.Value.kReverse;
++  public static double DRIVE_DEAD_ZONE = 0.25;
++  // Compressor
++  public static final int COMPRESSOR_PORT = 0;
 +
-     public static enum Direction {
-         LEFT, RIGHT, DOWN, UP, FORWARD, BACKWARD;
-     }
++  public static void init() {
++  }
 +
++  public static enum Direction {
++    LEFT, RIGHT, DOWN, UP, FORWARD, BACKWARD;
++  }
 +}
index dda70f85b0fc09390cbf931149d4bc066dc3c673,49ffefa32b0b5fff9c304e0462721ae55c17863c..c02dea95c941048dd6fd9651de673386fb576864
@@@ -8,108 -8,100 +8,108 @@@ import edu.wpi.first.wpilibj.CounterBas
  import edu.wpi.first.wpilibj.command.Subsystem;
  
  public class DriveTrain extends Subsystem {
-     private CANJaguar frontLeft, frontRight, rearLeft, rearRight;
-     private Encoder leftEncoder, rightEncoder;
+   private CANJaguar frontLeft, frontRight, rearLeft, rearRight;
+   private Encoder leftEncoder, rightEncoder;
  
-     public DriveTrain() {
-         frontLeft = new CANJaguar(RobotMap.DRIVE_FRONT_LEFT);
-         frontRight = new CANJaguar(RobotMap.DRIVE_FRONT_RIGHT);
-         rearLeft = new CANJaguar(RobotMap.DRIVE_REAR_LEFT);
-         rearRight = new CANJaguar(RobotMap.DRIVE_REAR_RIGHT);
-         leftEncoder = new Encoder(RobotMap.DRIVE_LEFT_A, RobotMap.DRIVE_LEFT_B,
-                 false, EncodingType.k4X);
-         rightEncoder = new Encoder(RobotMap.DRIVE_RIGHT_A,
-                 RobotMap.DRIVE_RIGHT_B, false, EncodingType.k4X);
-         leftEncoder.setDistancePerPulse(RobotMap.DISTANCE_PER_PULSE);
-         rightEncoder.setDistancePerPulse(RobotMap.DISTANCE_PER_PULSE);
-     }
+   public DriveTrain() {
+     frontLeft = new CANJaguar(RobotMap.DRIVE_FRONT_LEFT);
+     frontRight = new CANJaguar(RobotMap.DRIVE_FRONT_RIGHT);
+     rearLeft = new CANJaguar(RobotMap.DRIVE_REAR_LEFT);
+     rearRight = new CANJaguar(RobotMap.DRIVE_REAR_RIGHT);
+     leftEncoder = new Encoder(RobotMap.DRIVE_LEFT_A, RobotMap.DRIVE_LEFT_B,
+         false, EncodingType.k4X);
+     rightEncoder = new Encoder(RobotMap.DRIVE_RIGHT_A, RobotMap.DRIVE_RIGHT_B,
+         false, EncodingType.k4X);
+     leftEncoder.setDistancePerPulse(RobotMap.DISTANCE_PER_PULSE);
+     rightEncoder.setDistancePerPulse(RobotMap.DISTANCE_PER_PULSE);
+   }
  
-     public void resetEncoders() {
-         leftEncoder.reset();
-         rightEncoder.reset();
-     }
+   public void resetEncoders() {
+     leftEncoder.reset();
+     rightEncoder.reset();
+   }
  
-     public double getRightSpeed() {
-         // Returns inches per second
-         return rightEncoder.getRate();
-     }
+   public double getRightSpeed() {
 -    // Returns in per second
++    // Returns inches per second
+     return rightEncoder.getRate();
+   }
  
-     public double getLeftSpeed() {
-         return leftEncoder.getRate();
-     }
-     
-     public double getAverageSpeed() {
-       return (getRightSpeed() + getLeftSpeed())/2;
-     }
+   public double getLeftSpeed() {
+     return leftEncoder.getRate();
+   }
  
-     public double getRightDistance() {
-         // Returns distance in inches
-         return rightEncoder.getDistance();
-     }
++  public double getAverageSpeed() {
++    return (getRightSpeed() + getLeftSpeed()) / 2;
++  }
 +
-     public double getLeftDistance() {
-         // Returns distance in inches
-         return leftEncoder.getDistance();
-     }
+   public double getRightDistance() {
 -    // Returns distance in in
++    // Returns distance in inches
+     return rightEncoder.getDistance();
+   }
+   public double getLeftDistance() {
 -    // Returns distance in in
++    // Returns distance in inches
+     return leftEncoder.getDistance();
+   }
++  public void stop() {
++    setMotorSpeeds(0, 0);
++  }
 +
-     public void stop() {
-       setMotorSpeeds(0, 0);
+   public void setMotorSpeeds(double leftSpeed, double rightSpeed) {
+     if (Math.abs(leftSpeed) < RobotMap.DRIVE_DEAD_ZONE) {
+       leftSpeed = 0;
      }
-     
-     public void setMotorSpeeds(double leftSpeed, double rightSpeed) {
-         if (Math.abs(leftSpeed) < RobotMap.DRIVE_DEAD_ZONE) {
-             leftSpeed = 0;
-         }
-         if (Math.abs(rightSpeed) < RobotMap.DRIVE_DEAD_ZONE) {
-             rightSpeed = 0;
-         }
-         this.frontLeft.set(leftSpeed);
-         this.frontRight.set(-rightSpeed);
-         this.rearLeft.set(leftSpeed);
-         this.rearRight.set(-rightSpeed);
+     if (Math.abs(rightSpeed) < RobotMap.DRIVE_DEAD_ZONE) {
+       rightSpeed = 0;
      }
+     this.frontLeft.set(leftSpeed);
+     this.frontRight.set(-rightSpeed);
+     this.rearLeft.set(leftSpeed);
+     this.rearRight.set(-rightSpeed);
+   }
  
-     public void arcadeDrive(double yVal, double twist) {
-         if (yVal < 0 && Math.abs(yVal) < 0.1125) {
-             yVal = 0;
-         } else if (yVal > 0 && Math.abs(yVal) < 0.25) {
-             yVal = 0;
-         } else if (yVal > 0) {
-             yVal -= 0.25;
-         } else if (yVal < 0) {
-             yVal += 0.15;
-         }
-         if (Math.abs(twist) < RobotMap.DRIVE_DEAD_ZONE) {
-             twist = 0;
-         }
-         double leftMotorSpeed;
-         double rightMotorSpeed;
-         // adjust the sensitivity (yVal+rootof (yval)) / 2
-         yVal = (yVal + Math.signum(yVal) * Math.sqrt(Math.abs(yVal))) / 2;
-         // adjust the sensitivity (twist+rootof (twist)) / 2
-         twist = (twist + Math.signum(twist) * Math.sqrt(Math.abs(twist))) / 2;
-         if (yVal > 0) {
-             if (twist > 0) {
-                 leftMotorSpeed = yVal - twist;
-                 rightMotorSpeed = Math.max(yVal, twist);
-             } else {
-                 leftMotorSpeed = Math.max(yVal, -twist);
-                 rightMotorSpeed = yVal + twist;
-             }
-         } else {
-             if (twist > 0.0) {
-                 leftMotorSpeed = -Math.max(-yVal, twist);
-                 rightMotorSpeed = yVal + twist;
-             } else {
-                 leftMotorSpeed = yVal - twist;
-                 rightMotorSpeed = -Math.max(-yVal, -twist);
-             }
-         }
-         setMotorSpeeds(leftMotorSpeed, rightMotorSpeed);
+   public void arcadeDrive(double yVal, double twist) {
+     if (yVal < 0 && Math.abs(yVal) < 0.1125) {
+       yVal = 0;
+     } else if (yVal > 0 && Math.abs(yVal) < 0.25) {
+       yVal = 0;
+     } else if (yVal > 0) {
+       yVal -= 0.25;
+     } else if (yVal < 0) {
+       yVal += 0.15;
+     }
+     if (Math.abs(twist) < RobotMap.DRIVE_DEAD_ZONE) {
+       twist = 0;
      }
  
-     @Override
-     protected void initDefaultCommand() {
+     double leftMotorSpeed;
+     double rightMotorSpeed;
+     // adjust the sensitivity (yVal+rootof (yval)) / 2
+     yVal = (yVal + Math.signum(yVal) * Math.sqrt(Math.abs(yVal))) / 2;
+     // adjust the sensitivity (twist+rootof (twist)) / 2
+     twist = (twist + Math.signum(twist) * Math.sqrt(Math.abs(twist))) / 2;
+     if (yVal > 0) {
+       if (twist > 0) {
+         leftMotorSpeed = yVal - twist;
+         rightMotorSpeed = Math.max(yVal, twist);
+       } else {
+         leftMotorSpeed = Math.max(yVal, -twist);
+         rightMotorSpeed = yVal + twist;
+       }
+     } else {
+       if (twist > 0.0) {
+         leftMotorSpeed = -Math.max(-yVal, twist);
+         rightMotorSpeed = yVal + twist;
+       } else {
+         leftMotorSpeed = yVal - twist;
+         rightMotorSpeed = -Math.max(-yVal, -twist);
+       }
      }
+     setMotorSpeeds(leftMotorSpeed, rightMotorSpeed);
+   }
+   @Override
+   protected void initDefaultCommand() {
+   }
  }