Skip to content

Commit

Permalink
Fix xacro args loading issue (#2684)
Browse files Browse the repository at this point in the history
* Fixed xacro args loading issue

* Formatting fixes with pre-commit action

---------

Co-authored-by: Sebastian Jahr <sebastian.jahr@picknik.ai>
(cherry picked from commit cdb20ae)
  • Loading branch information
alexnavtt authored and mergify[bot] committed Mar 19, 2024
1 parent 0a27609 commit d897f87
Showing 1 changed file with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -173,20 +173,20 @@ def __init__(
if setup_assistant_file.exists():
setup_assistant_yaml = load_yaml(setup_assistant_file)
config = setup_assistant_yaml.get("moveit_setup_assistant_config", {})
urdf_config = config.get("urdf", config.get("URDF"))
if urdf_config and self.__urdf_package is None:
self.__urdf_package = Path(
get_package_share_directory(urdf_config["package"])
)
self.__urdf_file_path = Path(urdf_config["relative_path"])

if (xacro_args := urdf_config.get("xacro_args")) is not None:
if urdf_config := config.get("urdf", config.get("URDF")):
if self.__urdf_package is None:
self.__urdf_package = Path(
get_package_share_directory(urdf_config["package"])
)
self.__urdf_file_path = Path(urdf_config["relative_path"])

if xacro_args := urdf_config.get("xacro_args"):
self.__urdf_xacro_args = dict(
arg.split(":=") for arg in xacro_args.split(" ") if arg
)

srdf_config = config.get("srdf", config.get("SRDF"))
if srdf_config:
if srdf_config := config.get("srdf", config.get("SRDF")):
self.__srdf_file_path = Path(srdf_config["relative_path"])

if not self.__urdf_package or not self.__urdf_file_path:
Expand Down

0 comments on commit d897f87

Please sign in to comment.