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

Disable all that Smart Dashboard Stuff

Browse Source
This commit is contained in:
Keenan D. Buckley
2020-03-02 22:32:29 -07:00
parent 8d5563af7f
commit 97aa73d69a
14 changed files with 55 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/frc4388/robot/commands/auto/Wait.java
+2 -2
View File
@@ -46,11 +46,11 @@ public class Wait extends CommandBase {
public void execute() {
if (counter == 0) {
SmartDashboard.putNumber("Wait Coordinates" + m_waitNum, m_currentTime);
//SmartDashboard.putNumber("Wait Coordinates" + m_waitNum, m_currentTime);
}
m_currentTime = System.currentTimeMillis();
SmartDashboard.putNumber("Time Difference for Wait", (m_currentTime - m_startTime));
//SmartDashboard.putNumber("Time Difference for Wait", (m_currentTime - m_startTime));
counter ++;
}
src/main/java/frc4388/robot/commands/drive/DriveStraightToPositionMM.java
+2 -2
View File
@@ -61,7 +61,7 @@ public class DriveStraightToPositionMM extends CommandBase {
//System.err.println("Sensor Error \n" + m_drive.m_rightFrontMotor.getClosedLoopError(DriveConstants.PID_TURN));
//System.err.println("Sensor Target \n" + m_drive.m_rightFrontMotor.getClosedLoopTarget(DriveConstants.PID_TURN));
m_drive.runMotionMagicPID(m_targetPosOut, m_targetGyro);
SmartDashboard.putBoolean("MM Run", true);
//SmartDashboard.putBoolean("MM Run", true);
i++;
}
@@ -74,7 +74,7 @@ public class DriveStraightToPositionMM extends CommandBase {
@Override
public boolean isFinished() {
if (Math.abs((int)m_drive.m_rightFrontMotor.getSelectedSensorVelocity(DriveConstants.PID_PRIMARY)) < 5 && isGoneFast){
SmartDashboard.putBoolean("MM Run", false);
//SmartDashboard.putBoolean("MM Run", false);
return true;
} else {
if ((m_drive.m_rightFrontMotor.getSelectedSensorVelocity(DriveConstants.PID_PRIMARY) > 100)) {
src/main/java/frc4388/robot/commands/drive/DriveWithJoystickAuxPID.java
+3 -3
View File
@@ -59,9 +59,9 @@ public class DriveWithJoystickAuxPID extends CommandBase {
m_drive.driveWithInputAux(moveOutput, m_targetGyro);
System.err.println("Target: " + m_targetGyro);
System.err.println("Current: " + currentGyro);
System.err.println();
//System.err.println("Target: " + m_targetGyro);
//System.err.println("Current: " + currentGyro);
//System.err.println();
}
// Called once the command ends or is interrupted.
src/main/java/frc4388/robot/commands/drive/DriveWithJoystickDriveStraight.java
+2 -2
View File
@@ -106,12 +106,12 @@ public class DriveWithJoystickDriveStraight extends CommandBase {
steerOutput = (cosMultiplier - deadzone) * Math.cos(1.571*steer) - cosMultiplier;
}
m_drive.driveWithInput(move, steerOutput);
System.out.println("Driving With Input");
//System.out.println("Driving With Input");
}
private void runDriveStraight(double move) {
m_drive.driveWithInputAux(move * 3/4, m_targetGyro);
System.out.println("Driving Straight with Target: " + m_targetGyro);
//System.out.println("Driving Straight with Target: " + m_targetGyro);
}
/**
src/main/java/frc4388/robot/commands/drive/DriveWithJoystickUsingDeadAssistPID.java
+3 -3
View File
@@ -132,12 +132,12 @@ public class DriveWithJoystickUsingDeadAssistPID extends CommandBase {
}
m_drive.driveWithInput(move, steerOutput);
System.out.println("Driving With Input");
//System.out.println("Driving With Input");
}
private void runDriveStraight(double move) {
m_drive.driveWithInputAux(move * 3/4, m_targetGyro);
System.out.println("Driving Straight with Target: " + m_targetGyro);
//System.out.println("Driving Straight with Target: " + m_targetGyro);
}
private void runStoppedTurn(double steer) {
@@ -158,7 +158,7 @@ public class DriveWithJoystickUsingDeadAssistPID extends CommandBase {
} else {
m_drive.driveWithInputAux(0, m_targetGyro);
}
System.out.println("Turning with Target: " + m_targetGyro);
//System.out.println("Turning with Target: " + m_targetGyro);
}
/**
src/main/java/frc4388/robot/commands/drive/TurnDegrees.java
+2 -2
View File
@@ -50,8 +50,8 @@ public class TurnDegrees extends CommandBase {
m_drive.runTurningPID(m_targetAngleTicksOut);
SmartDashboard.putNumber("Turning Error", Math.abs(m_currentYawInTicks - m_targetAngleTicksOut));
SmartDashboard.putNumber("Turning Target", m_targetAngleTicksOut);
//SmartDashboard.putNumber("Turning Error", Math.abs(m_currentYawInTicks - m_targetAngleTicksOut));
//SmartDashboard.putNumber("Turning Target", m_targetAngleTicksOut);
i++;
}
src/main/java/frc4388/robot/commands/shooter/HoodPositionPID.java
+2 -2
View File
@@ -33,8 +33,8 @@ public class HoodPositionPID extends CommandBase {
/*double slope = ShooterConstants.HOOD_CONVERT_SLOPE;
double b = ShooterConstants.HOOD_CONVERT_B;
firingAngle = (-slope*m_shooter.addFireAngle())+b;*/
SmartDashboard.putNumber("Shoot Angle From Equation", m_shooter.addFireAngle());
SmartDashboard.putNumber("Fire Angle", firingAngle);
//SmartDashboard.putNumber("Shoot Angle From Equation", m_shooter.addFireAngle());
//SmartDashboard.putNumber("Fire Angle", firingAngle);
m_shooter.runAngleAdjustPID(firingAngle);
}
src/main/java/frc4388/robot/commands/shooter/ShooterVelocityControlPID.java
+2 -2
View File
@@ -36,8 +36,8 @@ public class ShooterVelocityControlPID extends CommandBase {
public void execute() {
m_shooter.runDrumShooterVelocityPID(/*m_shooter.addFireVel()*/13000);
m_shooter.runAngleAdjustPID(m_shooter.addFireAngle());
SmartDashboard.putNumber("Fire Velocity", m_shooter.addFireVel());
SmartDashboard.putNumber("Fire Angle", m_shooter.addFireAngle());
//SmartDashboard.putNumber("Fire Velocity", m_shooter.addFireVel());
//SmartDashboard.putNumber("Fire Angle", m_shooter.addFireAngle());
}
// Called once the command ends or is interrupted.