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

Reenable old code

Browse Source
This commit is contained in:
HFocus
2019-03-18 16:58:49 -06:00
parent df88b29380
commit 4b90f82ec1
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/OI.java
+1 -1
View File
@@ -122,7 +122,7 @@ public class OI
//stow.whenPressed(new StowArm());
//stow.whenPressed(new setLEDPattern(LEDPatterns.SOLID_GREEN));
//SmartDashboard.putData("switch to manuel", new SetManual());
SmartDashboard.putData("switch to manuel", new SetManual());
// SmartDashboard.putData("run turn test", new TestTurn());
SmartDashboard.putData("grab from station", new GrabFromLoadingSatation());
SmartDashboard.putData("wrist test", new wristTest());
2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Arm.java
+1 -1
View File
@@ -370,7 +370,7 @@ public class Arm extends Subsystem implements ControlLoopable
double deltaPosition = joystickPosition * joystickInchesPerMs;
targetPositionInchesMM = targetPositionInchesMM + deltaPosition;
updatePositionMM(targetPositionInchesMM);
Robot.wrist.targetPositionInchesPID = targetPositionInchesPID - (deltaPosition/3);
//Robot.wrist.targetPositionInchesPID = targetPositionInchesPID - (deltaPosition/3);
Robot.wrist.updatePositionPID(Robot.wrist.targetPositionInchesPID);
2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Wrist.java
+2 -2
View File
@@ -194,12 +194,12 @@ public class Wrist extends Subsystem implements ControlLoopable
private double limitPosition(double targetPosition) {
/*if (targetPosition < MIN_POSITION_INCHES) {
if (targetPosition < MIN_POSITION_INCHES) {
return MIN_POSITION_INCHES;
}
else if (targetPosition > MAX_POSITION_INCHES) {
return MAX_POSITION_INCHES;
}*/
}
return targetPosition;
}