Skip to content
This repository was archived by the owner on Sep 14, 2019. It is now read-only.

Commit e7b22d9

Browse files
deleted an empty line and fixed kf in PIDTurn
1 parent eb6f6f3 commit e7b22d9

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/AutoLift.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public AutoLift(Lift lift, String height) {
1515
addSequential(new LiftToPosition(lift, LiftHeight.toLH("HOLD_CUBE")));
1616
addSequential(new LiftToPosition(lift, LiftHeight.toLH(height)));
1717
} else {
18-
1918
addSequential(new LiftToPosition(lift, LiftHeight.toLH(height)));
2019
}
2120
}

Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/PIDTurn.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,11 @@ protected void initialize() {
154154
double maxTurnSpeed = Robot.getConst("Max Turn Radians Per Second", 4.0) * 180 / Math.PI;
155155
double updateTime = sd.getConst("Default PID Update Time", 0.05);
156156
double r = Robot.getConst("TurnPidR", 3.0);
157-
157+
158158
double kP = r / Robot.getConst("TurnTimeConstant", 0.2) / maxTurnSpeed;
159159
double kI = 0;
160160
double kD = r / (maxTurnSpeed * updateTime);
161-
double kF = 1 / (maxTurnSpeed * updateTime);
161+
double kF = 1 / maxTurnSpeed * updateTime;
162162
turnController.setPID(kP, kI, kD, kF);
163163

164164
if (!turnToPoint) {

0 commit comments

Comments
 (0)