From c3f72a1c9d1524696eeae8904ab78520f70c8481 Mon Sep 17 00:00:00 2001
From: Rohan Budhiraja <proyan@users.noreply.github.com>
Date: Wed, 22 Nov 2017 20:31:37 +0100
Subject: [PATCH] [wip/sot-core-v3][PATCH] fix switch entity.
---
sot-core-v3/Makefile | 2 ++
sot-core-v3/distinfo | 1 +
sot-core-v3/patches/patch-aa | 24 ++++++++++++++++++++++++
3 files changed, 27 insertions(+)
create mode 100644 sot-core-v3/patches/patch-aa
diff --git a/sot-core-v3/Makefile b/sot-core-v3/Makefile
index 095d0dae..5b09f3ab 100644
--- a/sot-core-v3/Makefile
+++ b/sot-core-v3/Makefile
@@ -5,11 +5,13 @@
PKGNAME= sot-core-v3-${VERSION}
DISTNAME= sot-core-v3-${VERSION}
VERSION= 3.1.1
+PKGVERSION= 1
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=sot-core-v3/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}/stack-of-tasks/sot-core
CHECKOUT_VCS_OPTS= --recursive
+
MAINTAINER= gepetto@laas.fr
CATEGORIES= wip
COMMENT= Hierarchical task based control of humanoid robots
diff --git a/sot-core-v3/distinfo b/sot-core-v3/distinfo
index 75448ffe..992cc982 100644
--- a/sot-core-v3/distinfo
+++ b/sot-core-v3/distinfo
@@ -1,3 +1,4 @@
SHA1 (sot-core-v3-3.1.1.tar.gz) = 8e27ae46dd39c44a52590d409a3e019461209b15
RMD160 (sot-core-v3-3.1.1.tar.gz) = 89c85471cee5bd76d75ad137944d4450a1648cf1
Size (sot-core-v3-3.1.1.tar.gz) = 1130853 bytes
+SHA1 (patch-aa) = 58dedbb5a2c896f8bc2d42ce8814012188f4d4e9
diff --git a/sot-core-v3/patches/patch-aa b/sot-core-v3/patches/patch-aa
new file mode 100644
index 00000000..12d36020
--- /dev/null
+++ b/sot-core-v3/patches/patch-aa
@@ -0,0 +1,24 @@
+diff -Naur include/sot/core/switch.hh include/sot/core/switch.hh
+--- include/sot/core/switch.hh 2017-11-22 20:19:04.817875496 +0100
++++ include/sot/core/switch.hh 2017-11-22 20:18:39.661171318 +0100
+@@ -45,7 +45,7 @@
+
+ public: /* --- SIGNAL --- */
+ DYNAMIC_GRAPH_ENTITY_DECL();
+- dynamicgraph::SignalTimeDependent<bool,int> outSOUT;
++ dynamicgraph::Signal<bool,int> outSOUT;
+
+ protected:
+ bool signalOutput;
+@@ -58,9 +58,9 @@
+ public:
+ Switch( const std::string& name )
+ : Entity(name)
+- ,outSOUT( boost::bind(&Switch::switchOutput,this,_1,_2),
+- sotNOSIGNAL,"Switch("+name+")::output(bool)::out")
++ ,outSOUT("Switch("+name+")::output(bool)::out")
+ {
++ outSOUT.setFunction(boost::bind(&Switch::switchOutput,this,_1,_2));
+ signalOutput = false;
+ signalRegistration (outSOUT );
+ addCommand ("turnOn",
--
GitLab