From 774c9ffc07d93888e4116a714b1c0a92c631fe26 Mon Sep 17 00:00:00 2001 From: Josh Young Date: Tue, 17 Jan 2017 19:59:51 -0500 Subject: [PATCH 1/2] Made organization folders --- src/com/nutrons/nu17/OI.java | 5 +++++ src/com/nutrons/nu17/Robot.java | 6 ++++++ src/com/nutrons/nu17/commands/{ => Climber}/ClimberCmd.java | 2 +- .../nu17/commands/{ => GearControl}/LowerGearPlacerCmd.java | 2 +- .../nu17/commands/{ => GearControl}/RaiseGearPlacerCmd.java | 2 +- .../nutrons/nu17/commands/{ => Intake}/GroundIntakeCmd.java | 2 +- .../nu17/commands/{ => Intake}/GroundIntakeSpitCmd.java | 2 +- .../nu17/commands/{ => Shooters}/ShootShooterCmd.java | 2 +- src/com/nutrons/nu17/subsystems/{ => Climber}/Climber.java | 2 +- .../nu17/subsystems/{ => Drivetrain}/Drivetrain.java | 2 +- .../nu17/subsystems/{ => GearControl}/GearPlacer.java | 2 +- .../nutrons/nu17/subsystems/{ => Intake}/GroundIntake.java | 2 +- src/com/nutrons/nu17/subsystems/{ => Shooters}/Shooter.java | 2 +- .../{HoodShooterFlywheel.java => Shooters/Turret.java} | 4 ++-- .../nutrons/nu17/subsystems/{ => Shooters}/TwinShooter.java | 2 +- 15 files changed, 25 insertions(+), 14 deletions(-) rename src/com/nutrons/nu17/commands/{ => Climber}/ClimberCmd.java (93%) rename src/com/nutrons/nu17/commands/{ => GearControl}/LowerGearPlacerCmd.java (93%) rename src/com/nutrons/nu17/commands/{ => GearControl}/RaiseGearPlacerCmd.java (93%) rename src/com/nutrons/nu17/commands/{ => Intake}/GroundIntakeCmd.java (95%) rename src/com/nutrons/nu17/commands/{ => Intake}/GroundIntakeSpitCmd.java (95%) rename src/com/nutrons/nu17/commands/{ => Shooters}/ShootShooterCmd.java (94%) rename src/com/nutrons/nu17/subsystems/{ => Climber}/Climber.java (96%) rename src/com/nutrons/nu17/subsystems/{ => Drivetrain}/Drivetrain.java (98%) rename src/com/nutrons/nu17/subsystems/{ => GearControl}/GearPlacer.java (93%) rename src/com/nutrons/nu17/subsystems/{ => Intake}/GroundIntake.java (97%) rename src/com/nutrons/nu17/subsystems/{ => Shooters}/Shooter.java (97%) rename src/com/nutrons/nu17/subsystems/{HoodShooterFlywheel.java => Shooters/Turret.java} (95%) rename src/com/nutrons/nu17/subsystems/{ => Shooters}/TwinShooter.java (98%) diff --git a/src/com/nutrons/nu17/OI.java b/src/com/nutrons/nu17/OI.java index c965c8d..a40b572 100644 --- a/src/com/nutrons/nu17/OI.java +++ b/src/com/nutrons/nu17/OI.java @@ -2,6 +2,11 @@ import com.nutrons.nu17.RobotMap; import com.nutrons.nu17.commands.*; +import com.nutrons.nu17.commands.GearControl.LowerGearPlacerCmd; +import com.nutrons.nu17.commands.GearControl.RaiseGearPlacerCmd; +import com.nutrons.nu17.commands.Intake.GroundIntakeCmd; +import com.nutrons.nu17.commands.Intake.GroundIntakeSpitCmd; +import com.nutrons.nu17.commands.Shooters.ShootShooterCmd; import edu.wpi.first.wpilibj.Joystick; import edu.wpi.first.wpilibj.buttons.Button; diff --git a/src/com/nutrons/nu17/Robot.java b/src/com/nutrons/nu17/Robot.java index 69e32df..00dfacd 100644 --- a/src/com/nutrons/nu17/Robot.java +++ b/src/com/nutrons/nu17/Robot.java @@ -5,6 +5,12 @@ import edu.wpi.first.wpilibj.livewindow.LiveWindow; import com.nutrons.nu17.OI; import com.nutrons.nu17.subsystems.*; +import com.nutrons.nu17.subsystems.Climber.Climber; +import com.nutrons.nu17.subsystems.Drivetrain.Drivetrain; +import com.nutrons.nu17.subsystems.GearControl.GearPlacer; +import com.nutrons.nu17.subsystems.Intake.GroundIntake; +import com.nutrons.nu17.subsystems.Shooters.Shooter; +import com.nutrons.nu17.subsystems.Shooters.TwinShooter; public class Robot extends IterativeRobot { diff --git a/src/com/nutrons/nu17/commands/ClimberCmd.java b/src/com/nutrons/nu17/commands/Climber/ClimberCmd.java similarity index 93% rename from src/com/nutrons/nu17/commands/ClimberCmd.java rename to src/com/nutrons/nu17/commands/Climber/ClimberCmd.java index bc3e1ed..af0f025 100644 --- a/src/com/nutrons/nu17/commands/ClimberCmd.java +++ b/src/com/nutrons/nu17/commands/Climber/ClimberCmd.java @@ -1,4 +1,4 @@ -package com.nutrons.nu17.commands; +package com.nutrons.nu17.commands.Climber; import com.nutrons.nu17.Robot; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/com/nutrons/nu17/commands/LowerGearPlacerCmd.java b/src/com/nutrons/nu17/commands/GearControl/LowerGearPlacerCmd.java similarity index 93% rename from src/com/nutrons/nu17/commands/LowerGearPlacerCmd.java rename to src/com/nutrons/nu17/commands/GearControl/LowerGearPlacerCmd.java index b3f59d2..717ec55 100644 --- a/src/com/nutrons/nu17/commands/LowerGearPlacerCmd.java +++ b/src/com/nutrons/nu17/commands/GearControl/LowerGearPlacerCmd.java @@ -1,4 +1,4 @@ -package com.nutrons.nu17.commands; +package com.nutrons.nu17.commands.GearControl; import com.nutrons.nu17.Robot; diff --git a/src/com/nutrons/nu17/commands/RaiseGearPlacerCmd.java b/src/com/nutrons/nu17/commands/GearControl/RaiseGearPlacerCmd.java similarity index 93% rename from src/com/nutrons/nu17/commands/RaiseGearPlacerCmd.java rename to src/com/nutrons/nu17/commands/GearControl/RaiseGearPlacerCmd.java index 736c371..bdd1cfa 100644 --- a/src/com/nutrons/nu17/commands/RaiseGearPlacerCmd.java +++ b/src/com/nutrons/nu17/commands/GearControl/RaiseGearPlacerCmd.java @@ -1,4 +1,4 @@ -package com.nutrons.nu17.commands; +package com.nutrons.nu17.commands.GearControl; import com.nutrons.nu17.Robot; diff --git a/src/com/nutrons/nu17/commands/GroundIntakeCmd.java b/src/com/nutrons/nu17/commands/Intake/GroundIntakeCmd.java similarity index 95% rename from src/com/nutrons/nu17/commands/GroundIntakeCmd.java rename to src/com/nutrons/nu17/commands/Intake/GroundIntakeCmd.java index ffbf344..64a404b 100644 --- a/src/com/nutrons/nu17/commands/GroundIntakeCmd.java +++ b/src/com/nutrons/nu17/commands/Intake/GroundIntakeCmd.java @@ -1,4 +1,4 @@ -package com.nutrons.nu17.commands; +package com.nutrons.nu17.commands.Intake; import com.nutrons.nu17.Robot; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/com/nutrons/nu17/commands/GroundIntakeSpitCmd.java b/src/com/nutrons/nu17/commands/Intake/GroundIntakeSpitCmd.java similarity index 95% rename from src/com/nutrons/nu17/commands/GroundIntakeSpitCmd.java rename to src/com/nutrons/nu17/commands/Intake/GroundIntakeSpitCmd.java index 898bc4b..c49e8b5 100644 --- a/src/com/nutrons/nu17/commands/GroundIntakeSpitCmd.java +++ b/src/com/nutrons/nu17/commands/Intake/GroundIntakeSpitCmd.java @@ -1,4 +1,4 @@ -package com.nutrons.nu17.commands; +package com.nutrons.nu17.commands.Intake; import com.nutrons.nu17.Robot; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/com/nutrons/nu17/commands/ShootShooterCmd.java b/src/com/nutrons/nu17/commands/Shooters/ShootShooterCmd.java similarity index 94% rename from src/com/nutrons/nu17/commands/ShootShooterCmd.java rename to src/com/nutrons/nu17/commands/Shooters/ShootShooterCmd.java index 49ac92e..6b0ab92 100644 --- a/src/com/nutrons/nu17/commands/ShootShooterCmd.java +++ b/src/com/nutrons/nu17/commands/Shooters/ShootShooterCmd.java @@ -1,4 +1,4 @@ -package com.nutrons.nu17.commands; +package com.nutrons.nu17.commands.Shooters; import com.nutrons.nu17.Robot; diff --git a/src/com/nutrons/nu17/subsystems/Climber.java b/src/com/nutrons/nu17/subsystems/Climber/Climber.java similarity index 96% rename from src/com/nutrons/nu17/subsystems/Climber.java rename to src/com/nutrons/nu17/subsystems/Climber/Climber.java index 034fc40..6aab37f 100644 --- a/src/com/nutrons/nu17/subsystems/Climber.java +++ b/src/com/nutrons/nu17/subsystems/Climber/Climber.java @@ -1,4 +1,4 @@ -package com.nutrons.nu17.subsystems; +package com.nutrons.nu17.subsystems.Climber; import com.nutrons.nu17.RobotMap; import edu.wpi.first.wpilibj.DigitalInput; diff --git a/src/com/nutrons/nu17/subsystems/Drivetrain.java b/src/com/nutrons/nu17/subsystems/Drivetrain/Drivetrain.java similarity index 98% rename from src/com/nutrons/nu17/subsystems/Drivetrain.java rename to src/com/nutrons/nu17/subsystems/Drivetrain/Drivetrain.java index 0ab7d32..a38245f 100644 --- a/src/com/nutrons/nu17/subsystems/Drivetrain.java +++ b/src/com/nutrons/nu17/subsystems/Drivetrain/Drivetrain.java @@ -1,4 +1,4 @@ -package com.nutrons.nu17.subsystems; +package com.nutrons.nu17.subsystems.Drivetrain; import com.nutrons.nu17.OI; import com.nutrons.nu17.RobotMap; diff --git a/src/com/nutrons/nu17/subsystems/GearPlacer.java b/src/com/nutrons/nu17/subsystems/GearControl/GearPlacer.java similarity index 93% rename from src/com/nutrons/nu17/subsystems/GearPlacer.java rename to src/com/nutrons/nu17/subsystems/GearControl/GearPlacer.java index 491c5b5..c3676ae 100644 --- a/src/com/nutrons/nu17/subsystems/GearPlacer.java +++ b/src/com/nutrons/nu17/subsystems/GearControl/GearPlacer.java @@ -1,4 +1,4 @@ -package com.nutrons.nu17.subsystems; +package com.nutrons.nu17.subsystems.GearControl; import com.nutrons.nu17.RobotMap; diff --git a/src/com/nutrons/nu17/subsystems/GroundIntake.java b/src/com/nutrons/nu17/subsystems/Intake/GroundIntake.java similarity index 97% rename from src/com/nutrons/nu17/subsystems/GroundIntake.java rename to src/com/nutrons/nu17/subsystems/Intake/GroundIntake.java index d1cfce5..fbd5312 100644 --- a/src/com/nutrons/nu17/subsystems/GroundIntake.java +++ b/src/com/nutrons/nu17/subsystems/Intake/GroundIntake.java @@ -1,4 +1,4 @@ -package com.nutrons.nu17.subsystems; +package com.nutrons.nu17.subsystems.Intake; import com.nutrons.nu17.RobotMap; diff --git a/src/com/nutrons/nu17/subsystems/Shooter.java b/src/com/nutrons/nu17/subsystems/Shooters/Shooter.java similarity index 97% rename from src/com/nutrons/nu17/subsystems/Shooter.java rename to src/com/nutrons/nu17/subsystems/Shooters/Shooter.java index c249609..a5aa8a9 100644 --- a/src/com/nutrons/nu17/subsystems/Shooter.java +++ b/src/com/nutrons/nu17/subsystems/Shooters/Shooter.java @@ -1,4 +1,4 @@ -package com.nutrons.nu17.subsystems; +package com.nutrons.nu17.subsystems.Shooters; import com.nutrons.nu17.Robot; import com.nutrons.nu17.RobotMap; diff --git a/src/com/nutrons/nu17/subsystems/HoodShooterFlywheel.java b/src/com/nutrons/nu17/subsystems/Shooters/Turret.java similarity index 95% rename from src/com/nutrons/nu17/subsystems/HoodShooterFlywheel.java rename to src/com/nutrons/nu17/subsystems/Shooters/Turret.java index e2e3148..ad75fa1 100644 --- a/src/com/nutrons/nu17/subsystems/HoodShooterFlywheel.java +++ b/src/com/nutrons/nu17/subsystems/Shooters/Turret.java @@ -1,4 +1,4 @@ -package com.nutrons.nu17.subsystems; +package com.nutrons.nu17.subsystems.Shooters; import com.nutrons.nu17.RobotMap; @@ -10,7 +10,7 @@ import edu.wpi.first.wpilibj.Talon; import edu.wpi.first.wpilibj.command.Subsystem; -public class HoodShooterFlywheel extends Subsystem { +public class Turret extends Subsystem { private final Talon FLY_WHEEL_LEFT = new Talon(RobotMap.FLY_WHEEL_L); private final Talon FLY_WHEEL_RIGHT = new Talon(RobotMap.FLY_WHEEL_R); diff --git a/src/com/nutrons/nu17/subsystems/TwinShooter.java b/src/com/nutrons/nu17/subsystems/Shooters/TwinShooter.java similarity index 98% rename from src/com/nutrons/nu17/subsystems/TwinShooter.java rename to src/com/nutrons/nu17/subsystems/Shooters/TwinShooter.java index 07bedb4..ef39361 100644 --- a/src/com/nutrons/nu17/subsystems/TwinShooter.java +++ b/src/com/nutrons/nu17/subsystems/Shooters/TwinShooter.java @@ -1,4 +1,4 @@ -package com.nutrons.nu17.subsystems; +package com.nutrons.nu17.subsystems.Shooters; import com.nutrons.nu17.RobotMap; From f5de73dcda15b7e7578e9fb0a060304b61cea035 Mon Sep 17 00:00:00 2001 From: Josh Young Date: Thu, 19 Jan 2017 19:56:34 -0500 Subject: [PATCH 2/2] Organized with new stuff from master --- .../nu17/commands/{ => Shooters}/ShootTwinShooterCmd.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/com/nutrons/nu17/commands/{ => Shooters}/ShootTwinShooterCmd.java (94%) diff --git a/src/com/nutrons/nu17/commands/ShootTwinShooterCmd.java b/src/com/nutrons/nu17/commands/Shooters/ShootTwinShooterCmd.java similarity index 94% rename from src/com/nutrons/nu17/commands/ShootTwinShooterCmd.java rename to src/com/nutrons/nu17/commands/Shooters/ShootTwinShooterCmd.java index ea35362..0e99ef4 100644 --- a/src/com/nutrons/nu17/commands/ShootTwinShooterCmd.java +++ b/src/com/nutrons/nu17/commands/Shooters/ShootTwinShooterCmd.java @@ -1,4 +1,4 @@ -package com.nutrons.nu17.commands; +package com.nutrons.nu17.commands.Shooters; import com.nutrons.nu17.Robot; import edu.wpi.first.wpilibj.command.Command;