From 60a094541cc053dc232a132200c0a1e9a59f1507 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Fri, 12 Feb 2016 21:08:36 -0800 Subject: [PATCH] fix compile errors that somehow got into master --- .../usfirst/frc/team3501/robot/Constants.java | 29 ++++++++++--------- src/org/usfirst/frc/team3501/robot/Robot.java | 20 ++++++------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java index 2e7de2ac..a2cc4580 100644 --- a/src/org/usfirst/frc/team3501/robot/Constants.java +++ b/src/org/usfirst/frc/team3501/robot/Constants.java @@ -78,21 +78,24 @@ public class Constants { public static final double OUTPUT_SPEED = -0.5; public final static double FULL_RANGE = 270.0; // in degrees public final static double OFFSET = -135.0; // in degrees + public static final double ZERO_ANGLE = 0; } - public static class DefenseArm { - // Potentiometer related ports - public static final int ARM_CHANNEL = 0; - public static final int ARM_PORT = 0; - public static final int HAND_PORT = 1; - public static final int HAND_CHANNEL = 1; - public final static double FULL_RANGE = 270.0; // in degrees - public final static double OFFSET = -135.0; // in degrees - public final static double[] armPotValue = { 0.0, 45.0, 90.0 }; // 3 level - public final static double ARM_LENGTH = 0; // TODO: find actual length - public final static double HAND_LENGTH = 0; // TODO: find actual length - public final static double ARM_MOUNTED_HEIGHT = 0; // TODO: find actual - } + public static class DefenseArm { + // Potentiometer related ports + public static final int ARM_CHANNEL = 0; + public static final int ARM_PORT = 0; + public static final int HAND_PORT = 1; + public static final int HAND_CHANNEL = 1; + public final static double FULL_RANGE = 270.0; // in degrees + public final static double OFFSET = -135.0; // in degrees + public final static double[] armPotValue = { 0.0, 45.0, 90.0 }; // 3 + // level + public final static double ARM_LENGTH = 0; // TODO: find actual length + public final static double HAND_LENGTH = 0; // TODO: find actual length + public final static double ARM_MOUNTED_HEIGHT = 0; // TODO: find actual + // height + } public enum Defense { PORTCULLIS, SALLY_PORT, ROUGH_TERRAIN, LOW_BAR, CHEVAL_DE_FRISE, DRAWBRIDGE, MOAT, ROCK_WALL, RAMPART; diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index f4001774..3a2ca7d0 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -13,12 +13,12 @@ import edu.wpi.first.wpilibj.smartdashboard.SendableChooser; import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; public class Robot extends IterativeRobot { - public static OI oi; - public static DriveTrain driveTrain; - public static Shooter shooter; - public static Scaler scaler; - public static IntakeArm intakeArm; - public static DefenseArm defenseArm; + public static OI oi; + public static DriveTrain driveTrain; + public static Shooter shooter; + public static Scaler scaler; + public static IntakeArm intakeArm; + public static DefenseArm defenseArm; // Sendable Choosers send a drop down menu to the Smart Dashboard. SendableChooser positionChooser; @@ -87,10 +87,10 @@ public class Robot extends IterativeRobot { SmartDashboard.putData("Position Two Defense Chooser", positionTwoDefense); SmartDashboard.putData("Position Three Defense Chooser", positionThreeDefense); - SmartDashboard.putData("Position Four Defense Chooser", - positionFourDefense); - SmartDashboard.putData("Position Five Defense Chooser", - positionFiveDefense); + SmartDashboard + .putData("Position Four Defense Chooser", positionFourDefense); + SmartDashboard + .putData("Position Five Defense Chooser", positionFiveDefense); } @Override -- 2.30.2