From 9b656c4c108d0fae78e90c5ac015c937dd8137e1 Mon Sep 17 00:00:00 2001
From: PepMS <jmarti@iri.upc.edu>
Date: Wed, 30 Oct 2019 09:24:07 +0100
Subject: [PATCH] Double pendulum:
renamed files
---
CMakeLists.txt | 2 +-
.../meshes/base_link.STL | Bin
.../meshes/link1.STL | Bin
.../meshes/link2.STL | Bin
.../urdf/double_pendulum.urdf | 0
python/example_robot_data/__init__.py | 2 +-
python/example_robot_data/__main__.py | 4 ++--
python/example_robot_data/robots_loader.py | 6 +++---
8 files changed, 7 insertions(+), 7 deletions(-)
rename {2dof_description => double_pendulum_description}/meshes/base_link.STL (100%)
rename {2dof_description => double_pendulum_description}/meshes/link1.STL (100%)
rename {2dof_description => double_pendulum_description}/meshes/link2.STL (100%)
rename 2dof_description/urdf/2dof_planar.urdf => double_pendulum_description/urdf/double_pendulum.urdf (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b91bca7..4de86e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,7 @@ IF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
INSTALL(DIRECTORY tiago_description DESTINATION share/${PROJECT_NAME})
INSTALL(DIRECTORY ur_description DESTINATION share/${PROJECT_NAME})
INSTALL(DIRECTORY hector_description DESTINATION share/${PROJECT_NAME})
- INSTALL(DIRECTORY 2dof_description DESTINATION share/${PROJECT_NAME})
+ INSTALL(DIRECTORY double_pendulum_description DESTINATION share/${PROJECT_NAME})
ENDIF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
SETUP_PROJECT_FINALIZE()
diff --git a/2dof_description/meshes/base_link.STL b/double_pendulum_description/meshes/base_link.STL
similarity index 100%
rename from 2dof_description/meshes/base_link.STL
rename to double_pendulum_description/meshes/base_link.STL
diff --git a/2dof_description/meshes/link1.STL b/double_pendulum_description/meshes/link1.STL
similarity index 100%
rename from 2dof_description/meshes/link1.STL
rename to double_pendulum_description/meshes/link1.STL
diff --git a/2dof_description/meshes/link2.STL b/double_pendulum_description/meshes/link2.STL
similarity index 100%
rename from 2dof_description/meshes/link2.STL
rename to double_pendulum_description/meshes/link2.STL
diff --git a/2dof_description/urdf/2dof_planar.urdf b/double_pendulum_description/urdf/double_pendulum.urdf
similarity index 100%
rename from 2dof_description/urdf/2dof_planar.urdf
rename to double_pendulum_description/urdf/double_pendulum.urdf
diff --git a/python/example_robot_data/__init__.py b/python/example_robot_data/__init__.py
index 4ae36c3..43563e9 100644
--- a/python/example_robot_data/__init__.py
+++ b/python/example_robot_data/__init__.py
@@ -1,3 +1,3 @@
# flake8: noqa
from .robots_loader import (getModelPath, loadANYmal, loadHyQ, loadICub, loadSolo, loadTalos, loadTalosArm,
- loadTalosLegs, loadTiago, loadTiagoNoHand, loadUR, loadHector, load2dof, readParamsFromSrdf)
+ loadTalosLegs, loadTiago, loadTiagoNoHand, loadUR, loadHector, loadDoublePendulum, readParamsFromSrdf)
diff --git a/python/example_robot_data/__main__.py b/python/example_robot_data/__main__.py
index 8af6821..4ac50cf 100644
--- a/python/example_robot_data/__main__.py
+++ b/python/example_robot_data/__main__.py
@@ -3,7 +3,7 @@ from argparse import ArgumentParser
from . import robots_loader
ROBOTS = [
- 'anymal', 'hyq', 'solo', 'solo12', 'talos', 'talos_arm', 'talos_legs', 'tiago', 'tiago_no_hand', 'icub', 'ur5', 'hector', '2dof'
+ 'anymal', 'hyq', 'solo', 'solo12', 'talos', 'talos_arm', 'talos_legs', 'tiago', 'tiago_no_hand', 'icub', 'ur5', 'hector', 'double_pendulum'
]
parser = ArgumentParser()
@@ -72,7 +72,7 @@ if args.robot == 'hector':
hector.display(hector.q0)
-if args.robot == '2dof':
+if args.robot == 'double_pendulum':
planar2dof = robots_loader.load2dof()
planar2dof.initViewer(loadModel=True)
planar2dof.display(planar2dof.q0)
diff --git a/python/example_robot_data/robots_loader.py b/python/example_robot_data/robots_loader.py
index 439f1b7..b9e7158 100644
--- a/python/example_robot_data/robots_loader.py
+++ b/python/example_robot_data/robots_loader.py
@@ -238,9 +238,9 @@ def loadHector():
return robot
-def load2dof():
- URDF_FILENAME = "2dof_planar.urdf"
- URDF_SUBPATH = "/2dof_description/urdf/" + URDF_FILENAME
+def loadDoublePendulum():
+ URDF_FILENAME = "double_pendulum.urdf"
+ URDF_SUBPATH = "/double_pendulum_description/urdf/" + URDF_FILENAME
modelPath = getModelPath(URDF_SUBPATH)
robot = RobotWrapper.BuildFromURDF(modelPath + URDF_SUBPATH, [modelPath])
return robot
--
GitLab