Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tutorials/ros_unity_integration/publisher.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class RosPublisherExample : MonoBehaviour
void Start()
{
// start the ROS connection
ros = ROSConnection.instance;
ros = ROSConnection.GetOrCreateInstance();
ros.RegisterPublisher<PosRotMsg>(topicName);
}

Expand All @@ -59,7 +59,7 @@ public class RosPublisherExample : MonoBehaviour
);

// Finally send the message to server_endpoint.py running in ROS
ros.Send(topicName, cubePos);
ros.Publish(topicName, cubePos);

timeElapsed = 0;
}
Expand Down
6 changes: 3 additions & 3 deletions tutorials/ros_unity_integration/service_call.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ Create a simple Unity scene which calls an external [ROS service](http://wiki.ro
- (Alternatively, you can drag the script file into Unity from `tutorials/ros_unity_integration/unity_scripts`).

```csharp
using RosMessageTypes.UnityRoboticsDemo;
using UnityEngine;
using Unity.Robotics.ROSTCPConnector;
using RosMessageTypes.UnityRoboticsDemo;

public class RosServiceCallExample : MonoBehaviour
{
Expand All @@ -51,8 +51,8 @@ public class RosServiceCallExample : MonoBehaviour

void Start()
{
ros = ROSConnection.instance;
ros.RegisterRosService<PositionServiceRequest>(serviceName);
ros = ROSConnection.GetOrCreateInstance();
ros.RegisterRosService<PositionServiceRequest, PositionServiceResponse>(serviceName);
destination = cube.transform.position;
}

Expand Down
2 changes: 1 addition & 1 deletion tutorials/ros_unity_integration/subscriber.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class RosSubscriberExample : MonoBehaviour

void Start()
{
ROSConnection.instance.Subscribe<RosColor>("color", ColorChange);
ROSConnection.GetOrCreateInstance().Subscribe<RosColor>("color", ColorChange);
}

void ColorChange(RosColor colorMessage)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class RosPublisherExample : MonoBehaviour
void Start()
{
// start the ROS connection
ros = ROSConnection.instance;
ros = ROSConnection.GetOrCreateInstance();
ros.RegisterPublisher<PosRotMsg>(topicName);
}

Expand All @@ -44,7 +44,7 @@ private void Update()
);

// Finally send the message to server_endpoint.py running in ROS
ros.Send(topicName, cubePos);
ros.Publish(topicName, cubePos);

timeElapsed = 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using UnityEngine;
using Unity.Robotics.ROSTCPConnector;

public class RosServiceExample : MonoBehaviour
public class RosServiceCallExample : MonoBehaviour
{
ROSConnection ros;

Expand All @@ -19,8 +19,8 @@ public class RosServiceExample : MonoBehaviour

void Start()
{
ros = ROSConnection.instance;
ros.RegisterRosService<PositionServiceRequest>(serviceName);
ros = ROSConnection.GetOrCreateInstance();
ros.RegisterRosService<PositionServiceRequest, PositionServiceResponse>(serviceName);
destination = cube.transform.position;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class RosSubscriberExample : MonoBehaviour

void Start()
{
ROSConnection.instance.Subscribe<RosColor>("color", ColorChange);
ROSConnection.GetOrCreateInstance().Subscribe<RosColor>("color", ColorChange);
}

void ColorChange(RosColor colorMessage)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class RosUnityServiceExample : MonoBehaviour
void Start()
{
// register the service with ROS
ROSConnection.instance.ImplementService<ObjectPoseServiceRequest>(m_ServiceName, GetObjectPose);
ROSConnection.GetOrCreateInstance().ImplementService<ObjectPoseServiceRequest, ObjectPoseServiceResponse>(m_ServiceName, GetObjectPose);
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion tutorials/ros_unity_integration/unity_service.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class RosUnityServiceExample : MonoBehaviour
void Start()
{
// register the service with ROS
ROSConnection.instance.ImplementService<ObjectPoseServiceRequest>(m_ServiceName, GetObjectPose);
ROSConnection.GetOrCreateInstance().ImplementService<ObjectPoseServiceRequest, ObjectPoseServiceResponse>(m_ServiceName, GetObjectPose);
}

/// <summary>
Expand Down