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

Merge branch 'develop' into relative-wrist

Browse Source
This commit is contained in:
HFocus
2019-03-16 14:18:18 -06:00
parent e0947b51d9 6141559282
commit 5a825596a8
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java
+1
View File
@@ -103,6 +103,7 @@ public class OI
JoystickButton stow = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.B_BUTTON);
stow.whenPressed(new StowArm());
stow.whenPressed(new setLEDPattern(LEDPatterns.SOLID_RED));
SmartDashboard.putData("switch to manuel", new SetManual());
// SmartDashboard.putData("run turn test", new TestTurn());
2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Wrist.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class Wrist extends Subsystem implements ControlLoopable
public static final double KF_DOWN = 0.0;
public static final double P_Value = 3;
public static final double I_Value = 0.001;
public static final double D_Value = 250;
public static final double D_Value = 300;
public static final double RampRate = 0.0;
private PIDParams wristPIDParams = new PIDParams(P_Value, I_Value, D_Value, KF_DOWN); // KF gets updated later
public static final double PID_ERROR_INCHES = 150;