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-dyninv
Commits
c4158e5c
Unverified
Commit
c4158e5c
authored
Aug 16, 2018
by
Guilhem Saurel
Committed by
GitHub
Aug 16, 2018
Browse files
Merge pull request #11 from nim65s/topic/delete-shell
delete shell
parents
117917e9
b726da66
Pipeline
#1211
passed with stage
in 9 minutes and 40 seconds
Changes
10
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
c4158e5c
...
...
@@ -26,6 +26,7 @@ SET(PROJECT_DESCRIPTION "control by inverse dynamics.")
SET
(
PROJECT_URL
"http://github.com/laas/sot-dyninv"
)
SET
(
CUSTOM_HEADER_DIR
"
${
PROJECT_NAME
}
"
)
SET
(
DOXYGEN_USE_MATHJAX YES
)
# Disable -Werror on Unix for now.
SET
(
CXX_DISABLE_WERROR True
)
...
...
README.md
View file @
c4158e5c
...
...
@@ -3,7 +3,7 @@ sot-dyninv
[

](https://travis-ci.org/stack-of-tasks/sot-dyninv)
[

](https://gepgitlab.laas.fr/stack-of-tasks/sot-dyninv/commits/master)
[

](http://projects.laas.fr/
stack-of-tasks
/doc/stack-of-tasks/sot-dyninv/master/coverage/)
[

](http://projects.laas.fr/
gepetto
/doc/stack-of-tasks/sot-dyninv/master/coverage/)
This sofware provides the solver and features to resolve the inverse of the
...
...
src/controller-pd.cpp
View file @
c4158e5c
...
...
@@ -244,52 +244,6 @@ namespace dynamicgraph
}
catch
(
ExceptionSignal
e
)
{}
}
void
ControllerPD
::
commandLine
(
const
std
::
string
&
cmdLine
,
std
::
istringstream
&
cmdArgs
,
std
::
ostream
&
os
)
{
if
(
cmdLine
==
"help"
)
{
os
<<
"sotControlPD:
\n
"
<<
" - size <arg>
\t\t
set the size of the vector.
\n
"
<<
" - stdGain
\t\t
set the input vector gains according to the size for HRP2.
\n
"
<<
" - velocityonly <arg>
\t\t
set Kp = 0.
\n
"
<<
std
::
endl
;
}
else
if
(
cmdLine
==
"size"
)
{
cmdArgs
>>
std
::
ws
;
if
(
cmdArgs
.
good
()
)
{
unsigned
int
i
;
cmdArgs
>>
i
;
size
(
i
);
}
else
{
os
<<
"size = "
<<
size
()
<<
std
::
endl
;
}
}
else
if
(
cmdLine
==
"velocityonly"
)
{
setGainVelocityOnly
();
}
else
if
(
cmdLine
==
"stdGain"
)
{
std
::
string
config
=
"high"
;
cmdArgs
>>
std
::
ws
;
if
(
cmdArgs
.
good
()
)
cmdArgs
>>
config
;
setStandardGains
(
config
);
}
else
{
Entity
::
commandLine
(
cmdLine
,
cmdArgs
,
os
);
}
}
}
// namespace dyninv
}
// namespace sot
}
// namespace dynamicgraph
...
...
src/controller-pd.h
View file @
c4158e5c
...
...
@@ -74,10 +74,6 @@ namespace dynamicgraph {
virtual
void
display
(
std
::
ostream
&
os
)
const
;
virtual
void
commandLine
(
const
std
::
string
&
cmdLine
,
std
::
istringstream
&
cmdArgs
,
std
::
ostream
&
os
);
public:
/* --- SIGNALS --- */
DECLARE_SIGNAL_IN
(
Kp
,
dg
::
Vector
);
...
...
src/dynamic-integrator.cpp
View file @
c4158e5c
...
...
@@ -342,31 +342,6 @@ namespace dynamicgraph
{
os
<<
"DynamicIntegrator "
<<
getName
()
<<
". "
<<
std
::
endl
;
}
void
DynamicIntegrator
::
commandLine
(
const
std
::
string
&
cmdLine
,
std
::
istringstream
&
cmdArgs
,
std
::
ostream
&
os
)
{
if
(
cmdLine
==
"help"
)
{
os
<<
"DynamicIntegrator:"
<<
std
::
endl
<<
" - inc [dt]"
<<
std
::
endl
;
}
else
if
(
cmdLine
==
"inc"
)
{
if
(
cmdArgs
>>
std
::
ws
,
cmdArgs
.
good
()
)
{
double
dt
;
cmdArgs
>>
dt
;
dtSIN
=
dt
;
}
integrateFromSignals
();
}
else
{
Entity
::
commandLine
(
cmdLine
,
cmdArgs
,
os
);
}
}
}
// namespace dyninv
}
// namespace sot
}
// namespace dynamicgraph
...
...
src/dynamic-integrator.h
View file @
c4158e5c
...
...
@@ -61,10 +61,6 @@ namespace dynamicgraph {
virtual
void
display
(
std
::
ostream
&
os
)
const
;
virtual
void
commandLine
(
const
std
::
string
&
cmdLine
,
std
::
istringstream
&
cmdArgs
,
std
::
ostream
&
os
);
public:
/* --- SIGNALS --- */
DECLARE_SIGNAL_IN
(
acceleration
,
dg
::
Vector
);
...
...
src/pseudo-robot-dynamic.cpp
View file @
c4158e5c
...
...
@@ -218,55 +218,6 @@ namespace dynamicgraph
{
os
<<
"PseudoRobotDynamic "
<<
getName
()
<<
". "
<<
std
::
endl
;
}
void
PseudoRobotDynamic
::
commandLine
(
const
std
::
string
&
cmdLine
,
std
::
istringstream
&
cmdArgs
,
std
::
ostream
&
os
)
{
sotDEBUGIN
(
15
);
if
(
cmdLine
==
"help"
)
{
os
<<
"PseudoRobotDynamic:"
<<
std
::
endl
<<
" - replace <OpenHRP> [plug]"
<<
std
::
endl
;
}
else
if
(
cmdLine
==
"replace"
)
{
if
(
cmdArgs
>>
std
::
ws
,
cmdArgs
.
good
()
)
{
std
::
string
repName
;
cmdArgs
>>
repName
>>
std
::
ws
;
bool
plug
=
cmdArgs
.
good
();
replaceSimulatorEntity
(
repName
,
plug
);
}
}
else
if
(
cmdLine
==
"sbs"
||
cmdLine
==
"play"
||
cmdLine
==
"withForces"
||
cmdLine
==
"periodicCall"
||
cmdLine
==
"periodicCallBefore"
||
cmdLine
==
"periodicCallAfter"
)
{
formerOpenHRP
->
commandLine
(
cmdLine
,
cmdArgs
,
os
);
}
else
if
(
cmdLine
==
"root"
)
{
if
(
cmdArgs
>>
std
::
ws
,
cmdArgs
.
good
()
)
{
dg
::
Matrix
M
;
cmdArgs
>>
M
;
setRoot
(
M
);
std
::
ostringstream
osback
;
osback
<<
M
.
data
();
cmdArgs
.
str
(
osback
.
str
());
formerOpenHRP
->
commandLine
(
cmdLine
,
cmdArgs
,
os
);
}
else
{
os
<<
"TODO"
<<
std
::
endl
;
}
}
else
{
Entity
::
commandLine
(
cmdLine
,
cmdArgs
,
os
);
}
sotDEBUGOUT
(
15
);
}
}
// namespace dyninv
}
// namespace sot
}
// namespace dynamicgraph
...
...
src/pseudo-robot-dynamic.h
View file @
c4158e5c
...
...
@@ -71,10 +71,6 @@ namespace dynamicgraph {
virtual
void
display
(
std
::
ostream
&
os
)
const
;
virtual
void
commandLine
(
const
std
::
string
&
cmdLine
,
std
::
istringstream
&
cmdArgs
,
std
::
ostream
&
os
);
typedef
::
dynamicgraph
::
EntityHelper
<
PseudoRobotDynamic
>::
EntityClassName
EntityClassName
;
...
...
src/zmp-estimator.cpp
View file @
c4158e5c
...
...
@@ -89,24 +89,6 @@ namespace dynamicgraph
{
os
<<
"ZmpEstimator "
<<
getName
()
<<
"."
<<
std
::
endl
;
}
void
ZmpEstimator
::
commandLine
(
const
std
::
string
&
cmdLine
,
std
::
istringstream
&
cmdArgs
,
std
::
ostream
&
os
)
{
if
(
cmdLine
==
"help"
)
{
os
<<
"ZmpEstimator:
\n
"
<<
"
\t
- ."
<<
std
::
endl
;
Entity
::
commandLine
(
cmdLine
,
cmdArgs
,
os
);
}
else
{
Entity
::
commandLine
(
cmdLine
,
cmdArgs
,
os
);
}
}
}
// namespace dyninv
}
// namespace sot
}
// namespace dynamicgraph
...
...
src/zmp-estimator.h
View file @
c4158e5c
...
...
@@ -60,10 +60,6 @@ namespace dynamicgraph {
virtual
void
display
(
std
::
ostream
&
os
)
const
;
virtual
void
commandLine
(
const
std
::
string
&
cmdLine
,
std
::
istringstream
&
cmdArgs
,
std
::
ostream
&
os
);
public:
/* --- SIGNALS --- */
DECLARE_SIGNAL_IN
(
fn
,
dg
::
Vector
);
...
...
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