Merge branch 'master' of https://github.com/FRC1519/2020-Robot

Author: robertdeml

src/main/java/org/mayheminc/robot2020/RobotContainer.java

@@ -37,7 +37,7 @@ public class RobotContainer {
     public static final Intake intake = new Intake();
     public static final Autonomous autonomous = new Autonomous();
     public static final Targeting targeting = new Targeting();
-    // public static final Compressor compressor = new Compressor();
+    public static final AirCompressor compressor = new AirCompressor();
     public static PidTuner pidtuner;
     public static final Chimney chimney = new Chimney();
 
@@ -153,7 +153,7 @@ private void configureOperatorPadButtons() {
         // new ShooterAdjustWheel(+100));
         OPERATOR_PAD.OPERATOR_PAD_BUTTON_FOUR.whenPressed(new IntakeSetPosition(RobotContainer.intake.PIVOT_UP));
         // new ShooterSetWheel(1000));
-        OPERATOR_PAD.OPERATOR_PAD_BUTTON_FIVE.whileHeld(new MagazineSetChimney(1.0));
+        OPERATOR_PAD.OPERATOR_PAD_BUTTON_FIVE.whileHeld(new ChimneySetChimney(1.0));
         OPERATOR_PAD.OPERATOR_PAD_BUTTON_SIX.whileHeld(new IntakeSetRollers(-1.0));
 
         OPERATOR_PAD.OPERATOR_PAD_BUTTON_EIGHT.whileHeld(new IntakeSetRollers(1.0));

src/main/java/org/mayheminc/robot2020/commands/AirCompressorDefault.java

@@ -0,0 +1,44 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2019 FIRST. All Rights Reserved.                             */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+package org.mayheminc.robot2020.commands;
+
+import org.mayheminc.robot2020.RobotContainer;
+
+import edu.wpi.first.wpilibj2.command.CommandBase;
+
+public class AirCompressorDefault extends CommandBase {
+  /**
+   * Creates a new AirCompressorDefault.
+   */
+  public AirCompressorDefault() {
+    // Use addRequirements() here to declare subsystem dependencies.
+  }
+
+  // Called when the command is initially scheduled.
+  @Override
+  public void initialize() {
+    // robot.is
+    RobotContainer.compressor.setCompresor(true);
+  }
+
+  // Called every time the scheduler runs while the command is scheduled.
+  @Override
+  public void execute() {
+  }
+
+  // Called once the command ends or is interrupted.
+  @Override
+  public void end(boolean interrupted) {
+  }
+
+  // Returns true when the command should end.
+  @Override
+  public boolean isFinished() {
+    return false;
+  }
+}

src/main/java/org/mayheminc/robot2020/commands/MagazineSetChimney.java renamed to src/main/java/org/mayheminc/robot2020/commands/ChimneySetChimney.java

@@ -11,13 +11,13 @@
 
 import edu.wpi.first.wpilibj2.command.CommandBase;
 
-public class MagazineSetChimney extends CommandBase {
+public class ChimneySetChimney extends CommandBase {
   double m_speed;
 
   /**
    * Creates a new MagazineSetChimney.
    */
-  public MagazineSetChimney(double d) {
+  public ChimneySetChimney(double d) {
     // Use addRequirements() here to declare subsystem dependencies.
     addRequirements(RobotContainer.chimney);
     m_speed = d;
@@ -40,4 +40,4 @@ public void end(boolean interrupted) {
   public boolean isFinished() {
     return false;
   }
-}
+}

src/main/java/org/mayheminc/robot2020/commands/MagazineSetTurntable.java

@@ -9,6 +9,7 @@
 
 import org.mayheminc.robot2020.RobotContainer;
 
+import edu.wpi.first.wpilibj.Talon;
 import edu.wpi.first.wpilibj2.command.CommandBase;
 
 public class MagazineSetTurntable extends CommandBase {

src/main/java/org/mayheminc/robot2020/commands/ShooterReadyAimFire.java

@@ -24,9 +24,9 @@ public ShooterReadyAimFire() {
     super();
     addCommands(new TargetingIsOnTarget());
     addCommands(new MagazineSetTurntable(0.3));
-    addCommands(new MagazineSetChimney(0.3));
+    addCommands(new ChimneySetChimney(0.3));
     addCommands(new ParallelRaceGroup(new ShooterFireWhenReady(), new Wait(5.0)));
     addCommands(new MagazineSetTurntable(0.0));
-    addCommands(new MagazineSetChimney(0.0));
+    addCommands(new ChimneySetChimney(0.0));
   }
 }

src/main/java/org/mayheminc/robot2020/subsystems/AirCompressor.java

@@ -0,0 +1,34 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2019 FIRST. All Rights Reserved.                             */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+package org.mayheminc.robot2020.subsystems;
+
+import edu.wpi.first.wpilibj.Compressor;
+import edu.wpi.first.wpilibj2.command.SubsystemBase;
+
+public class AirCompressor extends SubsystemBase {
+  Compressor compressor = new Compressor();
+
+  /**
+   * Creates a new compressor.
+   */
+  public AirCompressor() {
+  }
+
+  public void setCompresor(boolean b) {
+    if (b) {
+      compressor.start();
+    } else {
+      compressor.stop();
+    }
+  }
+
+  @Override
+  public void periodic() {
+    // This method will be called once per scheduler run
+  }
+}

src/main/java/org/mayheminc/robot2020/subsystems/Chimney.java

@@ -42,7 +42,6 @@ void updateSmartDashboard() {
   }
 
   void monitorTurntableMovement() {
-
   }
 
   public void setChimneySpeed(double speed) {