From b8a6e59fac6074f1d0c152eb56cc42e312c9b7a9 Mon Sep 17 00:00:00 2001 From: "Keenan D. Buckley" Date: Tue, 3 Mar 2020 01:27:12 -0700 Subject: [PATCH] Fix broke merge stuff --- .../java/frc4388/robot/commands/shooter/HoodPositionPID.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/frc4388/robot/commands/shooter/HoodPositionPID.java b/src/main/java/frc4388/robot/commands/shooter/HoodPositionPID.java index 93ddf62..380eeaf 100644 --- a/src/main/java/frc4388/robot/commands/shooter/HoodPositionPID.java +++ b/src/main/java/frc4388/robot/commands/shooter/HoodPositionPID.java @@ -8,6 +8,7 @@ package frc4388.robot.commands.shooter; import edu.wpi.first.wpilibj2.command.CommandBase; +import frc4388.robot.Constants.ShooterConstants; import frc4388.robot.subsystems.ShooterHood; public class HoodPositionPID extends CommandBase { @@ -32,7 +33,7 @@ public class HoodPositionPID extends CommandBase { public void execute() { double slope = ShooterConstants.HOOD_CONVERT_SLOPE; double b = ShooterConstants.HOOD_CONVERT_B; - firingAngle = (-slope*m_shooter.addFireAngle())+b;*/ + firingAngle = (-slope*m_shooterHood.addFireAngle())+b; //SmartDashboard.putNumber("Shoot Angle From Equation", m_shooter.addFireAngle()); //SmartDashboard.putNumber("Fire Angle", firingAngle); m_shooterHood.runAngleAdjustPID(firingAngle);