Skip to content

Commit b3ff32f

Browse files
authored
Merge branch 'master' into jhh/health-check
2 parents 2022db4 + 9004ffb commit b3ff32f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/main/java/frc/team2767/deepspace/control/XboxControls.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import frc.team2767.deepspace.command.states.SetFieldDirectionCommand;
2121
import frc.team2767.deepspace.command.states.SetLevelCommand;
2222
import frc.team2767.deepspace.command.vacuum.ActivateValveCommand;
23-
import frc.team2767.deepspace.control.trigger.*;
2423
import frc.team2767.deepspace.subsystem.ElevatorLevel;
2524
import frc.team2767.deepspace.subsystem.FieldDirection;
2625
import frc.team2767.deepspace.subsystem.VacuumSubsystem;
@@ -30,6 +29,7 @@
3029
public class XboxControls {
3130

3231
private final Joystick xbox;
32+
private static final double DEADBAND = 0.5;
3333

3434
private final Logger logger = LoggerFactory.getLogger(this.getClass());
3535

@@ -48,31 +48,31 @@ public boolean get() {
4848
new Trigger() {
4949
@Override
5050
public boolean get() {
51-
return xbox.getRawAxis(Axis.RIGHT_Y.id) < -0.1;
51+
return xbox.getRawAxis(Axis.RIGHT_Y.id) < -DEADBAND;
5252
}
5353
};
5454

5555
Trigger RightStickDown =
5656
new Trigger() {
5757
@Override
5858
public boolean get() {
59-
return xbox.getRawAxis(Axis.RIGHT_Y.id) > 0.1;
59+
return xbox.getRawAxis(Axis.RIGHT_Y.id) > DEADBAND;
6060
}
6161
};
6262

6363
Trigger LeftStickRight =
6464
new Trigger() {
6565
@Override
6666
public boolean get() {
67-
return xbox.getRawAxis(Axis.LEFT_X.id) > 0.1;
67+
return xbox.getRawAxis(Axis.LEFT_X.id) > DEADBAND;
6868
}
6969
};
7070

7171
Trigger LeftStickLeft =
7272
new Trigger() {
7373
@Override
7474
public boolean get() {
75-
return xbox.getRawAxis(Axis.LEFT_X.id) < -0.1;
75+
return xbox.getRawAxis(Axis.LEFT_X.id) < -DEADBAND;
7676
}
7777
};
7878

0 commit comments

Comments
 (0)