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.

Sign up for GitHub

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

Undo PRs #9 and #10 #12

Open
wants to merge 2 commits into
base: hydro-devel
Choose a base branch
from
Open

Undo PRs #9 and #10 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1221041
Deprecate service limiting single actuator current
Aug 6, 2014
92147b7
Deprecate original current limiting message
Aug 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions pal_common_msgs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
cmake_minimum_required(VERSION 2.8.3)
project(pal_common_msgs)

find_package(catkin REQUIRED COMPONENTS actionlib_msgs std_msgs message_generation)
find_package(catkin REQUIRED COMPONENTS actionlib_msgs message_generation)

add_action_files(
DIRECTORY action
FILES
Disable.action
)

add_message_files(
DIRECTORY msg
FILES
JointCurrent.msg
)

generate_messages(DEPENDENCIES actionlib_msgs std_msgs)

catkin_package(CATKIN_DEPENDS actionlib_msgs std_msgs message_runtime)
catkin_package(CATKIN_DEPENDS actionlib_msgs message_runtime)
5 changes: 0 additions & 5 deletions pal_common_msgs/msg/JointCurrent.msg
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions pal_common_msgs/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@
<buildtool_depend>catkin</buildtool_depend>

<build_depend>actionlib_msgs</build_depend>
<build_depend>std_msgs</build_depend>
<build_depend>message_generation</build_depend>

<run_depend>actionlib_msgs</run_depend>
<run_depend>std_msgs</run_depend>
<run_depend>message_runtime</run_depend>

</package>
2 changes: 0 additions & 2 deletions pal_control_msgs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ include_directories(include)
add_message_files(DIRECTORY msg FILES ActuatorCurrentLimit.msg)
add_action_files(DIRECTORY action FILES MotionManager.action)

add_service_files(FILES CurrentLimit.srv)

generate_messages(DEPENDENCIES actionlib_msgs)

catkin_package(CATKIN_DEPENDS message_runtime
Expand Down
10 changes: 0 additions & 10 deletions pal_control_msgs/srv/CurrentLimit.srv
View file
Open in desktop

This file was deleted.