Skip to content

Commit 6adbf50

Browse files
author
Noah Gleason
authored
Merge pull request #109 from blair-robot-project/cleanup
Clean up code
2 parents e60b328 + 5b7cc8b commit 6adbf50

File tree

350 files changed

+827
-834
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

350 files changed

+827
-834
lines changed

RoboRIO/src/main/java/org/usfirst/frc/team449/robot/RobotMap2017.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ public class RobotMap2017 {
222222
* @param logger The logger for recording events and telemetry data.
223223
* @param drive The drive.
224224
* @param defaultDriveCommand The command for the drive to run during the teleoperated period.
225-
* @param updater A runnable that updates cached variables.
225+
* @param updater A runnable that updates cached variables.
226226
* @param climber The climber for boarding the airship. Can be null.
227227
* @param shooter The multiSubsystem for shooting fuel. Can be null.
228228
* @param camera The cameras on this robot. Can be null.

RoboRIO/src/main/java/org/usfirst/frc/team449/robot/commands/multiInterface/RunMotorWhileConditonMet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Run a BinaryMotor while a condition is true.
1616
*/
1717
@JsonIdentityInfo(generator = ObjectIdGenerators.StringIdGenerator.class)
18-
public class RunMotorWhileConditonMet <T extends YamlSubsystem & SubsystemBinaryMotor & SubsystemConditional> extends YamlCommandWrapper {
18+
public class RunMotorWhileConditonMet<T extends YamlSubsystem & SubsystemBinaryMotor & SubsystemConditional> extends YamlCommandWrapper {
1919

2020
/**
2121
* The subsystem to execute this command on

RoboRIO/src/main/java/org/usfirst/frc/team449/robot/commands/multiInterface/drive/FieldOrientedUnidirectionalDriveCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.WRAPPER_OBJECT, property = "@class")
2121
@JsonIdentityInfo(generator = ObjectIdGenerators.StringIdGenerator.class)
22-
public class FieldOrientedUnidirectionalDriveCommand <T extends YamlSubsystem & DriveUnidirectional & SubsystemAHRS> extends PIDAngleCommand {
22+
public class FieldOrientedUnidirectionalDriveCommand<T extends YamlSubsystem & DriveUnidirectional & SubsystemAHRS> extends PIDAngleCommand {
2323

2424
/**
2525
* The drive this command is controlling.

RoboRIO/src/main/java/org/usfirst/frc/team449/robot/commands/multiInterface/drive/JiggleRobot.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Rotates the robot back and forth in order to dislodge any stuck balls.
1616
*/
1717
@JsonIdentityInfo(generator = ObjectIdGenerators.StringIdGenerator.class)
18-
public class JiggleRobot <T extends YamlSubsystem & DriveUnidirectional & SubsystemAHRS> extends YamlCommandGroupWrapper {
18+
public class JiggleRobot<T extends YamlSubsystem & DriveUnidirectional & SubsystemAHRS> extends YamlCommandGroupWrapper {
1919

2020
/**
2121
* Instantiate the CommandGroup

RoboRIO/src/main/java/org/usfirst/frc/team449/robot/commands/multiInterface/drive/NavXDriveStraight.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* Drives straight using the NavX gyro to keep a constant alignment.
1818
*/
1919
@JsonIdentityInfo(generator = ObjectIdGenerators.StringIdGenerator.class)
20-
public class NavXDriveStraight <T extends YamlSubsystem & DriveUnidirectional & SubsystemAHRS> extends PIDAngleCommand {
20+
public class NavXDriveStraight<T extends YamlSubsystem & DriveUnidirectional & SubsystemAHRS> extends PIDAngleCommand {
2121

2222
/**
2323
* The drive subsystem to give output to.

RoboRIO/src/main/java/org/usfirst/frc/team449/robot/commands/multiInterface/drive/NavXTurnToAngle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Turns to a specified angle, relative to the angle the AHRS was at when the robot was turned on.
1919
*/
2020
@JsonIdentityInfo(generator = ObjectIdGenerators.StringIdGenerator.class)
21-
public class NavXTurnToAngle <T extends YamlSubsystem & DriveUnidirectional & SubsystemAHRS> extends PIDAngleCommand {
21+
public class NavXTurnToAngle<T extends YamlSubsystem & DriveUnidirectional & SubsystemAHRS> extends PIDAngleCommand {
2222

2323
/**
2424
* The drive subsystem to execute this command on and to get the gyro reading from.

RoboRIO/src/main/java/org/usfirst/frc/team449/robot/commands/multiInterface/drive/NavXTurnToAngleRelative.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* Turn a certain number of degrees from the current heading.
1717
*/
1818
@JsonIdentityInfo(generator = ObjectIdGenerators.StringIdGenerator.class)
19-
public class NavXTurnToAngleRelative <T extends YamlSubsystem & DriveUnidirectional & SubsystemAHRS> extends NavXTurnToAngle {
19+
public class NavXTurnToAngleRelative<T extends YamlSubsystem & DriveUnidirectional & SubsystemAHRS> extends NavXTurnToAngle {
2020

2121
/**
2222
* Default constructor.

RoboRIO/src/main/java/org/usfirst/frc/team449/robot/commands/multiInterface/drive/UnidirectionalNavXDefaultDrive.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.WRAPPER_OBJECT, property = "@class")
1919
@JsonIdentityInfo(generator = ObjectIdGenerators.StringIdGenerator.class)
20-
public class UnidirectionalNavXDefaultDrive <T extends YamlSubsystem & DriveUnidirectional & SubsystemAHRS> extends PIDAngleCommand {
20+
public class UnidirectionalNavXDefaultDrive<T extends YamlSubsystem & DriveUnidirectional & SubsystemAHRS> extends PIDAngleCommand {
2121

2222
/**
2323
* The drive this command is controlling.

RoboRIO/src/main/java/org/usfirst/frc/team449/robot/commands/multiInterface/drive/UnidirectionalNavXShiftingDefaultDrive.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.WRAPPER_OBJECT, property = "@class")
2121
@JsonIdentityInfo(generator = ObjectIdGenerators.StringIdGenerator.class)
22-
public class UnidirectionalNavXShiftingDefaultDrive <T extends YamlSubsystem & DriveUnidirectional & SubsystemAHRS & DriveShiftable> extends UnidirectionalNavXDefaultDrive {
22+
public class UnidirectionalNavXShiftingDefaultDrive<T extends YamlSubsystem & DriveUnidirectional & SubsystemAHRS & DriveShiftable> extends UnidirectionalNavXDefaultDrive {
2323

2424
/**
2525
* The drive to execute this command on.
@@ -92,7 +92,7 @@ public UnidirectionalNavXShiftingDefaultDrive(@JsonProperty(required = true) dou
9292
public void execute() {
9393
//Auto-shifting
9494
if (!subsystem.getOverrideAutoshift()) {
95-
autoshiftComponent.autoshift((oi.getLeftOutputCached() + oi.getRightOutputCached())/2., subsystem.getLeftVelCached(),
95+
autoshiftComponent.autoshift((oi.getLeftOutputCached() + oi.getRightOutputCached()) / 2., subsystem.getLeftVelCached(),
9696
subsystem.getRightVelCached(), gear -> subsystem.setGear(gear));
9797
}
9898
super.execute();

RoboRIO/src/main/java/org/usfirst/frc/team449/robot/commands/multiSubsystem/FireShooter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import com.fasterxml.jackson.annotation.ObjectIdGenerators;
66
import org.jetbrains.annotations.Nullable;
77
import org.usfirst.frc.team449.robot.jacksonWrappers.YamlCommandGroupWrapper;
8-
import org.usfirst.frc.team449.robot.subsystem.interfaces.intake.SubsystemIntake;
9-
import org.usfirst.frc.team449.robot.subsystem.interfaces.intake.commands.SetIntakeMode;
108
import org.usfirst.frc.team449.robot.subsystem.interfaces.flywheel.SubsystemFlywheel;
119
import org.usfirst.frc.team449.robot.subsystem.interfaces.flywheel.commands.TurnAllOn;
10+
import org.usfirst.frc.team449.robot.subsystem.interfaces.intake.SubsystemIntake;
11+
import org.usfirst.frc.team449.robot.subsystem.interfaces.intake.commands.SetIntakeMode;
1212

1313
/**
1414
* Command group for firing the flywheel. Runs flywheel, runs static intake, stops dynamic intake, raises intake, and
@@ -21,7 +21,7 @@ public class FireShooter extends YamlCommandGroupWrapper {
2121
* Constructs a FireShooter command group
2222
*
2323
* @param subsystemFlywheel flywheel subsystem. Can be null.
24-
* @param subsystemIntake intake subsystem. Can be null.
24+
* @param subsystemIntake intake subsystem. Can be null.
2525
*/
2626
@JsonCreator
2727
public FireShooter(@Nullable SubsystemFlywheel subsystemFlywheel,

0 commit comments

Comments
 (0)