From ed5af6535d56725ab10d0a5109793d117f62c978 Mon Sep 17 00:00:00 2001 From: LaurieCheers-unity <73140792+LaurieCheers-unity@users.noreply.github.com> Date: Fri, 22 Jan 2021 15:07:25 -0800 Subject: [PATCH 1/3] Fix merge conflicts (#99) * Merging dev branch into main (#78) * Reverting params.yaml and updating code in server_endpoint.md * TcpServer class was renamed * convert all files with dos2unix (#76) * Minor tutorial tweaks, update version numbers Co-authored-by: Devin Miller Co-authored-by: peifeng-unity <56408141+peifeng-unity@users.noreply.github.com> * Updating instructions for URDF repository (#71) * 1. Adding images for URDF tutorial 2. Adding instructions highlighting Disable Collison tag * Adding link to example of disable collision tag in the niryo_one URDF file Co-authored-by: Devin Miller Co-authored-by: peifeng-unity <56408141+peifeng-unity@users.noreply.github.com> Co-authored-by: vidurvij-Unity <60901103+vidurvij-Unity@users.noreply.github.com> --- .../ROS/src/niryo_moveit/scripts/server_endpoint.py | 0 tutorials/pick_and_place/docker/Dockerfile | 2 +- tutorials/ros_packages/robotics_demo/scripts/server_endpoint.py | 0 3 files changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 tutorials/pick_and_place/ROS/src/niryo_moveit/scripts/server_endpoint.py mode change 100755 => 100644 tutorials/ros_packages/robotics_demo/scripts/server_endpoint.py diff --git a/tutorials/pick_and_place/ROS/src/niryo_moveit/scripts/server_endpoint.py b/tutorials/pick_and_place/ROS/src/niryo_moveit/scripts/server_endpoint.py old mode 100755 new mode 100644 diff --git a/tutorials/pick_and_place/docker/Dockerfile b/tutorials/pick_and_place/docker/Dockerfile index 31288e62..05b94827 100644 --- a/tutorials/pick_and_place/docker/Dockerfile +++ b/tutorials/pick_and_place/docker/Dockerfile @@ -18,7 +18,7 @@ COPY docker/tutorial / RUN /bin/bash -c "find $ROS_WORKSPACE -type f -print0 | xargs -0 dos2unix" -RUN dos2unix /tutorial /setup.sh && chmod +x /setup.sh && /setup.sh && rm /setup.sh +RUN dos2unix /tutorial && dos2unix /setup.sh && chmod +x /setup.sh && /setup.sh && rm /setup.sh WORKDIR $ROS_WORKSPACE diff --git a/tutorials/ros_packages/robotics_demo/scripts/server_endpoint.py b/tutorials/ros_packages/robotics_demo/scripts/server_endpoint.py old mode 100755 new mode 100644 From 84a907f55ba24d2fb914481337171992f02c1fe0 Mon Sep 17 00:00:00 2001 From: mpinol Date: Mon, 25 Jan 2021 12:46:39 -0800 Subject: [PATCH 2/3] Adding ROS# differences link to faq. (#97) * Adding ROS# differences link to faq. --- faq.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/faq.md b/faq.md index 481cf590..ad3b5100 100644 --- a/faq.md +++ b/faq.md @@ -19,14 +19,16 @@ Is ROS 2 support planned? --- We definitely plan to support ROS 2 in the future. Let us know more about your use case in order to prioritize our work by reaching out to us at [unity-robotics@unity3d.com](mailto:unity-robotics@unity3d.com). -How does your Unity integration compare to [ROS#](https://github.com/siemens/ros-sharp)? +How does your Unity integration compare to ROS#? --- -Two of the Unity Robotics repos (URDF Importer and TCP Connector) have been forked from the Siemens ROS# repo. +Two of the Unity Robotics repos (URDF Importer and TCP Connector) have been forked from the [Siemens ROS# repo](https://github.com/siemens/ros-sharp). In the URDF Importer we have added the functionality to instantiate a robot from URDF into a Unity scene with [Articulation Body](https://docs.unity3d.com/2020.2/Documentation/Manual/class-ArticulationBody.html) components on their corresponding joints. Aside from facilitating communication with the TCP Endpoint, the TCP Connector contains the `MessageGeneration` code from ROS#. We added the extra functionality that when generating a C# class from a ROS message, functions are also generated that will serialize and deserialize the messages as ROS would internally. +You can find more details about the differences between our implementation and ROS#, along with some of their future plans, in the [ROS# project](https://github.com/siemens/ros-sharp/wiki/Ext_RosSharp_RoboticsHub#differences-between-unity-robotics-hub-and-ros). + How can I install the Unity Packages without starting from a template project? --- Refer to the [Quick Start](tutorials/quick_setup.md) instructions on how to import these packages. From ce583f8833bea24fed8207ccd6501de0991f1277 Mon Sep 17 00:00:00 2001 From: peifeng-unity <56408141+peifeng-unity@users.noreply.github.com> Date: Tue, 26 Jan 2021 18:56:06 +0000 Subject: [PATCH 3/3] make server_endpoint.py executable (#103) --- .../ROS/src/niryo_moveit/scripts/server_endpoint.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tutorials/pick_and_place/ROS/src/niryo_moveit/scripts/server_endpoint.py diff --git a/tutorials/pick_and_place/ROS/src/niryo_moveit/scripts/server_endpoint.py b/tutorials/pick_and_place/ROS/src/niryo_moveit/scripts/server_endpoint.py old mode 100644 new mode 100755