Skip to content

Commit 5f84a2c

Browse files
Update to modification in SoT.
Removall of ffpose_.
1 parent 6be4c0e commit 5f84a2c

File tree

1 file changed

+1
-26
lines changed

1 file changed

+1
-26
lines changed

tests/sot-test-device.cpp

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ void SoTTestDevice::cleanupSetSensors(
287287
}
288288

289289
void SoTTestDevice::getControl(map<string, dgsot::ControlValues> &controlOut,
290-
const double &period) {
290+
const double &) {
291291
ODEBUG5FULL("start");
292292
sotDEBUGIN(25);
293293
vector<double> anglesOut;
@@ -318,31 +318,6 @@ void SoTTestDevice::getControl(map<string, dgsot::ControlValues> &controlOut,
318318
dg::Vector zmpGlobal(4);
319319
for (unsigned int i = 0; i < 3; ++i) zmpGlobal(i) = zmpSIN(time + 1)(i);
320320
zmpGlobal(3) = 1.;
321-
dgsot::MatrixHomogeneous inversePose;
322-
323-
inversePose = freeFlyerPose().inverse(Eigen::Affine);
324-
dg::Vector localZmp(4);
325-
localZmp = inversePose.matrix() * zmpGlobal;
326-
vector<double> ZMPRef(3);
327-
for (unsigned int i = 0; i < 3; ++i) ZMPRef[i] = localZmp(i);
328-
329-
controlOut["zmp"].setName("zmp");
330-
controlOut["zmp"].setValues(ZMPRef);
331-
332-
// Update position of freeflyer in global frame
333-
Eigen::Vector3d transq_(freeFlyerPose().translation());
334-
dg::sot::VectorQuaternion qt_(freeFlyerPose().linear());
335-
336-
// translation
337-
for (int i = 0; i < 3; i++) baseff_[i] = transq_(i);
338-
339-
// rotation: quaternion
340-
baseff_[3] = qt_.w();
341-
baseff_[4] = qt_.x();
342-
baseff_[5] = qt_.y();
343-
baseff_[6] = qt_.z();
344-
345-
controlOut["baseff"].setValues(baseff_);
346321
ODEBUG5FULL("end");
347322
sotDEBUGOUT(25);
348323
}

0 commit comments

Comments
 (0)