projects
/
3501
/
2017steamworks
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e6e8711
)
Deleted the unnecessary lines of code
author
AyushNigade
<techiedude23@gmail.com>
Sat, 11 Feb 2017 03:18:19 +0000
(19:18 -0800)
committer
AyushNigade
<techiedude23@gmail.com>
Sat, 11 Feb 2017 03:26:39 +0000
(19:26 -0800)
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheel.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
patch
|
blob
|
blame
|
history
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheel.java
b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheel.java
index 83d558acfca15a4d069d1cc230b9227c011242fa..a20af8e63badd3bfee9722e5037c9771b60a8a52 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheel.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheel.java
@@
-25,7
+25,6
@@
public class RunFlyWheel extends Command {
private double target;
public RunFlyWheel(double maxTimeOut) {
private double target;
public RunFlyWheel(double maxTimeOut) {
- requires(shooter);
this.wheelP = this.shooter.wheelP;
this.wheelI = this.shooter.wheelI;
this.wheelP = this.shooter.wheelP;
this.wheelI = this.shooter.wheelI;
@@
-39,11
+38,13
@@
public class RunFlyWheel extends Command {
}
// Called just before this Command runs the first time
}
// Called just before this Command runs the first time
+ @Override
protected void initialize() {
this.wheelController.setSetPoint(this.target);
}
// Called repeatedly when this Command is scheduled to run
protected void initialize() {
this.wheelController.setSetPoint(this.target);
}
// Called repeatedly when this Command is scheduled to run
+ @Override
protected void execute() {
double shooterSpeed = this.wheelController
.calcPID(this.shooter.getShooterRPM());
protected void execute() {
double shooterSpeed = this.wheelController
.calcPID(this.shooter.getShooterRPM());
@@
-52,18
+53,20
@@
public class RunFlyWheel extends Command {
}
// Make this return true when this Command no longer needs to run execute()
}
// Make this return true when this Command no longer needs to run execute()
+ @Override
protected boolean isFinished() {
return timeSinceInitialized() >= maxTimeOut;
}
// Called once after isFinished returns true
protected boolean isFinished() {
return timeSinceInitialized() >= maxTimeOut;
}
// Called once after isFinished returns true
+ @Override
protected void end() {
this.shooter.stopFlyWheel();
}
// Called when another command which requires one or more of the same
// subsystems is scheduled to run
protected void end() {
this.shooter.stopFlyWheel();
}
// Called when another command which requires one or more of the same
// subsystems is scheduled to run
+ @Override
protected void interrupted() {
protected void interrupted() {
- end();
}
}
}
}
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
index 8c8248d51272f2ba93219ce366c4709e08eabbb8..6ac5d774bcf0f50893ef014e09c5a74f19bcdfee 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
@@
-30,7
+30,6
@@
public class RunFlyWheelContinuous extends Command {
public RunFlyWheelContinuous() {
// Use requires() here to declare subsystem dependencies
// eg. requires(chassis);
public RunFlyWheelContinuous() {
// Use requires() here to declare subsystem dependencies
// eg. requires(chassis);
- requires(shooter);
this.wheelP = this.shooter.wheelP;
this.wheelI = this.shooter.wheelI;
this.wheelP = this.shooter.wheelP;
this.wheelI = this.shooter.wheelI;
@@
-44,11
+43,13
@@
public class RunFlyWheelContinuous extends Command {
}
// Called just before this Command runs the first time
}
// Called just before this Command runs the first time
+ @Override
protected void initialize() {
this.wheelController.setSetPoint(this.target);
}
// Called repeatedly when this Command is scheduled to run
protected void initialize() {
this.wheelController.setSetPoint(this.target);
}
// Called repeatedly when this Command is scheduled to run
+ @Override
protected void execute() {
double shooterSpeed = this.wheelController
.calcPID(this.shooter.getShooterRPM());
protected void execute() {
double shooterSpeed = this.wheelController
.calcPID(this.shooter.getShooterRPM());
@@
-57,18
+58,21
@@
public class RunFlyWheelContinuous extends Command {
}
// Make this return true when this Command no longer needs to run execute()
}
// Make this return true when this Command no longer needs to run execute()
+ @Override
protected boolean isFinished() {
return false;
}
// Called once after isFinished returns true
protected boolean isFinished() {
return false;
}
// Called once after isFinished returns true
+ @Override
protected void end() {
this.shooter.stopFlyWheel();
}
// Called when another command which requires one or more of the same
// subsystems is scheduled to run
protected void end() {
this.shooter.stopFlyWheel();
}
// Called when another command which requires one or more of the same
// subsystems is scheduled to run
+ @Override
protected void interrupted() {
protected void interrupted() {
- end();
+
}
}
}
}