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

Conventions

Browse Source 
No functional change
This commit is contained in:
ryan123rudder
2020-03-01 00:41:23 -07:00
parent 272951ed67
commit d11083e560
17 changed files with 61 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/frc4388/robot/subsystems/Shooter.java
+4 -4
View File
@@ -57,7 +57,7 @@ public class Shooter extends SubsystemBase {
public Trims shooterTrims;
/*
* Creates a new Shooter subsystem.
* Creates a new Shooter subsystem, with the drum shooter and the angle adjsuter.
*/
public Shooter() {
//Testing purposes reseting gyros
@@ -100,8 +100,8 @@ public class Shooter extends SubsystemBase {
m_angleAdjustMotor.enableSoftLimit(SoftLimitDirection.kForward, true);
m_angleAdjustMotor.enableSoftLimit(SoftLimitDirection.kReverse, true);
m_angleAdjustMotor.setSoftLimit(SoftLimitDirection.kForward, 33);
m_angleAdjustMotor.setSoftLimit(SoftLimitDirection.kReverse, 3);
m_angleAdjustMotor.setSoftLimit(SoftLimitDirection.kForward, ShooterConstants.HOOD_UP_SOFT_LIMIT);
m_angleAdjustMotor.setSoftLimit(SoftLimitDirection.kReverse, ShooterConstants.HOOD_DOWN_SOFT_LIMIT);
}
@@ -159,7 +159,7 @@ public class Shooter extends SubsystemBase {
*/
public void runDrumShooterVelocityPID(double targetVel, double actualVel) {
SmartDashboard.putNumber("shoot", actualVel);
if (actualVel < targetVel - 1000){
if (actualVel < targetVel - ShooterConstants.DRUM_RAMP_LIMIT){
m_shooterFalcon.set(TalonFXControlMode.PercentOutput, 1);//Ramp up
}
else{ //PID Based on targetVel
src/main/java/frc4388/robot/subsystems/ShooterAim.java
+4 -4
View File
@@ -34,7 +34,7 @@ public class ShooterAim extends SubsystemBase {
/**
* Creates a new ShooterAim.
* Creates a subsytem for the turret aiming
*/
public ShooterAim() {
//resetGyroShooterRotate();
@@ -47,12 +47,12 @@ public class ShooterAim extends SubsystemBase {
m_shooterRotateMotor.enableSoftLimit(SoftLimitDirection.kForward, false);
m_shooterRotateMotor.enableSoftLimit(SoftLimitDirection.kReverse, true);
m_shooterRotateMotor.setSoftLimit(SoftLimitDirection.kForward, -2);
m_shooterRotateMotor.setSoftLimit(SoftLimitDirection.kReverse, -56);
m_shooterRotateMotor.setSoftLimit(SoftLimitDirection.kForward, ShooterConstants.TURRET_RIGHT_SOFT_LIMIT);
m_shooterRotateMotor.setSoftLimit(SoftLimitDirection.kReverse, ShooterConstants.TURRET_LEFT_SOFT_LIMIT);
}
public void runShooterWithInput(double input) {
m_shooterRotateMotor.set(input/3);
m_shooterRotateMotor.set(input*ShooterConstants.TURRET_SPEED_MULTIPLIER);
}
src/main/java/frc4388/robot/subsystems/Storage.java
-11
View File
@@ -102,15 +102,4 @@ public class Storage extends SubsystemBase {
public void setStoragePID(double position){
m_storagePIDController.setReference(position , ControlType.kPosition);
}
/*
If pressing aim
run unti; hitting top beam
else
Run until hitting bottom beam
dont run intake if balls not at bottom
2 beamms total
*/
}