Team4388/RiseOfRidgebotics2020
1
0
Fork 0
mirror of https://github.com/Team4388/RiseOfRidgebotics2020.git synced 2026-06-09 00:38:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix broke merge stuff

Browse Source
This commit is contained in:
Keenan D. Buckley
2020-03-03 01:27:12 -07:00
parent 14c3ea82a5
commit b8a6e59fac
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/frc4388/robot/commands/shooter/HoodPositionPID.java
+2 -1
View File
@@ -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);