1
0
mirror of https://gitlab.com/obbart/universal_robots_ros_driver.git synced 2026-04-10 18:10:47 +02:00

Changed how trajectories are handled to try and speed things up

This commit is contained in:
Thomas Timm Andersen
2015-09-22 10:34:09 +02:00
2 changed files with 5 additions and 4 deletions

View File

@@ -90,10 +90,10 @@ void UrDriver::addTraj(std::vector<double> inp_timestamps,
} }
} }
//make sure we come to a smooth stop //make sure we come to a smooth stop
while (timestamps.back() < inp_timestamps.back()) { /*while (timestamps.back() < inp_timestamps.back()) {
timestamps.push_back(timestamps.back() + 0.008); timestamps.push_back(timestamps.back() + 0.008);
} }
timestamps.pop_back(); timestamps.pop_back();*/
unsigned int j = 0; unsigned int j = 0;
for (unsigned int i = 0; i < timestamps.size(); i++) { for (unsigned int i = 0; i < timestamps.size(); i++) {

View File

@@ -146,7 +146,7 @@ public:
t.push_back(0.); t.push_back(0.);
t.push_back(4.); t.push_back(4.);
t.push_back(8.); t.push_back(8.);
robot_.doTraj(t, pos, vel); */ robot_.doTraj(t, pos, vel);*/
} }
@@ -295,6 +295,7 @@ private:
traj.points[i].positions[mapping[j]]); traj.points[i].positions[mapping[j]]);
new_point.velocities.push_back( new_point.velocities.push_back(
traj.points[i].velocities[mapping[j]]); traj.points[i].velocities[mapping[j]]);
if (traj.points[i].accelerations.size() != 0)
new_point.accelerations.push_back( new_point.accelerations.push_back(
traj.points[i].accelerations[mapping[j]]); traj.points[i].accelerations[mapping[j]]);
} }