Skip to content
Snippets Groups Projects
Commit 388bc681 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[wip/py-roscontrol-sot] Update to v0.3.0

Changes since v0.2.0:
- Improved logging

Packaging changes:
- removed patches aa, ab, applied upstream
parent de3e950d
No related branches found
No related tags found
No related merge requests found
......@@ -3,14 +3,13 @@
#
ORG= stack-of-tasks
VERSION= 0.2.0
VERSION= 0.3.0
NAME= roscontrol-sot
PKGNAME= ${PKGTAG.python-}${NAME}-${VERSION}
ROSNAME= $(subst -,_,${NAME})
DISTNAME= ${ROSNAME}-${VERSION}
WRKSRC= ${WRKDIR}/${ROSNAME}-${VERSION}
DIST_SUBDIR= ${NAME}
PKGREVISION= 1
CATEGORIES= wip
......@@ -42,6 +41,7 @@ include ../../devel/ros-realtime-tools/depend.mk
include ../../interfaces/ros-common-msgs/depend.mk
include ../../interfaces/ros-control-msgs/depend.mk
include ../../math/ros-geometry/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
include ../../wip/dynamic-graph-v3/depend.mk
include ../../wip/py-dynamic-graph-v3/depend.mk
include ../../wip/sot-core-v3/depend.mk
......
SHA1 (roscontrol-sot/roscontrol_sot-0.2.0.tar.gz) = dcc37d0e59a7671a77a72de0b8d51c247b9fabb8
RMD160 (roscontrol-sot/roscontrol_sot-0.2.0.tar.gz) = 58879b0ba88bf3eda431a6e34df2956c68df18df
Size (roscontrol-sot/roscontrol_sot-0.2.0.tar.gz) = 1285602 bytes
SHA1 (patch-aa) = 3826bb4e8794bdc8af94306d2637377d8eeacd11
SHA1 (patch-ab) = 2f7cb585cafd12a490bf6e1a2d31e05d024b8ba0
SHA1 (roscontrol-sot/roscontrol_sot-0.3.0.tar.gz) = ccbfbbdf5507cc135526387243adcc708dc6cc1a
RMD160 (roscontrol-sot/roscontrol_sot-0.3.0.tar.gz) = 377bd857672d35954e62864268f074f657299dfe
Size (roscontrol-sot/roscontrol_sot-0.3.0.tar.gz) = 1277625 bytes
fix version for catkin, as it overrides the .pc
--- package.xml.orig 2019-11-05 21:52:59.000000000 +0100
+++ package.xml 2019-11-12 14:32:27.848246273 +0100
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>roscontrol_sot</name>
- <version>0.1.0</version>
+ <version>0.2.0</version>
<description>Wrapping the Stack-of-tasks framework in ros-control</description>
<!-- Maintainer email -->
--- src/roscontrol-sot-controller.cpp
+++ src/roscontrol-sot-controller.cpp
@@ -1068,6 +1068,10 @@ void RCSotController::update(const ros::Time &, const ros::Duration &period) {
} catch (std::exception &e) {
throw e;
}
+
+ localStandbyEffortControlMode(period);
+ localStandbyVelocityControlMode(period);
+ localStandbyPositionControlMode();
}
}
--
2.17.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