Commit Graph

516 Commits

Author SHA1 Message Date
Pyo
27885eb900 updated the CHANGELOG and version to release binary packages 2017-08-09 15:31:48 +09:00
Yoonseok Pyo
e62517a70e Merge pull request #51 from ROBOTIS-GIT/master
merge for sync kinetic-devel and master branch
2017-08-09 15:23:46 +09:00
Yoonseok Pyo
963f502ccf Merge pull request #51 from ROBOTIS-GIT/master
merge for sync kinetic-devel and master branch
2017-08-09 15:23:46 +09:00
zerom
da6ed0eece Merge pull request #50 from ROBOTIS-GIT/develop
Develop
2017-08-09 14:31:45 +09:00
zerom
05f4a5e51c multi thread bug fixed. 2017-08-09 14:27:40 +09:00
zerom
daf53e36e7 Merge pull request #49 from ROBOTIS-GIT/master
merge (master -> develop)
2017-08-09 14:13:10 +09:00
zerom
ef1c16664a - unnecessary debug print removed. 2017-07-11 14:42:15 +09:00
zerom
4b0f03ee5c Merge pull request #48 from ROBOTIS-GIT/develop
OPEN-CR.device, robotis_controller changed.
2017-07-11 14:10:21 +09:00
zerom
ac3dc6d9eb - OpenCR control table item name changed. (torque_enable -> dynamixel_power)
- fixed to not update update_time_stamp_ if bulk read fails.
2017-07-11 13:26:10 +09:00
Yoonseok Pyo
8186ee7795 Merge pull request #47 from ROBOTIS-GIT/kinetic-devel
merge for sync kinetic-devel and master branch
2017-06-09 11:52:13 +09:00
Yoonseok Pyo
8f59509bec Merge pull request #47 from ROBOTIS-GIT/kinetic-devel
merge for sync kinetic-devel and master branch
2017-06-09 11:52:13 +09:00
Pyo
f08d522e0b updated the CHANGELOG and Version to release binary packages 2017-06-09 11:45:42 +09:00
Yoonseok Pyo
515bd365d9 Merge pull request #46 from ROBOTIS-GIT/master
merge for sync kinetic-devel and master branch
2017-06-09 11:41:06 +09:00
Yoonseok Pyo
6249b22770 Merge pull request #46 from ROBOTIS-GIT/master
merge for sync kinetic-devel and master branch
2017-06-09 11:41:06 +09:00
SCH
1c1672d0c4 update for yaml-cpp dependencies 2017-06-09 09:36:45 +09:00
Yoonseok Pyo
5956419189 Merge pull request #45 from ROBOTIS-GIT/kinetic-devel
merge for sync kinetic-devel and master branch
2017-06-07 13:58:37 +09:00
Yoonseok Pyo
d310af6d0b Merge pull request #45 from ROBOTIS-GIT/kinetic-devel
merge for sync kinetic-devel and master branch
2017-06-07 13:58:37 +09:00
Pyo
052637ee28 updated the CHANGELOG and Version to release binary packages 2017-06-07 13:30:51 +09:00
Yoonseok Pyo
9bbf3379c6 Merge pull request #44 from ROBOTIS-GIT/master
merge for sync kinetic-devel and master branch
2017-06-07 13:26:40 +09:00
Yoonseok Pyo
1af070ebc0 Merge pull request #44 from ROBOTIS-GIT/master
merge for sync kinetic-devel and master branch
2017-06-07 13:26:40 +09:00
sch
46a5b05040 cmake_modules added in package.xml 2017-06-07 10:43:04 +09:00
Yoonseok Pyo
690014b069 Merge pull request #43 from ROBOTIS-GIT/kinetic-devel
merge for sync kinetic-devel and master branch
2017-05-23 19:39:41 +09:00
Yoonseok Pyo
727463e629 Merge pull request #43 from ROBOTIS-GIT/kinetic-devel
merge for sync kinetic-devel and master branch
2017-05-23 19:39:41 +09:00
Pyo
8e8e024c12 version update (0.2.3) 2017-05-23 19:32:46 +09:00
Yoonseok Pyo
4afd76cbef Merge pull request #42 from ROBOTIS-GIT/master
merge for sync kinetic-devel and master branch
2017-05-23 19:22:13 +09:00
Yoonseok Pyo
7d871d5fb6 Merge pull request #42 from ROBOTIS-GIT/master
merge for sync kinetic-devel and master branch
2017-05-23 19:22:13 +09:00
sch
35d164614c cmake update for ros install 2017-05-16 14:47:26 +09:00
Yoonseok Pyo
f9c41e47df Merge pull request #39 from ROBOTIS-GIT/kinetic-devel
Merge for sync kinetic-devel and master branch
2017-04-24 17:50:01 +09:00
Yoonseok Pyo
9bf3178c92 Merge pull request #39 from ROBOTIS-GIT/kinetic-devel
Merge for sync kinetic-devel and master branch
2017-04-24 17:50:01 +09:00
Pyo
40201e4a18 Version Update (0.2.2) 2017-04-24 17:42:48 +09:00
Yoonseok Pyo
c1b3e72fea Merge pull request #38 from ROBOTIS-GIT/master
Merge for sync kinetic-devel and master branch
2017-04-24 17:30:27 +09:00
Yoonseok Pyo
69b4b5fc8b Merge pull request #38 from ROBOTIS-GIT/master
Merge for sync kinetic-devel and master branch
2017-04-24 17:30:27 +09:00
ROBOTIS-zerom
c42dadf25f Update robotis_controller.cpp
some logs are commented out.
2017-04-21 15:56:31 +09:00
ROBOTIS-zerom
fed08fb144 Merge pull request #37 from ROBOTIS-GIT/develop
add OpenCR device file
2017-04-13 11:03:14 +09:00
kayman
35af44be12 Merge branch 'develop' of https://github.com/ROBOTIS-GIT/ROBOTIS-Framework into develop 2017-02-28 11:38:45 +09:00
kayman
60dfda6ade add deivce : OPEN-CR 2017-02-28 10:59:04 +09:00
ROBOTIS-zerom
3f64c075fa Merge pull request #36 from ROBOTIS-GIT/develop
Develop
2016-12-14 17:23:24 +09:00
ROBOTIS-zerom
8660bd0c56 Merge pull request #35 from ROBOTIS-GIT/feature_changing_control_cycle
Feature changing control cycle
2016-12-14 17:21:38 +09:00
ROBOTIS-zerom
41a8e30731 read control cycle from .robot file 2016-12-14 17:19:52 +09:00
ROBOTIS-zerom
f173598cef Merge pull request #34 from ROBOTIS-GIT/feature_changing_control_cycle
Feature changing control cycle
2016-12-09 15:03:30 +09:00
ROBOTIS-zerom
891cf2f2b3 Merge pull request #34 from ROBOTIS-GIT/feature_changing_control_cycle
Feature changing control cycle
2016-12-09 15:03:30 +09:00
robotis
0afd62afb3 Now, control cycle can be changed. 2016-12-09 14:50:59 +09:00
Yoonseok Pyo
f046b94705 Merge pull request #33 from ROBOTIS-GIT/kinetic-devel
PR to sync
2016-11-23 11:06:49 +09:00
Yoonseok Pyo
14617ed4a9 Merge pull request #33 from ROBOTIS-GIT/kinetic-devel
PR to sync
2016-11-23 11:06:49 +09:00
Yoonseok Pyo
6344c15b51 Merge pull request #32 from ROBOTIS-GIT/kinetic-devel
PR to sync
2016-11-23 11:06:11 +09:00
Yoonseok Pyo
a2222ad01a Merge pull request #32 from ROBOTIS-GIT/kinetic-devel
PR to sync
2016-11-23 11:06:11 +09:00
Pyo
f14a1fc549 check the bloom error 2016-11-23 10:53:48 +09:00
Pyo
3f7c86f611 check the bloom error 2016-11-23 10:52:37 +09:00
Pyo
a5bcabbac6 update 0.2.0 > 0.2.1 2016-11-23 10:06:45 +09:00
Pyo
d1d39d3c82 update 0.2.0 > 0.2.1 2016-11-23 09:13:50 +09:00