Skip to content

Commit

Permalink
Committing changes so that I can switch branches
Browse files Browse the repository at this point in the history
  • Loading branch information
SPD3 committed Oct 6, 2017
1 parent 7d8f450 commit 6bd4d77
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 1 deletion.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ protected void execute() {
m_currentTimeStamp = Timer.getFPGATimestamp();
deltaTime = m_currentTimeStamp - m_initialTimeStamp;
currentTrajectoryPoint = Robot.kinematicsSimpler.getTrajectoryPoint(m_path.getTrajectoryVector(), (deltaTime/60));
// Change this to use position that way ensuring the robot hits the final position
Robot.driveTrain.setPositionSetpoint(currentTrajectoryPoint.m_position);
m_PIDOut = Robot.driveTrain.getDeltaPositionPIDOutput();
System.out.println("currentTrajectoryPoint.m_currentVelocity: " + currentTrajectoryPoint.m_currentVelocity);
Expand Down

0 comments on commit 6bd4d77

Please sign in to comment.