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

[wip/talos-metapkg-ros-control-sot] Fix bug preventing to send direct current control.

parent bb709ac7
No related branches found
No related tags found
No related merge requests found
......@@ -5,6 +5,7 @@
VERSION= 0.0.3
PKGNAME= talos-metapkg-ros-control-sot-${VERSION}
DISTNAME= $(subst -,_,${PKGBASE})-${VERSION}
PKGREVISION= 1
CATEGORIES= wip
MASTER_SITES= ${MASTER_SITE_JRL:=talos/talos_metapkg_ros_control_sot/}
......
SHA1 (talos_metapkg_ros_control_sot-0.0.3.tar.gz) = ea26f2cdc9e891effaf9e72b3883ecaa0dbd173a
RMD160 (talos_metapkg_ros_control_sot-0.0.3.tar.gz) = 227a69f652e021fcc38504453c51ec1b250048b3
Size (talos_metapkg_ros_control_sot-0.0.3.tar.gz) = 2067236 bytes
SHA1 (patch-aa) = 4093b144682a6e8b589956e12824641d677be2eb
--- talos_metapkg_ros_control_sot/CMakeLists.txt
+++ talos_metapkg_ros_control_sot/CMakeLists.txt
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
-project(metapkg_talos_roscontrol_sot)
+project(talos_metapkg_ros_control_sot)
find_package(catkin REQUIRED)
catkin_metapackage()
diff --git a/talos_roscontrol_sot/src/roscontrol-sot-controller.cpp b/talos_roscontrol_sot/src/roscontrol-sot-controller.cpp
index 98d90ea..8af32fa 100644
--- a/talos_roscontrol_sot/src/roscontrol-sot-controller.cpp
+++ b/talos_roscontrol_sot/src/roscontrol-sot-controller.cpp
@@ -84,6 +84,9 @@ namespace talos_sot_controller
/// Create SoT
SotLoaderBasic::Initialization();
+ /// If we are in effort mode then the device should not do any integration.
+ if (control_mode_==EFFORT)
+ sotController_->setNoIntegration();
return true;
}
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