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

Bug Fixes to Trigger values

Browse Source 
WIP
This commit is contained in:
ryan123rudder
2019-02-12 20:47:00 -07:00
parent 40271c4d04
commit 8baf229bc6
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
@@ -51,7 +51,7 @@ public class OI
CarriageEject.whenReleased(new IntakeSetSpeed(0.0)); CarriageEject.whenReleased(new IntakeSetSpeed(0.0));
*/ */
JoystickButton climbUp = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.RIGHT_TRIGGER_AXIS); JoystickButton climbUp = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.RIGHT_TRIGGER_AXIS);
float speed = XboxController.RIGHT_TRIGGER_AXIS; double speed = m_driverXbox.getRightTriggerAxis();
climbUp.whenPressed(new InitiateClimber(true, speed)); climbUp.whenPressed(new InitiateClimber(true, speed));
climbUp.whenReleased(new InitiateClimber(false, speed)); climbUp.whenReleased(new InitiateClimber(false, speed));
2019robot/src/main/java/org/usfirst/frc4388/robot/commands/InitiateClimber.java
+2 -2
View File
@@ -8,9 +8,9 @@ import edu.wpi.first.wpilibj.command.Command;
public class InitiateClimber extends Command public class InitiateClimber extends Command
{ {
boolean climb; boolean climb;
float speed; double speed;
public InitiateClimber(boolean Climb, float speed) { public InitiateClimber(boolean Climb, double speed) {
requires(Robot.climber); requires(Robot.climber);
this.climb = Climb; this.climb = Climb;
this.speed = speed; this.speed = speed;
2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class Climber extends Subsystem{
public void periodic() { public void periodic() {
} }
public void setClimbSpeed(boolean Climb, float speed) { public void setClimbSpeed(boolean Climb, double speed) {
if (Climb && safetySwitch) { if (Climb && safetySwitch) {
System.out.println("TriggerVal = " + speed); System.out.println("TriggerVal = " + speed);
if(isPressed.isFwdLimitSwitchClosed()){ //If back at max height if(isPressed.isFwdLimitSwitchClosed()){ //If back at max height