Team4388/2022NoWayHome
1
0
Fork 0
mirror of https://github.com/Team4388/2022NoWayHome.git synced 2026-06-09 08:48:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'Shooter' of https://github.com/Team4388/2022NoWayHome into Shooter"

Browse Source 
This reverts commit 82297e5a16, reversing
changes made to 71a6afd240.
This commit is contained in:
Pushkar9236
2022-01-28 19:05:58 -07:00
parent 82297e5a16
commit 6d53d0431a
7 changed files with 13 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/frc4388/robot/subsystems/BoomBoom.java
+2 -3
View File
@@ -4,7 +4,6 @@
package frc4388.robot.subsystems;
import java.io.Console;
import java.util.Base64.Encoder;
import com.ctre.phoenix.motorcontrol.NeutralMode;
@@ -28,7 +27,6 @@ public ShooterTables m_shooterTable;
public static Gains m_drumShooterGains = ShooterConstants.DRUM_SHOOTER_GAINS;
public static BoomBoom m_boomBoom;
public static IHandController m_driverController; //not sure if driverController in 2022 = m_controller in 2020
BangBangController m_controller = new BangBangController();
double velP;
double input;
@@ -137,6 +135,7 @@ public void setShooterGains() {
m_shooterFalconLeft.set(TalonFXControlMode.Velocity, targetVel); //Init
m_shooterFalconRight.follow(m_shooterFalconLeft);
// New BoomBoom controller stuff
BangBangController controller = new BangBangController();
//Controls a motor with the output of the BangBang controller
//Controls a motor with the output of the BangBang conroller and a feedforward
//Shrinks the feedforward slightly to avoid over speeding the shooter
@@ -144,4 +143,4 @@ public void setShooterGains() {
}
}
}
src/main/java/frc4388/robot/subsystems/Turret.java
+3 -3
View File
@@ -67,11 +67,11 @@ public class Turret extends SubsystemBase {
@Override
public void periodic() {
// SmartDashboard.putNumber("Turret Angle Raw", getboomBoomRotatePosition());
SmartDashboard.putNumber("Turret Angle Raw", getboomBoomRotatePosition());
// SmartDashboard.putData("Turret Angle", (Sendable) m_turretGyro);
SmartDashboard.putData("Turret Angle", (Sendable) m_turretGyro);
// SmartDashboard.putBoolean("Turret Aimed", m_isAimReady);
SmartDashboard.putBoolean("Turret Aimed", m_isAimReady);
// This method will be called once per scheduler run
}