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

Merge branch 'develop' of https://github.com/Team4388/2019-Hit-or-Miss into develop

Browse Source
This commit is contained in:
lukesta182
2019-03-16 13:19:24 -06:00
parent 71ab691b46 4c707871f6
commit 6141559282
2 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
+3 -3
View File
@@ -50,11 +50,11 @@ public class OI
JoystickButton Expand = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.Y_BUTTON);
Expand.whenPressed(new WristPlacement(true));
Expand.whenPressed(new setLEDPattern(LEDPatterns.SOLID_RED));
Expand.whenPressed(new setLEDPattern(LEDPatterns.SOLID_GREEN));
JoystickButton Contract = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.A_BUTTON);
Contract.whenPressed(new WristPlacement(false));
Contract.whenPressed(new setLEDPattern(LEDPatterns.SOLID_GREEN));
Contract.whenPressed(new setLEDPattern(LEDPatterns.SOLID_RED));
JoystickButton liftBothIntake = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.X_BUTTON);
liftBothIntake.whenPressed(new HatchAndBallUp());
@@ -72,7 +72,7 @@ public class OI
safteySwitch.whenPressed(new setClimberSafety(true));
safteySwitch.whenPressed(new setLEDPattern(LEDPatterns.SOLID_YELLOW));
safteySwitch.whenReleased(new setClimberSafety(false));
safteySwitch.whenReleased(new setLEDPattern(LEDPatterns.C1_HEARTBEAT_FAST));
safteySwitch.whenReleased(new setLEDPattern(LEDPatterns.FOREST_WAVES));
JoystickButton climbUp = new JoystickButton(m_driverXbox.getJoyStick(), XboxController.RIGHT_TRIGGER_AXIS);
JoystickButton climbDown = new JoystickButton(m_driverXbox.getJoyStick(), XboxController.LEFT_TRIGGER_AXIS);
2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/LED.java
+1 -1
View File
@@ -25,7 +25,7 @@ import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
public static Spark LEDController = new Spark(LED_SPARK_ID);
public LED(){
setPattern(LEDPatterns.C1_HEARTBEAT_FAST);
setPattern(LEDPatterns.FOREST_WAVES);
LEDController.set(currentLED);
}