Skip to content

Issue 38 #40

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

Merged
brettle merged 4 commits into from
Feb 18, 2019
Merged

Issue 38 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8abb976
Add cargo status in SmartDashboard
Feb 17, 2019
98d11e7
Include accidentally unstaged change
Feb 17, 2019
6df00eb
Add cargo status to SmartDashboard
Feb 17, 2019
99b240d
Fix finished/interrupted logic in cargo
Feb 17, 2019
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
4 changes: 4 additions & 0 deletions Robot2019/src/main/java/frc/robot/commands/EjectCargo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import edu.wpi.first.wpilibj.Timer;
import edu.wpi.first.wpilibj.command.Command;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import frc.robot.subsystems.Cargo;

public class EjectCargo extends Command {
Expand Down Expand Up @@ -43,6 +44,9 @@ protected boolean isFinished() {
@Override
protected void end() {
cargo.stopIntake();
if (isFinished()) {
SmartDashboard.putBoolean("Has cargo", false);
}
}

@Override
Expand Down
8 changes: 7 additions & 1 deletion Robot2019/src/main/java/frc/robot/commands/IntakeCargo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import edu.wpi.first.wpilibj.Timer;
import edu.wpi.first.wpilibj.command.Command;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import frc.robot.subsystems.Cargo;

public class IntakeCargo extends Command {
Expand Down Expand Up @@ -50,7 +51,12 @@ protected boolean isFinished() {

@Override
protected void end() {
cargo.keepIntake();
if (isFinished()) {
cargo.keepIntake();
SmartDashboard.putBoolean("Has cargo", true);
} else {
cargo.stopIntake();
}
}

@Override
Expand Down