Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Xbox controller triggers #7

Merged
merged 3 commits into from
Mar 19, 2022
Merged

Fix Xbox controller triggers #7

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6814db3
Fix Xbox controller triggers
MarkGhebrial Mar 19, 2022
0cd4d3f
Remove old commands library
MarkGhebrial Mar 19, 2022
2676c60
Remove invalid import
MarkGhebrial Mar 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/java/frc/robot/RobotContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ public class RobotContainer {
// Shintake
public static ExtendInAndOut extendInAndOut =
new ExtendInAndOut(inAndOut2); // Extend linear actuator for Shintake Assybemly
public static SpinIntakeWheel spinIntakeWheel = new SpinIntakeWheel(intake); // Spin intake wheel
public static SpinFeedWheel spinFeedWheel =
public static final SpinIntakeWheel spinIntakeWheel = new SpinIntakeWheel(intake); // Spin intake wheel
public static final SpinFeedWheel spinFeedWheel =
new SpinFeedWheel(outtake); // Spin feed wheel for shooter
public static SpinFlywheel spinFlywheel = new SpinFlywheel(outtake); // Spin flywheel
public static BringInOutAndIn bringInOutAndIn =
Expand Down Expand Up @@ -99,8 +99,8 @@ public RobotContainer() {
*/
private void configureButtonBindings() {
shootButton.whileHeld(spinFeedWheel);
intakeButton.whileActive(spinIntakeWheel);
flywheelButton.whileActive(spinFlywheel);
intakeButton.whileActiveContinuous(spinIntakeWheel);
flywheelButton.whileActiveContinuous(spinFlywheel);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/frc/robot/TriggerL2Button.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package frc.robot;

import edu.wpi.first.wpilibj.buttons.Trigger;
import edu.wpi.first.wpilibj2.command.button.Trigger;

/** Add your docs here. */
public class TriggerL2Button extends Trigger {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/frc/robot/TriggerR2Button.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package frc.robot;

import edu.wpi.first.wpilibj.buttons.Trigger;
import edu.wpi.first.wpilibj2.command.button.Trigger;

/** Add your docs here. */
public class TriggerR2Button extends Trigger {
Expand Down
37 changes: 0 additions & 37 deletions vendordeps/WPILibOldCommands.json
View file
Open in desktop

This file was deleted.