Skip to content

Commit 76e81fe

Browse files
robotpilotrobotpilot
committed
Merge the changes and update
2 parents abbbec3 + 9947dbb commit 76e81fe

File tree

9 files changed

+219
-162
lines changed

9 files changed

+219
-162
lines changed

‎.gitignore‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
1-
/robotis_device/devices/dynamixel/H54-100-B210-R-NR.device
1+
build
2+
devel
3+
bin
4+
lib
5+
msg_gen
6+
srv_gen
7+
qtcreator-build
8+
*~
9+
*.backup
10+
*.user
11+
*.autosave

‎robotis_controller/CHANGELOG.rst‎

Lines changed: 46 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,46 @@
1-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2-
Changelog for package robotis_controller
3-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4-
5-
0.1.1 (2016-08-18)
6-
-----------
7-
* updated the package information
8-
9-
0.1.0 (2016-08-12)
10-
-----------
11-
* first public release for Kinetic
12-
* modified the package information for release
13-
* develop branch -> master branch
14-
* function name changed : DeviceInit() -> InitDevice()
15-
* Fixed high CPU consumption due to busy waits
16-
* add SensorState
17-
add Singleton template
18-
* XM-430 / CM-740 device file added.
19-
Sensor device added.
20-
* added code to support the gazebo simulator
21-
* added first bulk read failure protection code
22-
* renewal
23-
* Contributors: Alexander Stumpf, Jay Song, Zerom, Pyo
1+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
Changelog for package robotis_controller
3+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
5+
0.2.0 (2016-08-31)
6+
-----------
7+
* bug fixed (position pid gain & velocity pid gain sync write).
8+
* added velocity_to_value_ratio to DXL Pro-H series.
9+
* changed some debug messages.
10+
* added velocity p/i/d gain and position i/d gain sync_write code.
11+
* SyncWriteItem bug fixed.
12+
* add function / modified the code simple (using auto / range based for loop)
13+
* added XM-430-W210 / XM-430-W350 device file.
14+
* rename ControlMode(CurrentControl -> TorqueControl)
15+
* rename (port_to_sync_write_torque\_ -> port_to_sync_write_current\_)
16+
* rename (present_current\_ -> present_torque\_)
17+
* modified torque control code
18+
* fixed typos / changed ROS_INFO -> fprintf (for processing speed)
19+
* startTimer() : after bulkread txpacket(), need some sleep()
20+
* changed the order of processing in the Process() function.
21+
* added missing mutex for gazebo
22+
* fixed crash when running in gazebo simulation
23+
* sync write bug fix.
24+
* added position_p_gain sync write
25+
* MotionModule/SensorModule member variable access changed (public -> protected).
26+
* Contributors: Jay Song, Zerom, Pyo, SCH
27+
28+
0.1.1 (2016-08-18)
29+
-----------
30+
* updated the package information
31+
32+
0.1.0 (2016-08-12)
33+
-----------
34+
* first public release for Kinetic
35+
* modified the package information for release
36+
* develop branch -> master branch
37+
* function name changed : DeviceInit() -> InitDevice()
38+
* Fixed high CPU consumption due to busy waits
39+
* add SensorState
40+
add Singleton template
41+
* XM-430 / CM-740 device file added.
42+
Sensor device added.
43+
* added code to support the gazebo simulator
44+
* added first bulk read failure protection code
45+
* renewal
46+
* Contributors: Alexander Stumpf, Jay Song, Zerom, Pyo

‎robotis_controller/package.xml‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
1-
<?xml version="1.0"?>
2-
<package>
3-
<name>robotis_controller</name>
4-
<version>0.1.1</version>
5-
<description>
6-
The main package that controls THORMANG3.
7-
</description>
8-
<license>BSD</license>
9-
<author email="[email protected]">Zerom</author>
10-
<maintainer email="[email protected]">Pyo</maintainer>
11-
<url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework/issues</url>
12-
<url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
13-
<url type="website">http://wiki.ros.org/robotis_controller</url>
14-
<buildtool_depend>catkin</buildtool_depend>
15-
<build_depend>roscpp</build_depend>
16-
<build_depend>roslib</build_depend>
17-
<build_depend>std_msgs</build_depend>
18-
<build_depend>sensor_msgs</build_depend>
19-
<build_depend>robotis_controller_msgs</build_depend>
20-
<build_depend>robotis_framework_common</build_depend>
21-
<run_depend>roscpp</run_depend>
22-
<run_depend>roslib</run_depend>
23-
<run_depend>std_msgs</run_depend>
24-
<run_depend>sensor_msgs</run_depend>
25-
<run_depend>robotis_controller_msgs</run_depend>
26-
<run_depend>robotis_framework_common</run_depend>
27-
<export></export>
28-
</package>
1+
<?xml version="1.0"?>
2+
<package>
3+
<name>robotis_controller</name>
4+
<version>0.2.0</version>
5+
<description>
6+
The main package that controls THORMANG3.
7+
</description>
8+
<license>BSD</license>
9+
<author email="[email protected]">Zerom</author>
10+
<maintainer email="[email protected]">Pyo</maintainer>
11+
<url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework/issues</url>
12+
<url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
13+
<url type="website">http://wiki.ros.org/robotis_controller</url>
14+
<buildtool_depend>catkin</buildtool_depend>
15+
<build_depend>roscpp</build_depend>
16+
<build_depend>roslib</build_depend>
17+
<build_depend>std_msgs</build_depend>
18+
<build_depend>sensor_msgs</build_depend>
19+
<build_depend>dynamixel_sdk</build_depend>
20+
<build_depend>robotis_device</build_depend>
21+
<build_depend>robotis_controller_msgs</build_depend>
22+
<build_depend>robotis_framework_common</build_depend>
23+
<run_depend>roscpp</run_depend>
24+
<run_depend>roslib</run_depend>
25+
<run_depend>std_msgs</run_depend>
26+
<run_depend>sensor_msgs</run_depend>
27+
<run_depend>dynamixel_sdk</run_depend>
28+
<run_depend>robotis_device</run_depend>
29+
<run_depend>robotis_controller_msgs</run_depend>
30+
<export></export>
31+
</package>

‎robotis_device/CHANGELOG.rst‎

Lines changed: 37 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,37 @@
1-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2-
Changelog for package robotis_device
3-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4-
5-
0.1.1 (2016-08-18)
6-
-----------
7-
* updated the package information
8-
9-
0.1.0 (2016-08-12)
10-
-----------
11-
* first public release for Kinetic
12-
* modified the package information for release
13-
* develop branch -> master branch
14-
* Setting the license to BSD.
15-
* add SensorState
16-
add Singleton template
17-
* XM-430 / CM-740 device file added.
18-
Sensor device added.
19-
* modified.
20-
* variable name changed.
21-
ConvertRadian2Value / ConvertValue2Radian function bug fixed.
22-
* added code to support the gazebo simulator
23-
* renewal
24-
* Contributors: ROBOTIS, ROBOTIS-zerom, pyo
1+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
Changelog for package robotis_device
3+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
5+
0.2.0 (2016-08-31)
6+
-----------
7+
* bug fixed (position pid gain & velocity pid gain sync write).
8+
* added velocity_to_value_ratio to DXL Pro-H series.
9+
* added velocity p/i/d gain and position i/d gain sync_write code.
10+
* fixed robotis_device build_depend.
11+
* added XM-430-W210 / XM-430-W350 device file.
12+
* rename (present_current\_ -> present_torque\_)
13+
* modified torque control code
14+
* added device file for MX-64 / MX-106
15+
* adjusted position min/max value. (MX-28, XM-430)
16+
* Contributors: Zerom, Pyo
17+
18+
0.1.1 (2016-08-18)
19+
-----------
20+
* updated the package information
21+
22+
0.1.0 (2016-08-12)
23+
-----------
24+
* first public release for Kinetic
25+
* modified the package information for release
26+
* develop branch -> master branch
27+
* Setting the license to BSD.
28+
* add SensorState
29+
add Singleton template
30+
* XM-430 / CM-740 device file added.
31+
Sensor device added.
32+
* modified.
33+
* variable name changed.
34+
ConvertRadian2Value / ConvertValue2Radian function bug fixed.
35+
* added code to support the gazebo simulator
36+
* renewal
37+
* Contributors: ROBOTIS, ROBOTIS-zerom, pyo

‎robotis_device/package.xml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
<?xml version="1.0"?>
2-
<package>
3-
<name>robotis_device</name>
4-
<version>0.1.1</version>
5-
<description>
6-
The package that manages device information of ROBOTIS robots.
7-
This package is used when reading device information with the robot information file
8-
from the robotis_controller package.
9-
</description>
10-
<license>BSD</license>
11-
<author email="[email protected]">Zerom</author>
12-
<maintainer email="[email protected]">Pyo</maintainer>
13-
<url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework/issues</url>
14-
<url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
15-
<url type="website">http://wiki.ros.org/robotis_device</url>
16-
<buildtool_depend>catkin</buildtool_depend>
17-
<build_depend>roscpp</build_depend>
18-
<build_depend>rospy</build_depend>
19-
<build_depend>dynamixel_sdk</build_depend>
20-
<run_depend>roscpp</run_depend>
21-
<run_depend>rospy</run_depend>
22-
<run_depend>dynamixel_sdk</run_depend>
23-
</package>
1+
<?xml version="1.0"?>
2+
<package>
3+
<name>robotis_device</name>
4+
<version>0.2.0</version>
5+
<description>
6+
The package that manages device information of ROBOTIS robots.
7+
This package is used when reading device information with the robot information file
8+
from the robotis_controller package.
9+
</description>
10+
<license>BSD</license>
11+
<author email="[email protected]">Zerom</author>
12+
<maintainer email="[email protected]">Pyo</maintainer>
13+
<url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework/issues</url>
14+
<url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
15+
<url type="website">http://wiki.ros.org/robotis_device</url>
16+
<buildtool_depend>catkin</buildtool_depend>
17+
<build_depend>roscpp</build_depend>
18+
<build_depend>rospy</build_depend>
19+
<build_depend>dynamixel_sdk</build_depend>
20+
<run_depend>roscpp</run_depend>
21+
<run_depend>rospy</run_depend>
22+
<run_depend>dynamixel_sdk</run_depend>
23+
</package>

‎robotis_framework/CHANGELOG.rst‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2-
Changelog for package robotis_framework
3-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4-
5-
0.1.1 (2016-08-18)
6-
-----------
7-
* updated the package information
8-
9-
0.1.0 (2016-08-12)
10-
-----------
11-
* make a meta-package
12-
* Contributors: Zerom, Pyo
1+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
Changelog for package robotis_framework
3+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
5+
0.2.0 (2016-08-31)
6+
-----------
7+
* updated CHANGLOG.rst for minor release
8+
9+
0.1.1 (2016-08-18)
10+
-----------
11+
* updated the package information
12+
13+
0.1.0 (2016-08-12)
14+
-----------
15+
* make a meta-package

‎robotis_framework/package.xml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
<?xml version="1.0"?>
2-
<package>
3-
<name>robotis_framework</name>
4-
<version>0.1.1</version>
5-
<description>ROS packages for the robotis_framework (meta package)</description>
6-
<license>BSD</license>
7-
<author email="[email protected]">Zerom</author>
8-
<maintainer email="[email protected]">Pyo</maintainer>
9-
<url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework/issues</url>
10-
<url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
11-
<url type="website">http://wiki.ros.org/robotis_framework</url>
12-
<buildtool_depend>catkin</buildtool_depend>
13-
<run_depend>robotis_framework_common</run_depend>
14-
<run_depend>robotis_device</run_depend>
15-
<run_depend>robotis_controller</run_depend>
16-
<export><metapackage/></export>
17-
</package>
1+
<?xml version="1.0"?>
2+
<package>
3+
<name>robotis_framework</name>
4+
<version>0.2.0</version>
5+
<description>ROS packages for the robotis_framework (meta package)</description>
6+
<license>BSD</license>
7+
<author email="[email protected]">Zerom</author>
8+
<maintainer email="[email protected]">Pyo</maintainer>
9+
<url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework/issues</url>
10+
<url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
11+
<url type="website">http://wiki.ros.org/robotis_framework</url>
12+
<buildtool_depend>catkin</buildtool_depend>
13+
<run_depend>robotis_framework_common</run_depend>
14+
<run_depend>robotis_device</run_depend>
15+
<run_depend>robotis_controller</run_depend>
16+
<export><metapackage/></export>
17+
</package>

‎robotis_framework_common/CHANGELOG.rst‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
1-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2-
Changelog for package robotis_framework_common
3-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4-
5-
0.1.1 (2016-08-18)
6-
-----------
7-
* updated the package information
8-
9-
0.1.0 (2016-08-12)
10-
-----------
11-
* modified the package information for release
12-
* Setting the license to BSD.
13-
* add SensorState
14-
add Singleton template
15-
* Contributors: Jay Song, Zerom, Pyo
1+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
Changelog for package robotis_framework_common
3+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
5+
0.2.0 (2016-08-31)
6+
-----------
7+
* updated CHANGLOG.rst for minor release
8+
* rename ControlMode(CurrentControl -> TorqueControl)
9+
* rename (port_to_sync_write_torque\_ -> port_to_sync_write_current\_)
10+
* Contributors: Zerom, Pyo
11+
12+
0.1.1 (2016-08-18)
13+
-----------
14+
* updated the package information
15+
16+
0.1.0 (2016-08-12)
17+
-----------
18+
* modified the package information for release
19+
* Setting the license to BSD.
20+
* add SensorState
21+
add Singleton template
22+
* Contributors: Jay Song, Zerom, Pyo

‎robotis_framework_common/package.xml‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1-
<?xml version="1.0"?>
2-
<package>
3-
<name>robotis_framework_common</name>
4-
<version>0.1.1</version>
5-
<description>
6-
The package contains commonly used Headers for the ROBOTIS Framework.
7-
</description>
8-
<license>BSD</license>
9-
<author email="[email protected]">Zerom</author>
10-
<maintainer email="[email protected]">Pyo</maintainer>
11-
<url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework/issues</url>
12-
<url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
13-
<url type="website">http://wiki.ros.org/robotis_framework_common</url>
14-
<buildtool_depend>catkin</buildtool_depend>
15-
<build_depend>roscpp</build_depend>
16-
<build_depend>robotis_device</build_depend>
17-
<run_depend>roscpp</run_depend>
18-
<run_depend>robotis_device</run_depend>
19-
</package>
1+
<?xml version="1.0"?>
2+
<package>
3+
<name>robotis_framework_common</name>
4+
<version>0.2.0</version>
5+
<description>
6+
The package contains commonly used Headers for the ROBOTIS Framework.
7+
</description>
8+
<license>BSD</license>
9+
<author email="[email protected]">Zerom</author>
10+
<maintainer email="[email protected]">Pyo</maintainer>
11+
<url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework/issues</url>
12+
<url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
13+
<url type="website">http://wiki.ros.org/robotis_framework_common</url>
14+
<buildtool_depend>catkin</buildtool_depend>
15+
<build_depend>roscpp</build_depend>
16+
<run_depend>roscpp</run_depend>
17+
</package>

0 commit comments

Comments
 (0)