Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/gazebo_ros_control/, dev-ros/gazebo_ros_control/files/
Date: Tue, 26 Jul 2016 09:25:15
Message-Id: 1469524710.68f1a7d004901d454f9b8b44e6d5f7cdb881e1a7.aballier@gentoo
1 commit: 68f1a7d004901d454f9b8b44e6d5f7cdb881e1a7
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 26 08:59:18 2016 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 26 09:18:30 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68f1a7d0
7
8 dev-ros/gazebo_ros_control: remove old
9
10 Package-Manager: portage-2.3.0
11
12 dev-ros/gazebo_ros_control/Manifest | 4 --
13 dev-ros/gazebo_ros_control/files/gazebo7.patch | 61 ----------------------
14 .../gazebo_ros_control-2.5.1.ebuild | 30 -----------
15 .../gazebo_ros_control-2.5.2.ebuild | 29 ----------
16 .../gazebo_ros_control-2.5.3.ebuild | 29 ----------
17 .../gazebo_ros_control-2.5.6.ebuild | 29 ----------
18 6 files changed, 182 deletions(-)
19
20 diff --git a/dev-ros/gazebo_ros_control/Manifest b/dev-ros/gazebo_ros_control/Manifest
21 index 85e31aa..cf8a4de 100644
22 --- a/dev-ros/gazebo_ros_control/Manifest
23 +++ b/dev-ros/gazebo_ros_control/Manifest
24 @@ -1,5 +1 @@
25 -DIST gazebo_ros_pkgs-2.5.1.tar.gz 1812295 SHA256 1d78839d174790db400466b4b165a79fea50177a3fbe59291539b8bdc1876d4e SHA512 2e0faaa770abe9ff2b41d176c7a3dadaf8749f32c924ba6018b3d7dabf0fe2a1e4ffd24c840c777229a4941e7f4522bf2287288619e2c819d4fb3c10fa431c9d WHIRLPOOL 09b0c5038b21a6cfc355fed8d8d2981cb845c8d209cb89112fb6daf1694b735dd68096ca7e2f255fdc2e8ba435080df186057344c81c2ac247c28d64019dbe32
26 -DIST gazebo_ros_pkgs-2.5.2.tar.gz 1815044 SHA256 849c541412b7312d3455827ccf386246b5bbc4d674e76ed0e9e08032026a929b SHA512 1f8b7034520712606e8389526115f0bae4084cbfdd1b5834f5c00233ae2864260cbb591512228f1519642fde860366a7b4f9602d5374817ca084494668b76bd4 WHIRLPOOL 13283cda29a4da4efb366d3074b9a55ca61b5c9e4a27b3cb467210405ed82334a849a3353f652bc6333e86e845f5845437ebaa23942a027a288fcd831fc77525
27 -DIST gazebo_ros_pkgs-2.5.3.tar.gz 1816954 SHA256 5c30ea914b624fb0bf1ca8bda869b9c10ce8336114e629ef19ad075320f4fca4 SHA512 9c045c0fa5be33c37017fc6abe5f307e97c8c9190a4c602e66f3dcc6435854b8c1bd863e26fc1e480c7be0bca381889677f140bd8948abe55cb468c19c636039 WHIRLPOOL 35d07adce0ab4f1accd4acf1fc11f2309776f8870abc2ec69422c60962acbb4cb1157c4e81e40517202b2573ffc6daa2a49f129c2b2c4117a886f77c433fcddd
28 -DIST gazebo_ros_pkgs-2.5.6.tar.gz 1821635 SHA256 ff8da02dd8c58a92deddcff9bf67c3d9583cb0fac0e6435774989f7451c939c8 SHA512 7c815de70d5e3a27f4796de2d0cebbbbde85dc55f90da3d2db6ea650a4c82bd333f3f1d5aaf3a6d9d6d1101fd54bf589f97d02c6d89ba5e78c72d79a90e0aa10 WHIRLPOOL 17b9caa8a5aa17284d6a0409064b0ec8300877f2a1ec701707e787d079a612b80d0a7758822e99d64a5d125bd32066fe8b2809fbace4facfa5490af4a8d9ac32
29 DIST gazebo_ros_pkgs-2.5.7.tar.gz 1821656 SHA256 6a40c129d4b4d6c7c5d4608aac7314b84f815a4416cd905d71b2b98067c2aaa7 SHA512 13790eaa50d6a6b1be26236ce3dd118f6d09c1096b7c95fffbad99fe70d59546b8169597eda5fa774cce37c5b3f46ca61b3c66a8520b675fb8c020e36f002d94 WHIRLPOOL b94be63a019d4bd9fa175f6c8c24f96c2e034ebfdf9b4f96aad6e71476409cb57453c895d2bb14aa50ba1410fb89302147c0677c055544ef826b28425e0a1046
30
31 diff --git a/dev-ros/gazebo_ros_control/files/gazebo7.patch b/dev-ros/gazebo_ros_control/files/gazebo7.patch
32 deleted file mode 100644
33 index 190756d..0000000
34 --- a/dev-ros/gazebo_ros_control/files/gazebo7.patch
35 +++ /dev/null
36 @@ -1,61 +0,0 @@
37 -commit b5303e692bb5dd2e4f4fc7932c7ec2c7e0b2e907
38 -Author: Steven Peters <scpeters@×××××××××××××.org>
39 -Date: Tue Apr 14 18:10:36 2015 -0700
40 -
41 - Use Joint::SetParam for joint velocity motors
42 -
43 - Before gazebo5, Joint::SetVelocity and SetMaxForce
44 - were used to set joint velocity motors.
45 - The API has changed in gazebo5, to use Joint::SetParam
46 - instead.
47 - The functionality is still available through the SetParam API.
48 -
49 - cherry-picked from indigo-devel
50 -
51 - Add ifdefs to fix build with gazebo2
52 -
53 - It was broken by #315.
54 - Fixes #321.
55 -
56 -diff --git a/gazebo_ros_control/src/default_robot_hw_sim.cpp b/gazebo_ros_control/src/default_robot_hw_sim.cpp
57 -index 249c8d3..1d9418d 100644
58 ---- a/gazebo_ros_control/src/default_robot_hw_sim.cpp
59 -+++ b/gazebo_ros_control/src/default_robot_hw_sim.cpp
60 -@@ -199,7 +199,7 @@ bool DefaultRobotHWSim::initSim(
61 - if (joint_control_methods_[j] != EFFORT)
62 - {
63 - // Initialize the PID controller. If no PID gain values are found, use joint->SetAngle() or
64 -- // joint->SetVelocity() to control the joint.
65 -+ // joint->SetParam("vel") to control the joint.
66 - const ros::NodeHandle nh(model_nh, "/gazebo_ros_control/pid_gains/" +
67 - joint_names_[j]);
68 - if (pid_controllers_[j].init(nh, true))
69 -@@ -216,10 +216,14 @@ bool DefaultRobotHWSim::initSim(
70 - }
71 - else
72 - {
73 -- // joint->SetMaxForce() must be called if joint->SetAngle() or joint->SetVelocity() are
74 -- // going to be called. joint->SetMaxForce() must *not* be called if joint->SetForce() is
75 -+ // joint->SetParam("fmax") must be called if joint->SetAngle() or joint->SetParam("vel") are
76 -+ // going to be called. joint->SetParam("fmax") must *not* be called if joint->SetForce() is
77 - // going to be called.
78 -+#if GAZEBO_MAJOR_VERSION > 2
79 -+ joint->SetParam("fmax", 0, joint_effort_limits_[j]);
80 -+#else
81 - joint->SetMaxForce(0, joint_effort_limits_[j]);
82 -+#endif
83 - }
84 - }
85 - }
86 -@@ -327,7 +331,11 @@ void DefaultRobotHWSim::writeSim(ros::Time time, ros::Duration period)
87 - break;
88 -
89 - case VELOCITY:
90 -+#if GAZEBO_MAJOR_VERSION > 2
91 -+ sim_joints_[j]->SetParam("vel", 0, e_stop_active_ ? 0 : joint_velocity_command_[j]);
92 -+#else
93 - sim_joints_[j]->SetVelocity(0, e_stop_active_ ? 0 : joint_velocity_command_[j]);
94 -+#endif
95 - break;
96 -
97 - case VELOCITY_PID:
98
99 diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.1.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.1.ebuild
100 deleted file mode 100644
101 index 65b2ca7..0000000
102 --- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.1.ebuild
103 +++ /dev/null
104 @@ -1,30 +0,0 @@
105 -# Copyright 1999-2014 Gentoo Foundation
106 -# Distributed under the terms of the GNU General Public License v2
107 -# $Id$
108 -
109 -EAPI=5
110 -ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
111 -KEYWORDS="~amd64"
112 -ROS_SUBDIR=${PN}
113 -
114 -inherit ros-catkin
115 -
116 -DESCRIPTION="ROS control plugins for gazebo"
117 -LICENSE="BSD"
118 -SLOT="0"
119 -IUSE=""
120 -
121 -RDEPEND="
122 - dev-ros/roscpp
123 - dev-ros/gazebo_ros
124 - dev-ros/control_toolbox
125 - dev-ros/controller_manager
126 - dev-ros/hardware_interface
127 - dev-ros/transmission_interface
128 - dev-ros/pluginlib
129 - dev-ros/joint_limits_interface
130 - dev-ros/urdf
131 - sci-electronics/gazebo
132 -"
133 -DEPEND="${RDEPEND}"
134 -PATCHES=( "${FILESDIR}/gazebo7.patch" )
135
136 diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.2.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.2.ebuild
137 deleted file mode 100644
138 index a8ee997..0000000
139 --- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.2.ebuild
140 +++ /dev/null
141 @@ -1,29 +0,0 @@
142 -# Copyright 1999-2014 Gentoo Foundation
143 -# Distributed under the terms of the GNU General Public License v2
144 -# $Id$
145 -
146 -EAPI=5
147 -ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
148 -KEYWORDS="~amd64"
149 -ROS_SUBDIR=${PN}
150 -
151 -inherit ros-catkin
152 -
153 -DESCRIPTION="ROS control plugins for gazebo"
154 -LICENSE="BSD"
155 -SLOT="0"
156 -IUSE=""
157 -
158 -RDEPEND="
159 - dev-ros/roscpp
160 - dev-ros/gazebo_ros
161 - dev-ros/control_toolbox
162 - dev-ros/controller_manager
163 - dev-ros/hardware_interface
164 - dev-ros/transmission_interface
165 - dev-ros/pluginlib
166 - dev-ros/joint_limits_interface
167 - dev-ros/urdf
168 - sci-electronics/gazebo
169 -"
170 -DEPEND="${RDEPEND}"
171
172 diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.3.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.3.ebuild
173 deleted file mode 100644
174 index a8ee997..0000000
175 --- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.3.ebuild
176 +++ /dev/null
177 @@ -1,29 +0,0 @@
178 -# Copyright 1999-2014 Gentoo Foundation
179 -# Distributed under the terms of the GNU General Public License v2
180 -# $Id$
181 -
182 -EAPI=5
183 -ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
184 -KEYWORDS="~amd64"
185 -ROS_SUBDIR=${PN}
186 -
187 -inherit ros-catkin
188 -
189 -DESCRIPTION="ROS control plugins for gazebo"
190 -LICENSE="BSD"
191 -SLOT="0"
192 -IUSE=""
193 -
194 -RDEPEND="
195 - dev-ros/roscpp
196 - dev-ros/gazebo_ros
197 - dev-ros/control_toolbox
198 - dev-ros/controller_manager
199 - dev-ros/hardware_interface
200 - dev-ros/transmission_interface
201 - dev-ros/pluginlib
202 - dev-ros/joint_limits_interface
203 - dev-ros/urdf
204 - sci-electronics/gazebo
205 -"
206 -DEPEND="${RDEPEND}"
207
208 diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.6.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.6.ebuild
209 deleted file mode 100644
210 index a8ee997..0000000
211 --- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.6.ebuild
212 +++ /dev/null
213 @@ -1,29 +0,0 @@
214 -# Copyright 1999-2014 Gentoo Foundation
215 -# Distributed under the terms of the GNU General Public License v2
216 -# $Id$
217 -
218 -EAPI=5
219 -ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
220 -KEYWORDS="~amd64"
221 -ROS_SUBDIR=${PN}
222 -
223 -inherit ros-catkin
224 -
225 -DESCRIPTION="ROS control plugins for gazebo"
226 -LICENSE="BSD"
227 -SLOT="0"
228 -IUSE=""
229 -
230 -RDEPEND="
231 - dev-ros/roscpp
232 - dev-ros/gazebo_ros
233 - dev-ros/control_toolbox
234 - dev-ros/controller_manager
235 - dev-ros/hardware_interface
236 - dev-ros/transmission_interface
237 - dev-ros/pluginlib
238 - dev-ros/joint_limits_interface
239 - dev-ros/urdf
240 - sci-electronics/gazebo
241 -"
242 -DEPEND="${RDEPEND}"