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-14 20:11:23 -06:00
parent 850c2222a6 0a11ca4e0c
commit 8d04cd9b05
2 changed files with 4 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 -1
View File
@@ -71,7 +71,7 @@ public class OI
safteySwitch.whenPressed(new setClimberSafety(true));
safteySwitch.whenPressed(new setLEDPattern(LEDPatterns.SOLID_YELLOW));
safteySwitch.whenReleased(new setClimberSafety(false));
safteySwitch.whenPressed(new setLEDPattern(LEDPatterns.C1_HEARTBEAT_FAST));
safteySwitch.whenReleased(new setLEDPattern(LEDPatterns.C1_HEARTBEAT_FAST));
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
+3
View File
@@ -14,6 +14,7 @@ import org.usfirst.frc4388.robot.constants.LEDPatterns;
import edu.wpi.first.wpilibj.Spark;
import edu.wpi.first.wpilibj.command.Subsystem;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
/**
* Add your docs here.
@@ -30,10 +31,12 @@ import edu.wpi.first.wpilibj.command.Subsystem;
public void periodic() {
LEDController.set(currentLED);
SmartDashboard.putNumber("LED", currentLED);
}
public void setPattern(LEDPatterns pattern){
currentLED = pattern.getValue();
LEDController.set(currentLED);
}
@Override