diff --git a/talos-data/Makefile b/talos-data/Makefile index 8a9561bef052261e74f7c43a752b963ea3076928..d43524c4c58b27c75a7d191122c206ae8da2595b 100644 --- a/talos-data/Makefile +++ b/talos-data/Makefile @@ -5,6 +5,7 @@ ORG= pyrene-dev NAME= talos-data VERSION= 1.0.1 +PKGREVISION= 1 ROSNAME= $(subst -,_,${NAME}) PKGNAME= ${NAME}-${VERSION} diff --git a/talos-data/distinfo b/talos-data/distinfo index 2da00ad72a04e7d84aef144c53926afa2dd5f537..88de995a43189549436c46eaeac8f27b8ca5ffb6 100644 --- a/talos-data/distinfo +++ b/talos-data/distinfo @@ -1,3 +1,4 @@ SHA1 (talos_data-1.0.1.tar.gz) = 9c9a0cb97d48db7127e4a2538032cbb68b259c94 RMD160 (talos_data-1.0.1.tar.gz) = 25767abeb2f39bda9958c7e354a16de6b9ac635e Size (talos_data-1.0.1.tar.gz) = 8827419 bytes +SHA1 (patch-aa) = cf07549de4e675f65d4b92ec27d3caca7828db7b diff --git a/talos-data/patches/patch-aa b/talos-data/patches/patch-aa new file mode 100644 index 0000000000000000000000000000000000000000..715c424acd8cf1b5bcb50c6b5b18eab6e8f01788 --- /dev/null +++ b/talos-data/patches/patch-aa @@ -0,0 +1,16 @@ +fix for Gazebo 9 + +--- src/SpringPlugin.cc.orig 2019-10-22 09:57:51.000000000 +0200 ++++ src/SpringPlugin.cc 2019-10-31 19:11:11.766354569 +0100 +@@ -77,7 +77,11 @@ + common::Time stepTime = currTime - this->prevUpdateTime; + this->prevUpdateTime = currTime; + ++#if GAZEBO_MAJOR_VERSION < 9 + double pos = this->jointExplicit->GetAngle(0).Radian(); ++#else ++ double pos = this->jointExplicit->Position(0); ++#endif + double vel = this->jointExplicit->GetVelocity(0); + double force = -this->kpExplicit * pos + -this->kdExplicit * vel;