diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Arm.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Arm.java index ee2be32..84835f8 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Arm.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Arm.java @@ -336,12 +336,12 @@ public class Arm extends Subsystem implements ControlLoopable } public void updateStatus(Robot.OperationMode operationMode) { - if (operationMode == Robot.OperationMode.TEST) { try { SmartDashboard.putNumber("Elevator Position Inches", motor1.getPositionWorld()); SmartDashboard.putNumber("Elevator Motor 1 Amps", motor1.getOutputCurrent()); SmartDashboard.putNumber("Elevator Motor 2 Amps", motor2.getOutputCurrent()); SmartDashboard.putNumber("Elevator Average Amps", getAverageMotorCurrent()); + // SmartDashboard.putNumber("Elevator Motor 1 Amps PDP", Robot.pdp.getCurrent(RobotMap.ELEVATOR_MOTOR_1_CAN_ID)); // SmartDashboard.putNumber("Elevator Motor 2 Amps PDP", Robot.pdp.getCurrent(RobotMap.ELEVATOR_MOTOR_2_CAN_ID)); // SmartDashboard.putNumber("Elevator Motor 3 Amps PDP", Robot.pdp.getCurrent(RobotMap.ELEVATOR_MOTOR_3_CAN_ID)); @@ -349,7 +349,7 @@ public class Arm extends Subsystem implements ControlLoopable } catch (Exception e) { } - } + } public static Arm getInstance() { diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java index d461a8c..5add3b9 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java @@ -115,7 +115,7 @@ public class Climber extends Subsystem{ climberFront.set(leftTriggerInput); } else { - climberBack.set(0); + climberBack.set(rightTriggerInput*.3); } } diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Wrist.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Wrist.java index 250193f..0e1c3f0 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Wrist.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Wrist.java @@ -144,7 +144,7 @@ public class Wrist extends Subsystem implements ControlLoopable } public void setSpeedJoystick(double speed) { - wristmotor1.set(ControlMode.PercentOutput, speed); + wristmotor1.set(ControlMode.PercentOutput, speed*.7); setWristControlMode(WristControlMode.JOYSTICK_MANUAL); }