Skip to content

Commit 0d39fb8

Browse files
Working
Vision not tested Estimated Pids auto not even working
1 parent 290df70 commit 0d39fb8

File tree

5 files changed

+7
-13
lines changed

5 files changed

+7
-13
lines changed

src/main/java/frc/robot/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* (log replay from a file).
2222
*/
2323
public final class Constants {
24-
public static final Mode simMode = Mode.SIM;
24+
public static final Mode simMode = Mode.REAL;
2525
public static final Mode currentMode = RobotBase.isReal() ? Mode.REAL : simMode;
2626

2727
public static enum Mode {

src/main/java/frc/robot/RobotContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ private void configureButtonBindings() {
151151
drive,
152152
() -> -controller.getLeftY(),
153153
() -> -controller.getLeftX(),
154-
() -> -controller.getRightX()));
154+
() -> controller.getRightX()));
155155

156156
// Lock to 0° when A button is held
157157
controller

src/main/java/frc/robot/subsystems/drive/Drive.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@
2525
import edu.wpi.first.hal.FRCNetComm.tResourceType;
2626
import edu.wpi.first.hal.HAL;
2727
import edu.wpi.first.math.Matrix;
28-
import edu.wpi.first.math.estimator.PoseEstimator;
2928
import edu.wpi.first.math.estimator.SwerveDrivePoseEstimator;
3029
import edu.wpi.first.math.geometry.Pose2d;
3130
import edu.wpi.first.math.geometry.Rotation2d;
32-
import edu.wpi.first.math.geometry.Translation2d;
3331
import edu.wpi.first.math.geometry.Twist2d;
3432
import edu.wpi.first.math.kinematics.ChassisSpeeds;
3533
import edu.wpi.first.math.kinematics.SwerveDriveKinematics;
@@ -45,7 +43,6 @@
4543
import edu.wpi.first.wpilibj2.command.SubsystemBase;
4644
import edu.wpi.first.wpilibj2.command.sysid.SysIdRoutine;
4745
import frc.robot.Constants;
48-
import frc.robot.Robot;
4946
import frc.robot.Constants.Mode;
5047
import frc.robot.util.LocalADStarAK;
5148
import java.util.concurrent.locks.Lock;
@@ -74,8 +71,6 @@ public class Drive extends SubsystemBase {
7471
private SwerveDrivePoseEstimator poseEstimator =
7572
new SwerveDrivePoseEstimator(kinematics, rawGyroRotation, lastModulePositions, new Pose2d());
7673

77-
78-
7974
public Drive(
8075
GyroIO gyroIO,
8176
ModuleIO flModuleIO,
@@ -127,7 +122,7 @@ public Drive(
127122
new SysIdRoutine.Mechanism(
128123
(voltage) -> runCharacterization(voltage.in(Volts)), null, this));
129124

130-
// poseEstimator.resetPose(DriveConstants.startingPose);
125+
// poseEstimator.resetPose(DriveConstants.startingPose);
131126
}
132127

133128
@Override

src/main/java/frc/robot/subsystems/drive/DriveConstants.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import com.pathplanner.lib.config.ModuleConfig;
2121
import com.pathplanner.lib.config.RobotConfig;
22-
2322
import edu.wpi.first.math.geometry.Pose2d;
2423
import edu.wpi.first.math.geometry.Rotation2d;
2524
import edu.wpi.first.math.geometry.Translation2d;
@@ -64,7 +63,7 @@ public class DriveConstants {
6463
public static final int backRightTurnCanId = 9;
6564

6665
// Drive motor configuration
67-
public static final int driveMotorCurrentLimit = 50;
66+
public static final int driveMotorCurrentLimit = 40;
6867
public static final double wheelRadiusMeters = Units.inchesToMeters(2);
6968
public static final double driveMotorReduction = 6.75; // SDS Mk4i L2
7069
public static final DCMotor driveGearbox = DCMotor.getNEO(1);
@@ -97,7 +96,7 @@ public class DriveConstants {
9796
public static final double turnEncoderVelocityFactor = (2 * Math.PI) / 60.0; // RPM -> Rad/Sec
9897

9998
// Turn PID configuration
100-
public static final double turnKp = 0.01;
99+
public static final double turnKp = 0.8;
101100
public static final double turnKd = 0;
102101
public static final double turnSimP = 0.01;
103102
public static final double turnSimD = 0.0;
@@ -142,5 +141,5 @@ public class DriveConstants {
142141
.withTrackLengthTrackWidth(Inches.of(24), Inches.of(24))
143142
// Configures the bumper size (dimensions of the robot bumper)
144143
.withBumperSize(Inches.of(30), Inches.of(30));
145-
public static Pose2d startingPose = new Pose2d(3,3,new Rotation2d());
144+
public static Pose2d startingPose = new Pose2d(3, 3, new Rotation2d());
146145
}

src/main/java/frc/robot/subsystems/drive/GyroIOSim.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public GyroIOSim(GyroSimulation gyroSimulation) {
3232

3333
@Override
3434
public void updateInputs(GyroIOInputs inputs) {
35-
inputs.connected = true;
35+
inputs.connected = true;
3636
inputs.yawPosition = gyroSimulation.getGyroReading();
3737
inputs.yawVelocityRadPerSec = gyroSimulation.getMeasuredAngularVelocity().in(RadiansPerSecond);
3838

0 commit comments

Comments
 (0)