mirror of
https://github.com/Team4388/RiseOfRidgebotics2020.git
synced 2026-06-09 00:38:00 -06:00
Integrate Storage Commands into Fire Commands
This commit is contained in:
@@ -29,8 +29,8 @@ public class ShootFireGroup extends ParallelRaceGroup {
|
||||
addCommands(
|
||||
new RunCommand(() -> m_shooter.runDrumShooterVelocityPID(m_shooter.addFireVel()), m_shooter),
|
||||
new RunCommand(() -> m_shooterHood.runAngleAdjustPID(m_shooterHood.addFireAngle()), m_shooterHood),
|
||||
new TrackTarget(m_shooterAim)
|
||||
//new StorageFire(m_storage)
|
||||
new TrackTarget(m_shooterAim),
|
||||
new StorageFire(m_storage)
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -44,8 +44,10 @@ public class StoragePrep extends CommandBase {
|
||||
@Override
|
||||
public boolean isFinished() {
|
||||
if (!m_storage.getBeamShooter() || (startTime + StorageConstants.STORAGE_TIMEOUT) < System.currentTimeMillis()) {
|
||||
m_storage.m_isStorageReadyToFire = true;
|
||||
return true;
|
||||
} else {
|
||||
m_storage.m_isStorageReadyToFire = false;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user