Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
sot-talos
Commits
a05ab318
Commit
a05ab318
authored
Nov 05, 2019
by
Guilhem Saurel
Browse files
include pinocchio before boost
ref
https://github.com/stack-of-tasks/pinocchio/issues/849
parent
a0a30682
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/sot-talos-controller.cpp
View file @
a05ab318
...
...
@@ -11,13 +11,13 @@
*
*/
#include "sot-talos-controller.hh"
#include <sot/core/debug.hh>
#include <sot/core/exception-abstract.hh>
#include <dynamic_graph_bridge/ros_init.hh>
#include <dynamic_graph_bridge/ros_interpreter.hh>
#include "sot-talos-controller.hh"
#include <boost/thread/thread.hpp>
#include <boost/thread/condition.hpp>
...
...
src/sot-talos-controller.hh
View file @
a05ab318
...
...
@@ -11,6 +11,8 @@
#ifndef _SOT_TalosController_H_
#define _SOT_TalosController_H_
#include <pinocchio/fwd.hpp>
#include <dynamic-graph/entity.h>
#include <dynamic-graph/signal.h>
#include <dynamic-graph/signal-ptr.h>
...
...
@@ -22,13 +24,13 @@
#include <dynamic_graph_bridge/ros_interpreter.hh>
namespace
dgsot
=
dynamicgraph
::
sot
;
class
SoTTalosController
:
public
class
SoTTalosController
:
public
dgsot
::
AbstractSotExternalInterface
{
public:
static
const
std
::
string
LOG_PYTHON
;
SoTTalosController
();
SoTTalosController
(
const
char
robotName
[]);
SoTTalosController
(
std
::
string
robotName
);
...
...
@@ -56,13 +58,13 @@ class SoTTalosController: public
// dynamic graph.
void
updateRobotState
(
std
::
vector
<
double
>
&
anglesIn
);
/// Run a python command
/// Run a python command
void
runPython
(
std
::
ostream
&
file
,
const
std
::
string
&
command
,
dynamicgraph
::
Interpreter
&
interpreter
);
virtual
void
startupPython
();
void
init
();
SoTTalosDevice
*
device_
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment