Skip to content
Snippets Groups Projects
Commit 9dd9bea1 authored by Olivier Stasse's avatar Olivier Stasse
Browse files

[wip/sot-talos] Release 0.0.3

Fix robotState problem due to new device sot-core.
Remove previous patches.
parent 1f9a9bb0
No related branches found
No related tags found
No related merge requests found
# robotpkg Makefile for: wip/sot-talos
# Created: Olivier Stasse, on Tue. 9th May, 2017
#
DISTNAME= sot-talos-0.0.2
DISTNAME= sot-talos-0.0.3
MASTER_SITES= ${MASTER_SITE_JRL:=talos/sot-talos/}
MASTER_REPOSITORY= https://redmine.laas.fr/laas/users/
PKGREVISION= 5
CATEGORIES= wip
COMMENT= This packages provides a generic Stack Of Tasks library for the humanoid robot Pyrene.
......
SHA1 (sot-talos-0.0.2.tar.gz) = 032a75e579bec14be3b5516693cbca68f5f744cf
RMD160 (sot-talos-0.0.2.tar.gz) = 47c0afd4a706ff0e57eccf9aa81ac80ef6a30a7a
Size (sot-talos-0.0.2.tar.gz) = 749436 bytes
SHA1 (patch-aa) = 068f01d154b5081b8bcfc379451f1f972f0a95fb
SHA1 (patch-ab) = 91dce0eee45495c6dd82ae090f3dc39971702746
SHA1 (sot-talos-0.0.3.tar.gz) = d6d3f6c4213126b53370b301af3460e03a7ca114
RMD160 (sot-talos-0.0.3.tar.gz) = 72a75d6237767e4cd30a0f3ece6a0a45c7cb7ab5
Size (sot-talos-0.0.3.tar.gz) = 748350 bytes
diff --git CMakeLists.txt CMakeLists.txt
index f69bc38..d9c5adf 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -50,7 +50,7 @@ ADD_REQUIRED_DEPENDENCY("dynamic-graph-python >= 3.0.0")
ADD_REQUIRED_DEPENDENCY("dynamic_graph_bridge_msgs")
ADD_REQUIRED_DEPENDENCY("dynamic_graph_bridge >= 3.0")
-ADD_OPTIONAL_DEPENDENCY("talos-data")
+ADD_OPTIONAL_DEPENDENCY("talos_data")
# Search for dependencies.
# Boost
--
1.9.1
diff --git src/sot-talos-controller.cpp src/sot-talos-controller.cpp
index 3d49f5c..231637d 100644
--- src/sot-talos-controller.cpp
+++ src/sot-talos-controller.cpp
@@ -116,6 +116,18 @@ getControl(map<string,dgsot::ControlValues> &controlOut)
}
void SoTTalosController::
+setNoIntegration(void)
+{
+ device_.setNoIntegration();
+}
+
+void SoTTalosController::
+setSecondOrderIntegration(void)
+{
+ device_.setSecondOrderIntegration();
+}
+
+void SoTTalosController::
runPython(std::ostream& file,
const std::string& command,
dynamicgraph::Interpreter& interpreter)
diff --git src/sot-talos-controller.hh src/sot-talos-controller.hh
index b58cc7e..bd1957c 100644
--- src/sot-talos-controller.hh
+++ src/sot-talos-controller.hh
@@ -42,6 +42,9 @@ class SoTTalosController: public
void getControl(std::map<std::string, dgsot::ControlValues> &anglesOut);
+ void setNoIntegration(void);
+ void setSecondOrderIntegration(void);
+
/// Embedded python interpreter accessible via Corba/ros
boost::shared_ptr<dynamicgraph::Interpreter> interpreter_;
diff --git src/sot-talos-device.cpp src/sot-talos-device.cpp
index 7f80772..3061f92 100644
--- src/sot-talos-device.cpp
+++ src/sot-talos-device.cpp
@@ -258,7 +258,7 @@ void SoTTalosDevice::getControl(map<string,dgsot::ControlValues> &controlOut)
for(unsigned int i=6; i < state_.size();++i)
anglesOut[i-6] = state_(i);
- controlOut["joints"].setValues(anglesOut);
+ controlOut["control"].setValues(anglesOut);
// Read zmp reference from input signal if plugged
int time = controlSIN.getTime ();
zmpSIN.recompute (time + 1);
--
1.9.1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment