Skip to content

Commit

Permalink
removed print outs in controller
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Winkler committed Sep 12, 2016
1 parent 1d05292 commit a7e1396
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion config/ipopt.opt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ tol 1e-2
#dual_inf_tol 1e-1
#constr_viol_tol 1e-4
#compl_inf_tol 1e-4
max_cpu_time 5.5 #careful: overwrites ros parameter, but controller doesn't know
max_cpu_time 2.5 #careful: overwrites ros parameter, but controller doesn't know
#max_iter 1
#bound_frac 0.5

Expand Down
2 changes: 1 addition & 1 deletion src/nlp_optimizer_node.cc
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NlpOptimizerNode::UpdateCurrentState(const ReqInfoMsg& msg)
curr_cog_ = RosHelpers::RosToXpp(msg.curr_state);
curr_stance_ = RosHelpers::RosToXpp(msg.curr_stance);
curr_swingleg_ = msg.curr_swingleg;
ROS_INFO_STREAM("Updated Current State: " << curr_cog_);
// ROS_INFO_STREAM("Updated Current State: " << curr_cog_);

optimization_visualizer_.VisualizeCurrentState(curr_cog_.Get2D(), curr_stance_);
}
Expand Down
8 changes: 4 additions & 4 deletions src/walking_controller.cc
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ void WalkingController::ExecuteLoop()
{
using namespace xpp::utils;
using namespace xpp::zmp;
ROS_INFO_STREAM_THROTTLE(robot_->GetControlLoopInterval(), "time: " << Time());
// ROS_INFO_STREAM_THROTTLE(robot_->GetControlLoopInterval(), "time: " << Time());

/** 1. motion plan generation */
/** CURRENT state of robot through joint encoder readings and state estimation **/
Expand All @@ -246,14 +246,14 @@ void WalkingController::ExecuteLoop()

P_curr_.swingleg_ = P_des_.swingleg_;
EstimateCurrPose(); // through sensors and state estimation
std::cout << "P_curr: " << P_curr_.base_.pos << "\n";
// std::cout << "P_curr: " << P_curr_.base_.pos << "\n";
jsim_.update(q);


/** @brief DESIRED state given by splined plan and zmp optimizer **/
P_des_.base_.pos = spliner_.GetCurrPosition(Time());
P_des_.base_.ori = spliner_.GetCurrOrientation(Time());
std::cout << "P_des: " << P_des_.base_.pos << "\n";
// std::cout << "P_des: " << P_des_.base_.pos << "\n";
spliner_.FillCurrFeet(Time(), P_des_.feet_, P_des_.swingleg_);
// logging
log_base_acc_des_ff.segment<3>(LX) = P_des_.base_.pos.a; // logging only
Expand Down Expand Up @@ -398,7 +398,7 @@ void WalkingController::EstimateCurrPose()
}

// logging
ROS_DEBUG_STREAM_THROTTLE(robot_->GetControlLoopInterval(), "time: " << Time() << "\nP_curr_:\n" << P_curr_);
// ROS_DEBUG_STREAM_THROTTLE(robot_->GetControlLoopInterval(), "time: " << Time() << "\nP_curr_:\n" << P_curr_);
}

Eigen::Vector3d
Expand Down

0 comments on commit a7e1396

Please sign in to comment.