Skip to content
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

Fixed Import Warnings #55

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Fixed Import Warnings #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fe27dd6
Fixed Import Warnings
Nicholas-Stokes Mar 2, 2020
b17ca04
Cleaned up OI imports
Nicholas-Stokes Mar 2, 2020
67ea8c9
Fixed some Auton Imports
Nicholas-Stokes Mar 3, 2020
4abd8f6
Update.java
Nicholas-Stokes Mar 3, 2020
8ef0b1d
Update FXSwerveModule.java
Nicholas-Stokes Mar 3, 2020
0053eb2
Merge branch 'master' into Nicholas-FIxImportWarnings
Nicholas-Stokes Mar 13, 2020
be12771
Fixed error in master
Nicholas-Stokes Mar 13, 2020
574dd8f
Fixed more import warnings
Nicholas-Stokes Mar 13, 2020
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
18 changes: 7 additions & 11 deletions src/main/java/frc/robot/OI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
package frc.robot;

import frc.robot.commands.swerve.*;
import edu.wpi.first.wpilibj2.command.CommandBase;
import edu.wpi.first.wpilibj2.command.ConditionalCommand;
Comment on lines +3 to +4
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this be changed to import edu.wpi.first.wpilibj2.command.*;?

import frc.robot.commands.Agitator.*;
import frc.robot.commands.Climber.*;
import frc.robot.commands.Intake.*;
import frc.robot.commands.KickerWheel.*;
import frc.robot.commands.LED.LEDRuntime;
import frc.robot.commands.Serializer.*;
import frc.robot.commands.Servo.deployHyperLoop;
import frc.robot.commands.Servo.retractHyperLoop;
import edu.wpi.first.wpilibj2.command.CommandBase;
import edu.wpi.first.wpilibj2.command.ConditionalCommand;
import frc.robot.Robot;
import frc.robot.nerdyfiles.controller.*;
import frc.robot.commands.Servo.*;
import frc.robot.commands.Shooter.*;
import frc.robot.commands.ShooterSystem.*;
import frc.robot.commands.Vision.limeLightLEDOff;
import frc.robot.commands.Vision.limeLightLEDOn;
import frc.robot.commands.Vision.setBallTracking;
import frc.robot.commands.Vision.*;
import frc.robot.commands.swerve.*;
import frc.robot.nerdyfiles.controller.*;


/**
* OI Class where all controllers and button presses are placed
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/frc/robot/commands/Agitator/runAgitator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package frc.robot.commands.Agitator;

import frc.robot.Constants;
import frc.robot.subsystems.Agitator;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.InstantCommand;
import frc.robot.subsystems.Agitator;

/**
* Sets the agitator speed
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/frc/robot/commands/Climber/activateClimber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package frc.robot.commands.Climber;

import frc.robot.Constants;
import frc.robot.Robot;
import frc.robot.subsystems.Climber;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.InstantCommand;
import frc.robot.subsystems.Climber;

/**
* Sets the climber speed
Expand Down
6 changes: 1 addition & 5 deletions src/main/java/frc/robot/commands/Climber/runClimber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
package frc.robot.commands.Climber;

import frc.robot.Constants;
import frc.robot.Robot;
import frc.robot.subsystems.Climber;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;
import edu.wpi.first.wpilibj2.command.InstantCommand;
import frc.robot.subsystems.Climber;

/**
* Sets the climber speed
Expand Down
8 changes: 2 additions & 6 deletions src/main/java/frc/robot/commands/Climber/runClimberJoystick.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
package frc.robot.commands.Climber;

import frc.robot.Constants;
import frc.robot.Robot;
import frc.robot.subsystems.Climber;

import com.ctre.phoenix.motorcontrol.ControlMode;

import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;
import edu.wpi.first.wpilibj2.command.InstantCommand;
import frc.robot.Robot;
import frc.robot.subsystems.Climber;

/**
* Sets the climber speed
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/frc/robot/commands/KickerWheel/stopKicker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package frc.robot.commands.KickerWheel;

import frc.robot.Robot;
import frc.robot.subsystems.KickerWheel;

import com.ctre.phoenix.motorcontrol.NeutralMode;
import com.revrobotics.CANSparkMax.IdleMode;

import edu.wpi.first.wpilibj2.command.InstantCommand;
import frc.robot.Robot;
import frc.robot.subsystems.KickerWheel;

/**
* A command that stops the kicker wheel using the kicker subsystem.
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/frc/robot/commands/Serializer/serializerBallControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package frc.robot.commands.Serializer;

import edu.wpi.first.wpilibj2.command.CommandBase;
import frc.robot.Constants;
import frc.robot.Robot;
import frc.robot.subsystems.Serializer;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;

/**
* A command that sets the kicker speed using the Kicker subsystem.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/frc/robot/commands/TimeOfFlight/findSensor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package frc.robot.commands.TimeOfFlight;

import edu.wpi.first.wpilibj2.command.CommandBase;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc.robot.subsystems.TimeOfFlight;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/frc/robot/commands/Vision/limeLightLEDOff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package frc.robot.commands.Vision;

import edu.wpi.first.wpilibj2.command.InstantCommand;
import frc.robot.Robot;
import frc.robot.subsystems.Vision;
import edu.wpi.first.wpilibj2.command.InstantCommand;

/**
* Limelight LED will turn off
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/frc/robot/commands/Vision/limeLightLEDOn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package frc.robot.commands.Vision;

import edu.wpi.first.wpilibj2.command.InstantCommand;
import frc.robot.Robot;
import frc.robot.subsystems.Vision;
import edu.wpi.first.wpilibj2.command.InstantCommand;

/**
* Limelight LEDs will turn on
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/frc/robot/commands/auto/AutoDriveWithJoystickInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package frc.robot.commands.auto;

import edu.wpi.first.wpilibj2.command.CommandBase;
import frc.robot.Constants;
import frc.robot.Robot;
import frc.robot.subsystems.SwerveDrivetrain;
import edu.wpi.first.hal.sim.ConstBufferCallback;
import edu.wpi.first.wpilibj2.command.CommandBase;

/**
* Sets the forwards value to a set a mock joystick value
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/frc/robot/commands/auto/AutoResetRampRate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package frc.robot.commands.auto;

import edu.wpi.first.wpilibj2.command.InstantCommand;
import frc.robot.Robot;
import frc.robot.subsystems.OperatorAngleAdjustment;
import edu.wpi.first.wpilibj2.command.InstantCommand;

/**
* Resets the ramp rate on the shooter to be zero
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/frc/robot/commands/auto/AutoRotateWithJoystickInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package frc.robot.commands.auto;

import frc.robot.Constants;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc.robot.Robot;
import frc.robot.subsystems.SwerveDrivetrain;
import edu.wpi.first.hal.sim.ConstBufferCallback;
import edu.wpi.first.wpilibj2.command.CommandBase;

/**
* Sets the forwards value to a set a mock joystick value
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/frc/robot/commands/auto/AutoRotateWithVision.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package frc.robot.commands.auto;

import edu.wpi.first.wpilibj2.command.CommandBase;
import frc.robot.Constants;
import frc.robot.Robot;
import frc.robot.subsystems.SwerveDrivetrain;
import edu.wpi.first.hal.sim.ConstBufferCallback;
import edu.wpi.first.wpilibj2.command.CommandBase;

/**
* Sets the forwards value to a set a mock joystick value
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/frc/robot/commands/auto/AutoStrafeWithPixy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package frc.robot.commands.auto;

import edu.wpi.first.wpilibj2.command.CommandBase;
import frc.robot.Constants;
import frc.robot.Robot;
import frc.robot.subsystems.SwerveDrivetrain;
import edu.wpi.first.hal.sim.ConstBufferCallback;
import edu.wpi.first.wpilibj2.command.CommandBase;

/**
* Sets the forwards value to a set a mock joystick value
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/frc/robot/commands/auto/autoBallCounter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
package frc.robot.commands.auto;

import frc.robot.Constants;
import frc.robot.Constants.Swerve;
import frc.robot.subsystems.OperatorAngleAdjustment;
import frc.robot.subsystems.SwerveDrivetrain;
import com.ctre.phoenix.motorcontrol.NeutralMode;

import edu.wpi.first.wpilibj.Counter;
import edu.wpi.first.wpilibj.DigitalInput;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;
Expand Down
6 changes: 1 addition & 5 deletions src/main/java/frc/robot/commands/auto/checkShooterVelocity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
package frc.robot.commands.auto;

import edu.wpi.first.wpilibj2.command.CommandBase;
import frc.robot.Robot;
import frc.robot.Constants.Swerve;
import frc.robot.subsystems.Serializer;
import frc.robot.subsystems.SwerveDrivetrain;
import com.ctre.phoenix.motorcontrol.NeutralMode;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;

/**
* Sets the module angles to the desired rotation angle and rotates the robot a specified direction, either left or right
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/frc/robot/commands/auto/commandgroups/common/ShootNineBall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
import frc.robot.Constants;
import frc.robot.Robot;
import frc.robot.commands.Shooter.stopShooter;
import frc.robot.commands.auto.checkShooterVelocity;
import frc.robot.commands.Shooter.*;
import frc.robot.commands.auto.*;
import frc.robot.commands.auto.commandgroups.common.systemactions.*;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/frc/robot/commands/auto/commandgroups/common/ShootSixBall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
import frc.robot.Constants;
import frc.robot.Robot;
import frc.robot.commands.Shooter.stopShooter;
import frc.robot.commands.auto.checkShooterVelocity;
import frc.robot.commands.Shooter.*;
import frc.robot.commands.auto.*;
import frc.robot.commands.auto.commandgroups.common.systemactions.*;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/frc/robot/commands/auto/commandgroups/common/ShootThreeBall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
import frc.robot.Constants;
import frc.robot.Robot;
import frc.robot.commands.Shooter.stopShooter;
import frc.robot.commands.auto.checkShooterVelocity;
import frc.robot.commands.Shooter.*;
import frc.robot.commands.auto.*;
import frc.robot.commands.auto.commandgroups.common.systemactions.*;

/**
Expand Down
11 changes: 2 additions & 9 deletions src/main/java/frc/robot/commands/auto/commandgroups/common/Trench3BallPartnerMoves.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
package frc.robot.commands.auto.commandgroups.common;

import edu.wpi.first.wpilibj2.command.*;
import frc.robot.Constants;
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
import frc.robot.Robot;
import frc.robot.commands.Agitator.*;
import frc.robot.commands.Intake.*;
import frc.robot.commands.KickerWheel.*;
import frc.robot.commands.Shooter.*;
import frc.robot.commands.auto.*;
import frc.robot.commands.auto.resetDriveEncoders;
import frc.robot.commands.auto.commandgroups.common.movement.InTrench3Ball;
import frc.robot.commands.auto.commandgroups.common.movement.PostTrench;
import frc.robot.commands.auto.commandgroups.common.movement.PostTrench3Ball;
import frc.robot.commands.auto.commandgroups.common.movement.PostTrench6Ball;
import frc.robot.commands.auto.commandgroups.common.movement.PreTrenchNoPartner;

/**
Expand Down
10 changes: 2 additions & 8 deletions src/main/java/frc/robot/commands/auto/commandgroups/common/Trench6BallPartnerMoves.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
package frc.robot.commands.auto.commandgroups.common;

import edu.wpi.first.wpilibj2.command.*;
import frc.robot.Constants;
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
import frc.robot.Robot;
import frc.robot.commands.Agitator.*;
import frc.robot.commands.Intake.*;
import frc.robot.commands.KickerWheel.*;
import frc.robot.commands.Shooter.*;
import frc.robot.commands.auto.*;
import frc.robot.commands.auto.resetDriveEncoders;
import frc.robot.commands.auto.commandgroups.common.movement.InTrench3Ball;
import frc.robot.commands.auto.commandgroups.common.movement.PostTrench;
import frc.robot.commands.auto.commandgroups.common.movement.PostTrench6Ball;
import frc.robot.commands.auto.commandgroups.common.movement.PreTrenchNoPartner;

Expand Down
2 changes: 0 additions & 2 deletions ...robot/commands/auto/commandgroups/common/movement/GeneratorThreeBallFromCenterTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@

import edu.wpi.first.wpilibj2.command.ParallelCommandGroup;
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
import edu.wpi.first.wpilibj2.command.WaitCommand;
import frc.robot.Constants;
import frc.robot.Robot;
import frc.robot.commands.Intake.runIntake;
import frc.robot.commands.KickerWheel.runKicker;
import frc.robot.commands.Serializer.runSerializer;
import frc.robot.commands.Shooter.startShooter;
import frc.robot.commands.auto.AutoDriveWithJoystickInput;
import frc.robot.commands.auto.AutoRotateWithJoystickInput;
import frc.robot.commands.auto.AutoRotateWithVision;
Expand Down
10 changes: 0 additions & 10 deletions ...ava/frc/robot/commands/auto/commandgroups/common/movement/GeneratorTwoBallNotOverBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,9 @@
package frc.robot.commands.auto.commandgroups.common.movement;

import edu.wpi.first.wpilibj2.command.ParallelCommandGroup;
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
import edu.wpi.first.wpilibj2.command.WaitCommand;
import frc.robot.Robot;
import frc.robot.commands.Intake.runIntake;
import frc.robot.commands.KickerWheel.runKicker;
import frc.robot.commands.Serializer.runSerializer;
import frc.robot.commands.Shooter.startShooter;
import frc.robot.commands.auto.AutoDriveWithJoystickInput;
import frc.robot.commands.auto.AutoRotateWithJoystickInput;
import frc.robot.commands.auto.AutoRotateWithVision;
import frc.robot.commands.auto.autoStartShooter;
import frc.robot.commands.auto.resetDriveEncoders;
import frc.robot.commands.auto.zeroAngleEncoders;

/**
* Drives from the initiation line to the generator command group
Expand Down
12 changes: 7 additions & 5 deletions src/main/java/frc/robot/commands/auto/commandgroups/common/movement/InTrench3Ball.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package frc.robot.commands.auto.commandgroups.common.movement;

import edu.wpi.first.wpilibj2.command.*;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't this work instead of just the two classes being imported?

import edu.wpi.first.wpilibj2.command.ParallelCommandGroup;
import edu.wpi.first.wpilibj2.command.WaitCommand;
import frc.robot.Constants;
import frc.robot.Robot;
import frc.robot.commands.Agitator.*;
import frc.robot.commands.Intake.*;
import frc.robot.commands.KickerWheel.*;
import frc.robot.commands.auto.*;
import frc.robot.commands.Agitator.runAgitator;
import frc.robot.commands.Intake.runIntake;
import frc.robot.commands.KickerWheel.runKicker;
import frc.robot.commands.auto.AutoStrafeWithPixy;
import frc.robot.commands.auto.autoStartShooter;

/**
* Drives from the initiation line to the Trench to gather power cells
Expand Down
8 changes: 2 additions & 6 deletions src/main/java/frc/robot/commands/auto/commandgroups/common/movement/PostTrench.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
package frc.robot.commands.auto.commandgroups.common.movement;

import edu.wpi.first.wpilibj2.command.*;
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
import frc.robot.Constants;
import frc.robot.Robot;
import frc.robot.commands.Agitator.*;
import frc.robot.commands.Intake.*;
import frc.robot.commands.KickerWheel.*;
import frc.robot.commands.Serializer.runSerializer;
import frc.robot.commands.Shooter.*;
import frc.robot.commands.Serializer.*;
import frc.robot.commands.auto.*;
import frc.robot.commands.auto.commandgroups.common.movement.PreTrenchPartnerOnRight;

/**
* Drives from the initiation line to the Trench to gather power cells
Expand Down
12 changes: 5 additions & 7 deletions src/main/java/frc/robot/commands/auto/commandgroups/common/movement/PostTrench3Ball.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package frc.robot.commands.auto.commandgroups.common.movement;

import edu.wpi.first.wpilibj2.command.*;
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
import frc.robot.Constants;
import frc.robot.Robot;
import frc.robot.commands.Agitator.*;
import frc.robot.commands.Intake.*;
import frc.robot.commands.KickerWheel.*;
import frc.robot.commands.Serializer.runSerializer;
import frc.robot.commands.Shooter.*;
import frc.robot.commands.Vision.limeLightLEDOn;
import frc.robot.commands.Vision.limelightPipeline;
import frc.robot.commands.auto.*;
import frc.robot.commands.auto.commandgroups.common.movement.PreTrenchPartnerOnRight;
import frc.robot.commands.auto.AutoDriveWithJoystickInput;
import frc.robot.commands.auto.AutoRotateWithJoystickInput;
import frc.robot.commands.auto.AutoRotateWithVision;
import frc.robot.commands.auto.resetDriveEncoders;
Comment on lines +9 to +12
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why uncondense it from import frc.robot.commands.auto.*;?


/**
* Drives from the initiation line to the Trench to gather power cells
Expand Down
Loading