Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
J
jrl-walkgen
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Guilhem Saurel
jrl-walkgen
Commits
f64b2dea
Commit
f64b2dea
authored
14 years ago
by
Olivier Stasse
Browse files
Options
Downloads
Patches
Plain Diff
Revert "Add types trunk_t, supportfoot_t, reference_t"
This reverts commit
fc8c8c64
.
parent
ee3e6e21
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/privatepgtypes.cpp
+0
-39
0 additions, 39 deletions
src/privatepgtypes.cpp
src/privatepgtypes.h
+6
-49
6 additions, 49 deletions
src/privatepgtypes.h
with
6 additions
and
88 deletions
src/privatepgtypes.cpp
+
0
−
39
View file @
f64b2dea
...
...
@@ -56,43 +56,4 @@ namespace PatternGeneratorJRL
reset
();
}
struct
trunk_s
&
trunk_t
::
operator
=
(
const
trunk_s
&
aTS
)
{
for
(
unsigned
int
i
=
0
;
i
<
3
;
i
++
)
{
x
[
i
]
=
aTS
.
x
[
i
];
y
[
i
]
=
aTS
.
y
[
i
];
z
[
i
]
=
aTS
.
z
[
i
];
yaw
[
i
]
=
aTS
.
yaw
[
i
];
pitch
[
i
]
=
aTS
.
pitch
[
i
];
roll
[
i
]
=
aTS
.
roll
[
i
];
};
return
*
this
;
}
void
trunk_t
::
reset
()
{
for
(
unsigned
int
i
=
0
;
i
<
3
;
i
++
)
{
MAL_VECTOR_RESIZE
(
x
,
3
);
MAL_VECTOR_RESIZE
(
y
,
3
);
MAL_VECTOR_RESIZE
(
z
,
3
);
MAL_VECTOR_RESIZE
(
yaw
,
3
);
MAL_VECTOR_RESIZE
(
pitch
,
3
);
MAL_VECTOR_RESIZE
(
roll
,
3
);
x
[
i
]
=
0.0
;
y
[
i
]
=
0.0
;
z
[
i
]
=
0.0
;
yaw
[
i
]
=
0.0
;
pitch
[
i
]
=
0.0
;
roll
[
i
]
=
0.0
;
}
}
trunk_s
::
trunk_s
()
{
reset
();
}
}
This diff is collapsed.
Click to expand it.
src/privatepgtypes.h
+
6
−
49
View file @
f64b2dea
...
...
@@ -35,13 +35,13 @@ namespace PatternGeneratorJRL
{
// Support state of the robot at a certain point in time
struct
s
upport
_s
tate_s
struct
S
upport
S
tate_s
{
int
Phase
,
Foot
,
StepsLeft
,
StepNumber
;
bool
SSSS
,
StateChanged
;
double
TimeLimit
;
};
typedef
struct
s
upport
_s
tate_s
s
upport
_s
tate_t
;
typedef
struct
S
upport
S
tate_s
S
upport
S
tate_t
;
// Support state of the robot at a certain point in time
struct
com_s
...
...
@@ -58,53 +58,10 @@ namespace PatternGeneratorJRL
};
typedef
struct
com_s
com_t
;
// Support state of the robot at a certain point in time
struct
trunk_s
{
MAL_VECTOR
(
x
,
double
);
MAL_VECTOR
(
y
,
double
);
MAL_VECTOR
(
z
,
double
);
MAL_VECTOR
(
yaw
,
double
);
MAL_VECTOR
(
pitch
,
double
);
MAL_VECTOR
(
roll
,
double
);
struct
trunk_s
&
operator
=
(
const
trunk_s
&
aTS
);
void
reset
();
trunk_s
();
};
typedef
struct
trunk_s
trunk_t
;
//State of the feet on the ground
struct
supportfoot_s
{
double
x
,
y
,
theta
,
StartTime
;
int
SupportFoot
;
};
typedef
struct
supportfoot_s
supportfoot_t
;
/// Absolute reference.
struct
reference_s
{
struct
frame_s
{
/// \brief Constant reference
double
x
,
y
,
yaw
;
/// \brief Reference vectors
MAL_VECTOR
(
X
,
double
);
MAL_VECTOR
(
Y
,
double
);
MAL_VECTOR
(
YAW
,
double
);
};
typedef
struct
frame_s
frame_t
;
frame_t
global
,
local
;
};
typedef
struct
reference_s
reference_t
;
const
static
int
MEAN_VELOCITY
=
0
;
const
static
int
INSTANT_VELOCITY
=
1
;
const
static
int
COP_CENTERING
=
2
;
const
static
int
JERK
=
3
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment