From bb039e20dbad91624ba9448dcffdc30d6e25038d Mon Sep 17 00:00:00 2001 From: "coord.e" Date: Wed, 11 Apr 2018 23:04:29 +0900 Subject: [PATCH 1/9] Add README --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..e61675c --- /dev/null +++ b/README.md @@ -0,0 +1,8 @@ +# YamaX + +![Travis Status](https://travis-ci.org/Y-modify/YamaX.svg?branch=develop) + +A humanoid made for our research about the automation of walk + +[https://www.y-modify.org/yamax](https://www.y-modify.org/yamax) + From 3d8144fcc306e2d18d2e0585ecae7d077faa1703 Mon Sep 17 00:00:00 2001 From: "coord.e" Date: Wed, 11 Apr 2018 23:04:39 +0900 Subject: [PATCH 2/9] Add LICENSE --- LICENSE | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1043fee --- /dev/null +++ b/LICENSE @@ -0,0 +1,7 @@ +Copyright 2018 Y-modify + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From c17a03a4e612454440b686e4597d0a9444fab21f Mon Sep 17 00:00:00 2001 From: "coord.e" Date: Wed, 10 Oct 2018 16:13:00 +0900 Subject: [PATCH 3/9] Add: Add docker in CI --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index a69fb2a..3d5e10d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: python sudo: true +services: + - docker dist: trusty script: - | From 939c013ec6c35d285c0b1bd4374580c7c612b150 Mon Sep 17 00:00:00 2001 From: "coord.e" Date: Wed, 10 Oct 2018 16:16:06 +0900 Subject: [PATCH 4/9] Add: Generate SDF --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3d5e10d..deaadb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ script: git clone https://github.com/ros/xacro --depth 1 xacro-src export PYTHONPATH=\$PYTHONPATH:$(pwd)/xacro-src/src python3 xacro-src/xacro.py --inorder --xacro-ns robots/yamax.xacro > YamaX_${TRAVIS_TAG}.urdf + - docker run -v $(pwd):/urdf gazebo gz sdf -p /urdf/YamaX_${TRAVIS_TAG}.urdf > YamaX_${TRAVIS_TAG}.sdf deploy: provider: releases api_key: $GITHUB_OAUTH_TOKEN From ed72fc8c846c6e374292239accb5e987a3de7fba Mon Sep 17 00:00:00 2001 From: "coord.e" Date: Wed, 10 Oct 2018 16:17:33 +0900 Subject: [PATCH 5/9] Add: Deploy sdf on GitHub release --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index deaadb1..a5f3faf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,9 @@ script: deploy: provider: releases api_key: $GITHUB_OAUTH_TOKEN - file: "YamaX_${TRAVIS_TAG}.urdf" + file: + - "YamaX_${TRAVIS_TAG}.urdf" + - "YamaX_${TRAVIS_TAG}.sdf" skip_cleanup: true on: tags: true From 87546c0821390fd001cae1b47e7868d398fc2350 Mon Sep 17 00:00:00 2001 From: "coord.e" Date: Mon, 15 Oct 2018 14:09:03 +0900 Subject: [PATCH 6/9] Change: Expand the depth length of body --- robots/yamax.xacro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/robots/yamax.xacro b/robots/yamax.xacro index f6119fe..e435261 100644 --- a/robots/yamax.xacro +++ b/robots/yamax.xacro @@ -12,7 +12,7 @@ - + From 56159d6373c5c5123da1f9514dc17e93fdd9e579 Mon Sep 17 00:00:00 2001 From: "coord.e" Date: Mon, 15 Oct 2018 14:11:47 +0900 Subject: [PATCH 7/9] Change: Detach arms --- robots/yamax.xacro | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/robots/yamax.xacro b/robots/yamax.xacro index e435261..3de019a 100644 --- a/robots/yamax.xacro +++ b/robots/yamax.xacro @@ -13,13 +13,6 @@ - - - - - - - @@ -45,15 +38,6 @@ - - - - - - - - - From 663f3d049c88fb1d4124eb3e3f99fefa7b7f5556 Mon Sep 17 00:00:00 2001 From: Nyanyan Date: Wed, 31 Oct 2018 22:38:40 +0900 Subject: [PATCH 8/9] Modify for YamaX 6.0 --- robots/yamax.xacro | 69 ++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/robots/yamax.xacro b/robots/yamax.xacro index 3de019a..0f7bf03 100644 --- a/robots/yamax.xacro +++ b/robots/yamax.xacro @@ -8,53 +8,44 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - ${config.namespace} From 585e58b40b77d8f5fffab7130cacf48227b944c7 Mon Sep 17 00:00:00 2001 From: Nyanyan Date: Wed, 31 Oct 2018 23:01:16 +0900 Subject: [PATCH 9/9] Change: Bunp the version number --- package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.xml b/package.xml index 4daca32..c4457cf 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ YamaX - 4.0 + 6.0 A humanoid made for our research about the automation of walk coord.e