Skip to content

Commit ebef99d

Browse files
authored
* Update Demo * Minor fix * Update tutorial manifest to use v0.4.0 * Update ros_tcp_endpoint module * Update quick_setup version * Update tutorial manifest
1 parent eec4f15 commit ebef99d

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

tutorials/pick_and_place/PickAndPlaceProject/Assets/DemoScripts/Demo.cs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Text;
99
using RosSharp;
1010
using RosSharp.Control;
11+
using RosSharp.Urdf;
1112
using RosSharp.Urdf.Editor;
1213
using UnityEditor;
1314
using UnityEngine;
@@ -166,12 +167,8 @@ private void CreateRosConnection()
166167
// Create RosConnect
167168
GameObject rosConnect = new GameObject(rosConnectName);
168169
rosConnection = rosConnect.AddComponent<ROSConnection>();
169-
rosConnection.rosIPAddress = hostIP;
170-
rosConnection.rosPort = hostPort;
171-
rosConnection.overrideUnityIP = overrideUnityIP;
172-
rosConnection.unityPort = unityPort;
173-
rosConnection.awaitDataMaxRetries = awaitDataMaxRetries;
174-
rosConnection.awaitDataSleepSeconds = awaitDataSleepSeconds;
170+
rosConnection.RosIPAddress = hostIP;
171+
rosConnection.RosPort = hostPort;
175172
}
176173

177174
private void ImportRobot()
@@ -185,7 +182,7 @@ private void ImportRobot()
185182
string urdfFilepath = Path.Combine(Application.dataPath, urdfRelativeFilepath);
186183
// Create is a coroutine that would usually run only in EditMode, so we need to force its execution here
187184
var robotImporter = UrdfRobotExtensions.Create(urdfFilepath, urdfImportSettings, false);
188-
while (robotImporter.MoveNext()) {}
185+
while (robotImporter.MoveNext()) { }
189186
// Adjust robot parameters
190187
Controller controller = GameObject.Find(niryoOneName).GetComponent<Controller>();
191188
controller.stiffness = controllerStiffness;
@@ -210,9 +207,9 @@ private void RecompileScripts(string[] filepaths)
210207
parameters.GenerateExecutable = false;
211208

212209
string[] texts = new string[filepaths.Length];
213-
for (int i = 0; i < filepaths.Length; i ++)
210+
for (int i = 0; i < filepaths.Length; i++)
214211
{
215-
texts[i] = File.ReadAllText(filepaths[i]);
212+
texts[i] = File.ReadAllText(filepaths[i]);
216213
}
217214
CompilerResults results = provider.CompileAssemblyFromSource(parameters, texts);
218215
checkCompileErrors(results);

tutorials/pick_and_place/PickAndPlaceProject/Packages/manifest.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
"com.unity.ide.rider": "2.0.7",
55
"com.unity.ide.visualstudio": "2.0.3",
66
"com.unity.ide.vscode": "1.2.2",
7-
"com.unity.robotics.ros-tcp-connector":
8-
"https://github.com/Unity-Technologies/ROS-TCP-Connector.git?path=/com.unity.robotics.ros-tcp-connector#v0.3.0",
9-
"com.unity.robotics.urdf-importer": "https://github.com/Unity-Technologies/URDF-Importer.git?path=/com.unity.robotics.urdf-importer#v0.3.0",
7+
"com.unity.robotics.ros-tcp-connector": "https://github.com/Unity-Technologies/ROS-TCP-Connector.git?path=/com.unity.robotics.ros-tcp-connector#v0.4.0",
8+
"com.unity.robotics.urdf-importer": "https://github.com/Unity-Technologies/URDF-Importer.git?path=/com.unity.robotics.urdf-importer#v0.4.0",
109
"com.unity.test-framework": "1.1.18",
1110
"com.unity.textmeshpro": "3.0.1",
1211
"com.unity.timeline": "1.4.3",

tutorials/quick_setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This page provides brief instructions on installing the Unity Robotics packages.
1111

1212
![](../images/packman.png)
1313

14-
1. Enter the git URL for the desired package. Note: you can append a version tag to the end of the git url, like `#v0.2.0` or `#v0.3.0`, to declare a specific package version, or exclude the tag to get the latest from the package's `main` branch.
14+
1. Enter the git URL for the desired package. Note: you can append a version tag to the end of the git url, like `#v0.3.0` or `#v0.4.0`, to declare a specific package version, or exclude the tag to get the latest from the package's `main` branch.
1515
1. For the [ROS-TCP-Connector](https://github.com/Unity-Technologies/ROS-TCP-Connector), enter `https://github.com/Unity-Technologies/ROS-TCP-Connector.git?path=/com.unity.robotics.ros-tcp-connector`.
1616
1. For the [URDF-Importer](https://github.com/Unity-Technologies/URDF-Importer), enter `https://github.com/Unity-Technologies/URDF-Importer.git?path=/com.unity.robotics.urdf-importer`.
1717

0 commit comments

Comments
 (0)