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

[wip/talos-metapkg-ros-control-sot] Update to v0.0.4

Add PID control laws when switching to the SOT.
parent 05f58737
No related branches found
No related tags found
No related merge requests found
......@@ -2,10 +2,9 @@
# Created: Olivier Stasse on Fri, 5 May 2017
#
VERSION= 0.0.3
VERSION= 0.0.4
PKGNAME= talos-metapkg-ros-control-sot-${VERSION}
DISTNAME= $(subst -,_,${PKGBASE})-${VERSION}
PKGREVISION= 2
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) = 83c85753e3fed0231a4194173bb4ac3087f972eb
SHA1 (talos_metapkg_ros_control_sot-0.0.4.tar.gz) = f05c1e1966913417badb0763b4fc271082af5e71
RMD160 (talos_metapkg_ros_control_sot-0.0.4.tar.gz) = 5f2439f7e2f610f0741fa747ad154eb0e1bbaf9c
Size (talos_metapkg_ros_control_sot-0.0.4.tar.gz) = 755721 bytes
diff --git talos_roscontrol_sot/src/roscontrol-sot-controller.cpp talos_roscontrol_sot/src/roscontrol-sot-controller.cpp
index 98d90ea..8af32fa 100644
--- talos_roscontrol_sot/src/roscontrol-sot-controller.cpp
+++ 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