Skip to content

Commit

Permalink
from testing climber on robot
Browse files Browse the repository at this point in the history
  • Loading branch information
Student committed Mar 8, 2025
1 parent e52597e commit 77fdddb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/main/cpp/ControllerInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ void ControllerInterface::UpdateClimberInput(RobotControlData &controlData)
// controlData.climberInput.Unspool = false;
// controlData.climberInput.Respool = false;
// }
if (abs(m_copilot.GetRightY()) > 0.1)
if (std::fabs(m_copilot.GetRightY()) > 0.1)
{
controlData.climberInput.ClimberSpeed = m_copilot.GetRightY();
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/cpp/InputManager/ClimberManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
void ClimberManager::HandleInput(RobotControlData &robotControlData)
{

//if(m_matchTimer.HasElapsed(120_s))
//{
if(m_matchTimer.HasElapsed(105_s))
{
m_Climber.SetClimberSpeed(robotControlData.climberInput.ClimberSpeed);
//}
}
}

void ClimberManager::ResetState(){
Expand Down
2 changes: 1 addition & 1 deletion src/main/include/HAL/ClimberHAL.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Climber
void SetClimberSpeed(double speed);

private:
rev::spark::SparkMax m_climberMotor{50, rev::spark::SparkMax::MotorType::kBrushless};
rev::spark::SparkMax m_climberMotor{30, rev::spark::SparkMax::MotorType::kBrushless};
rev::spark::SparkClosedLoopController m_climberMotorPID = m_climberMotor.GetClosedLoopController();
rev::spark::SparkAbsoluteEncoder m_climberMotorAbsEncoder = m_climberMotor.GetAbsoluteEncoder();
};

0 comments on commit 77fdddb

Please sign in to comment.