Team4388/2019-Hit-or-Miss
1
0
Fork 0
mirror of https://github.com/Team4388/2019-Hit-or-Miss.git synced 2026-06-09 00:28:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

small fixes from 2/18/19

Browse Source
This commit is contained in:
lukesta182
2019-02-18 17:35:29 -07:00
parent 0ee6755097
commit 7d6e9aa060
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Arm.java
+2 -2
View File
@@ -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() {
2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java
+1 -1
View File
@@ -115,7 +115,7 @@ public class Climber extends Subsystem{
climberFront.set(leftTriggerInput);
}
else {
climberBack.set(0);
climberBack.set(rightTriggerInput*.3);
}
}
2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Wrist.java
+1 -1
View File
@@ -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);
}