Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
franka_description
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
GitLab 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
CeTI
ROS
ROS Packages
franka_description
Commits
3991f55f
Commit
3991f55f
authored
6 years ago
by
Florian Walch
Browse files
Options
Downloads
Patches
Plain Diff
Publish robot mode in franka_state_controller
parent
2874ab53
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+6
-0
6 additions, 0 deletions
CHANGELOG.md
franka_control/src/franka_state_controller.cpp
+30
-0
30 additions, 0 deletions
franka_control/src/franka_state_controller.cpp
franka_msgs/msg/FrankaState.msg
+8
-0
8 additions, 0 deletions
franka_msgs/msg/FrankaState.msg
with
44 additions
and
0 deletions
CHANGELOG.md
+
6
−
0
View file @
3991f55f
# CHANGELOG
## 0.7.0 - UNRELEASED
Requires
`libfranka`
>= 0.5.0
*
Publish
`robot_mode`
in
`franka_state_controller`
## 0.6.0 - 2018-08-08
Requires
`libfranka`
>= 0.5.0
...
...
This diff is collapsed.
Click to expand it.
franka_control/src/franka_state_controller.cpp
+
30
−
0
View file @
3991f55f
...
...
@@ -330,6 +330,36 @@ void FrankaStateController::publishFrankaStates(const ros::Time& time) {
publisher_franka_states_
.
msg_
.
last_motion_errors
=
errorsToMessage
(
robot_state_
.
last_motion_errors
);
switch
(
robot_state_
.
robot_mode
)
{
case
franka
::
RobotMode
::
kOther
:
publisher_franka_states_
.
msg_
.
robot_mode
=
franka_msgs
::
FrankaState
::
ROBOT_MODE_OTHER
;
break
;
case
franka
::
RobotMode
::
kIdle
:
publisher_franka_states_
.
msg_
.
robot_mode
=
franka_msgs
::
FrankaState
::
ROBOT_MODE_IDLE
;
break
;
case
franka
::
RobotMode
::
kMove
:
publisher_franka_states_
.
msg_
.
robot_mode
=
franka_msgs
::
FrankaState
::
ROBOT_MODE_MOVE
;
break
;
case
franka
::
RobotMode
::
kGuiding
:
publisher_franka_states_
.
msg_
.
robot_mode
=
franka_msgs
::
FrankaState
::
ROBOT_MODE_GUIDING
;
break
;
case
franka
::
RobotMode
::
kReflex
:
publisher_franka_states_
.
msg_
.
robot_mode
=
franka_msgs
::
FrankaState
::
ROBOT_MODE_REFLEX
;
break
;
case
franka
::
RobotMode
::
kUserStopped
:
publisher_franka_states_
.
msg_
.
robot_mode
=
franka_msgs
::
FrankaState
::
ROBOT_MODE_USER_STOPPED
;
break
;
case
franka
::
RobotMode
::
kAutomaticErrorRecovery
:
publisher_franka_states_
.
msg_
.
robot_mode
=
franka_msgs
::
FrankaState
::
ROBOT_MODE_AUTOMATIC_ERROR_RECOVERY
;
break
;
}
publisher_franka_states_
.
msg_
.
header
.
seq
=
sequence_number_
;
publisher_franka_states_
.
msg_
.
header
.
stamp
=
time
;
publisher_franka_states_
.
unlockAndPublish
();
...
...
This diff is collapsed.
Click to expand it.
franka_msgs/msg/FrankaState.msg
+
8
−
0
View file @
3991f55f
...
...
@@ -31,5 +31,13 @@ float64[16] O_T_EE_d
float64[16] F_T_EE
float64[16] EE_T_K
float64 time
uint8 ROBOT_MODE_OTHER=0
uint8 ROBOT_MODE_IDLE=1
uint8 ROBOT_MODE_MOVE=2
uint8 ROBOT_MODE_GUIDING=3
uint8 ROBOT_MODE_REFLEX=4
uint8 ROBOT_MODE_USER_STOPPED=5
uint8 ROBOT_MODE_AUTOMATIC_ERROR_RECOVERY=6
uint8 robot_mode
franka_msgs/Errors current_errors
franka_msgs/Errors last_motion_errors
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