Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Construct interface #30

Open
wants to merge 12 commits into
base: dashing
Choose a base branch
from
1 change: 1 addition & 0 deletions roboy_control_msgs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ set(msg_files
"msg/ViaPoint.msg"
"msg/EndEffector.msg"
"msg/Strings.msg"
"msg/EFPose.msg"
# PerformMovementActionFeedback.msg
# PerformMovementActionGoal.msg
# PerformMovementAction.msg
Expand Down
2 changes: 2 additions & 0 deletions roboy_control_msgs/msg/EFPose.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
string ef_name
geometry_msgs/Pose ef_pose
8 changes: 7 additions & 1 deletion roboy_middleware_msgs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ find_package(ament_cmake REQUIRED)
find_package(rosidl_default_generators REQUIRED)
find_package(std_msgs REQUIRED)
find_package(geometry_msgs REQUIRED)
find_package(roboy_simulation_msgs REQUIRED)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hm, this is not ideal

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can move the LinkInformation msg from simulation to middleware, its only needed there


#include_directories(
# /home/missxa/intel/embedded//ip/altera/hps/altera_hps/hwlib/${ALT_DEVICE_FAMILY}
Expand Down Expand Up @@ -43,6 +44,9 @@ set(msg_files
"msg/MotorState.msg"
"msg/MotorInfo.msg"
"msg/Neopixel.msg"
"msg/InitExoforceRequest.msg"
"msg/ExoforceResponse.msg"
"msg/LinkInformation.msg"

)

Expand All @@ -51,6 +55,8 @@ set(srv_files
"srv/DanceTrajectory.srv"
"srv/EmergencyStop.srv"
"srv/FrameIK.srv"
"srv/InitExoforce.srv"
"srv/InitStateMapper.srv"
"srv/ForwardKinematics.srv"
"srv/InverseKinematics.srv"
"srv/JointController.srv"
Expand All @@ -68,7 +74,7 @@ rosidl_generate_interfaces(${PROJECT_NAME}
${msg_files}
${srv_files}
DEPENDENCIES
std_msgs geometry_msgs
std_msgs geometry_msgs roboy_simulation_msgs
)


Expand Down
2 changes: 2 additions & 0 deletions roboy_middleware_msgs/msg/ExoforceResponse.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bool success
string message
10 changes: 10 additions & 0 deletions roboy_middleware_msgs/msg/InitExoforceRequest.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# The index of the following lists correspond to one end effector, example:
# ef_name[0] name of the first ef
# ef_enabled[0] enabled flag of the first ef
# ef_init_pose[0] init pose of the first ef
string[] ef_name # posible values ('left_hand'/'right_hand')
bool[] ef_enabled
geometry_msgs/Pose[] ef_init_pose

float32 operator_height
roboy_simulation_msgs/LinkInformation[] roboy_link_information
8 changes: 8 additions & 0 deletions roboy_middleware_msgs/msg/LinkInformation.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# id of the link in the simulation
int32 id
# name of the link in the simulation
string name
# dimentions of the link
geometry_msgs/Vector3 dimensions
# initial pose of the link
geometry_msgs/Pose init_pose
13 changes: 13 additions & 0 deletions roboy_middleware_msgs/srv/InitExoforce.srv
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# The index of the following lists correspond to one end effector, example:
# ef_name[0] name of the first ef
# ef_enabled[0] enabled flag of the first ef
# ef_init_pose[0] init pose of the first ef
string[] ef_name # posible values ('left_hand'/'right_hand')
bool[] ef_enabled
geometry_msgs/Pose[] ef_init_pose

float32 operator_height
roboy_simulation_msgs/LinkInformation[] roboy_link_information
---
bool success
string message
5 changes: 5 additions & 0 deletions roboy_middleware_msgs/srv/InitStateMapper.srv
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
roboy_simulation_msgs/LinkInformation[] operator_link_information
roboy_simulation_msgs/LinkInformation[] roboy_link_information
---
bool success
string message