diff --git a/sot-talos/Makefile b/sot-talos/Makefile index fee63d0ef51e59c9115747e0a21e00cea57ed7dc..e29ad05f5941df378d9ba7e5abf7c06c10302f00 100644 --- a/sot-talos/Makefile +++ b/sot-talos/Makefile @@ -1,10 +1,9 @@ # 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. diff --git a/sot-talos/distinfo b/sot-talos/distinfo index 32e7a2d28626eca552fbd1bf1208723fec144b20..081df50bd06a537b20800fd8226c029b8a44d354 100644 --- a/sot-talos/distinfo +++ b/sot-talos/distinfo @@ -1,5 +1,3 @@ -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 a/sot-talos/patches/patch-aa b/sot-talos/patches/patch-aa deleted file mode 100644 index a828be5a9700dab4e6bfc4080a88d1f9e7bcbf48..0000000000000000000000000000000000000000 --- a/sot-talos/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -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 a/sot-talos/patches/patch-ab b/sot-talos/patches/patch-ab deleted file mode 100644 index c3a413806f924624437eb20b73d150c8d2ded2d4..0000000000000000000000000000000000000000 --- a/sot-talos/patches/patch-ab +++ /dev/null @@ -1,53 +0,0 @@ -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 -