Skip to content

Commit e1bf935

Browse files
authored
Fixes before release 0.7.0 (#351)
* Remove ROS2 Beta Mentions (#272) * update the ros setup tutorial for ROS_TCP_PORT (#256) * Laurie/no ros2 beta (#265) * No references to ROS2 beta * Better message generation note * Tutorial links * fix compile issue due to property renaming choosenAxis --> chosenAxis * fix compile issues in pick and place related to the assembly definitions * updating snippets in tutorial part 2 to match the updated source code * revert unneeded change to EditMode assembly definition * Updated change log (v0.6.0 and v0.7.0) * updated part2 gif anims * updating ros and unity dependencies to latest release (0.7.0)
1 parent 3e9aee2 commit e1bf935

File tree

14 files changed

+52
-29
lines changed

14 files changed

+52
-29
lines changed

Diff for: CHANGELOG.md

+25-6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ All notable changes to this repository will be documented in this file.
44

55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
78
## Unreleased
89

910
### Upgrade Notes
@@ -12,19 +13,37 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
1213

1314
### Added
1415

15-
Added Sonarqube scanners.
16+
### Changed
1617

17-
Fixed the ROS-Unity Integration tutorial `robo_demo.launch` to be up-to-date with file paths, and updated Pick-and-Place Part 2 ROS Settings screenshot.
18+
### Deprecated
1819

19-
Add the [Close Stale Issues](https://github.com/marketplace/actions/close-stale-issues) action
20+
### Removed
2021

21-
Updated Pick-and-Place scripts for style conformity, updated custom msg formats and made according script and tutorial changes.
22+
### Fixed
23+
24+
25+
## v0.7.0
26+
27+
### Added
28+
29+
Added Sonarqube scanners.
2230

2331
### Changed
2432

25-
### Deprecated
33+
Updates to PickAndPlace dependencies. ROS-TCP-Connector v0.7.0, ROS-TCP-Endpoint v0.7.0, URDF-Importer v 0.5.2
2634

27-
### Removed
35+
Updated PickAndPlace project and tutorial part2 for documnentation and compilation fixes.
36+
37+
38+
## v0.6.0 2021-10-04
39+
40+
### Added
41+
42+
Fixed the ROS-Unity Integration tutorial `robo_demo.launch` to be up-to-date with file paths, and updated Pick-and-Place Part 2 ROS Settings screenshot.
43+
44+
Add the [Close Stale Issues](https://github.com/marketplace/actions/close-stale-issues) action
45+
46+
Updated Pick-and-Place scripts for style conformity, updated custom msg formats and made according script and tutorial changes.
2847

2948
### Fixed
3049

Diff for: tutorials/pick_and_place/2_ros_tcp.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ To enable communication between Unity and ROS, a TCP endpoint running as a ROS n
8181

8282
1. In this repo, navigate to `Unity-Robotics-Hub/tutorials/pick_and_place`. Select and copy the `Scripts` folder and contents into the `Assets` folder of your Unity project. You should now find two C# scripts in your project's `Assets/Scripts`.
8383

84-
> Note: The SourceDestinationPublisher script is one of the included files. This script will communicate with ROS, grabbing the positions of the target and destination objects and sending it to the ROS Topic `"SourceDestination_input"`. The `Publish()` function is defined as follows:
84+
> Note: The SourceDestinationPublisher script is one of the included files. This script will communicate with ROS, grabbing the positions of the target and destination objects and sending it to the ROS Topic `"/niryo_joints"`. The `Publish()` function is defined as follows:
8585
8686
```csharp
8787
public void Publish()
@@ -108,11 +108,11 @@ To enable communication between Unity and ROS, a TCP endpoint running as a ROS n
108108
};
109109

110110
// Finally send the message to server_endpoint.py running in ROS
111-
m_Ros.Send(m_TopicName, sourceDestinationMessage);
111+
m_Ros.Publish(m_TopicName, sourceDestinationMessage);
112112
}
113113
```
114114

115-
> This function first takes in the current joint target values. Then, it grabs the poses of the `target` and the `targetPlacement` objects, adds them to the newly created message `sourceDestinationMessage`, and calls `Send()` to send this information to the ROS topic `topicName` (defined as `"SourceDestination_input"`).
115+
> This function first takes in the current joint target values. Then, it grabs the poses of the `m_Target` and the `m_TargetPlacement` objects, adds them to the newly created message `sourceDestinationMessage`, and calls `Send()` to send this information to the ROS topic `m_TopicName` (defined as `"/niryo_joints"`).
116116
117117
> Note: Going from Unity world space to ROS world space requires a conversion. Unity's coordinate space has x Right, y Up, and z Forward (hence "RUF" coordinates); ROS has x Forward, y Left and z Up (hence "FLU"). So a Unity `(x,y,z)` coordinate is equivalent to the ROS `(z,-x,y)` coordinate. These conversions are done by the `To<FLU>` function in the ROS-TCP-Connector package's [ROSGeometry component](https://github.com/Unity-Technologies/ROS-TCP-Connector/blob/main/ROSGeometry.md).
118118

Diff for: tutorials/pick_and_place/PickAndPlaceProject/Assets/DemoScripts/Demo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ void ImportRobot()
192192
{
193193
var urdfImportSettings = new ImportSettings
194194
{
195-
choosenAxis = ImportSettings.axisType.yAxis,
195+
chosenAxis = ImportSettings.axisType.yAxis,
196196
convexMethod = ImportSettings.convexDecomposer.unity
197197
};
198198

Diff for: tutorials/pick_and_place/PickAndPlaceProject/Assets/RosMessages/Unity.Robotics.RosMessages.asmdef

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"name": "Unity.Robotics.RosMessages",
33
"rootNamespace": "",
44
"references": [
5-
"GUID:625bfc588fb96c74696858f2c467e978"
5+
"Unity.Robotics.ROSTCPConnector",
6+
"Unity.Robotics.ROSTCPConnector.MessageGeneration",
7+
"Unity.Robotics.ROSTCPConnector.Messages"
68
],
79
"includePlatforms": [],
810
"excludePlatforms": [],

Diff for: tutorials/pick_and_place/PickAndPlaceProject/Assets/Scripts/Unity.Robotics.PickAndPlace.asmdef

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
"name": "Unity.Robotics.PickAndPlace",
33
"rootNamespace": "",
44
"references": [
5-
"GUID:204b12c73a0ba074c888ec09a2713605",
6-
"GUID:625bfc588fb96c74696858f2c467e978",
7-
"GUID:b1ef917f7a8a86a4eb639ec2352edbf8"
5+
"Unity.Robotics.RosMessages",
6+
"Unity.Robotics.ROSTCPConnector",
7+
"Unity.Robotics.UrdfImporter",
8+
"Unity.Robotics.ROSTCPConnector.MessageGeneration",
9+
"Unity.Robotics.ROSTCPConnector.Messages"
810
],
911
"includePlatforms": [],
1012
"excludePlatforms": [],

Diff for: tutorials/pick_and_place/PickAndPlaceProject/Assets/Tests/EditMode/EditMode.asmdef

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"name": "EditMode",
33
"rootNamespace": "",
44
"references": [
5-
"GUID:27619889b8ba8c24980f49ee34dbb44a",
6-
"GUID:0acc523941302664db1f4e527237feb3",
7-
"GUID:1da8e23352f14494396eac5033ba9894",
8-
"GUID:625bfc588fb96c74696858f2c467e978",
9-
"GUID:204b12c73a0ba074c888ec09a2713605",
10-
"GUID:465c1207fffb96245a352265e7622205",
11-
"GUID:b1ef917f7a8a86a4eb639ec2352edbf8",
12-
"GUID:79169c04a5f9b014e919b69ac8df4286"
5+
"UnityEngine.TestRunner",
6+
"UnityEditor.TestRunner",
7+
"Unity.Robotics.ROSTCPConnector.Editor",
8+
"Unity.Robotics.ROSTCPConnector",
9+
"Unity.Robotics.RosMessages",
10+
"Unity.Robotics.UrdfImporter.Editor",
11+
"Unity.Robotics.UrdfImporter",
12+
"Unity.Robotics.PickAndPlace"
1313
],
1414
"includePlatforms": [
1515
"Editor"

Diff for: tutorials/pick_and_place/PickAndPlaceProject/Assets/Tests/EditMode/PickAndPlaceIntegrationTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public class PickAndPlaceIntegrationTests
6161

6262
readonly ImportSettings k_UrdfImportSettings = new ImportSettings
6363
{
64-
choosenAxis = ImportSettings.axisType.yAxis,
64+
chosenAxis = ImportSettings.axisType.yAxis,
6565
convexMethod = ImportSettings.convexDecomposer.unity
6666
};
6767
#endregion

Diff for: tutorials/pick_and_place/PickAndPlaceProject/Assets/Tests/PlayMode/PlayMode.asmdef

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"references": [
55
"UnityEngine.TestRunner",
66
"UnityEditor.TestRunner",
7-
"Unity.Robotics.URDFImporter",
7+
"Unity.Robotics.UrdfImporter",
88
"Unity.Robotics.ROSTCPConnector",
99
"Unity.Robotics.RosMessages",
1010
"Unity.Robotics.PickAndPlace"

Diff for: tutorials/pick_and_place/PickAndPlaceProject/Packages/manifest.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"com.unity.ide.rider": "2.0.7",
44
"com.unity.ide.visualstudio": "2.0.8",
55
"com.unity.ide.vscode": "1.2.3",
6-
"com.unity.robotics.ros-tcp-connector": "https://github.com/Unity-Technologies/ROS-TCP-Connector.git?path=/com.unity.robotics.ros-tcp-connector#v0.6.0",
7-
"com.unity.robotics.urdf-importer": "https://github.com/Unity-Technologies/URDF-Importer.git?path=/com.unity.robotics.urdf-importer#v0.5.0",
6+
"com.unity.robotics.ros-tcp-connector": "https://github.com/Unity-Technologies/ROS-TCP-Connector.git?path=/com.unity.robotics.ros-tcp-connector#v0.7.0",
7+
"com.unity.robotics.urdf-importer": "https://github.com/Unity-Technologies/URDF-Importer.git?path=/com.unity.robotics.urdf-importer#v0.5.2",
88
"com.unity.test-framework": "1.1.24",
99
"com.unity.textmeshpro": "3.0.6",
1010
"com.unity.timeline": "1.4.8",

Diff for: tutorials/pick_and_place/img/2_sourcedest.gif

-13.1 KB
Loading

Diff for: tutorials/pick_and_place/img/2_target.gif

229 KB
Loading

Diff for: tutorials/ros_unity_integration/ros2_docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN mkdir -p /home/dev_ws/src
77
COPY ./ros2_packages/ /home/dev_ws/src
88

99
#Check out ROS-TCP-Endpoint, ROS2 version
10-
RUN git clone https://github.com/Unity-Technologies/ROS-TCP-Endpoint /home/dev_ws/src/ros_tcp_endpoint -b ROS2v0.6.0
10+
RUN git clone https://github.com/Unity-Technologies/ROS-TCP-Endpoint /home/dev_ws/src/ros_tcp_endpoint -b ROS2v0.7.0
1111

1212
# Reference script with commands to source workspace
1313
COPY ./ros2_docker/source_ros.sh /home/dev_ws/source_ros.sh

Diff for: tutorials/ros_unity_integration/ros_docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ENV ROS_WORKSPACE=/catkin_ws
55
# Copy packages
66
COPY ./ros_packages/ $ROS_WORKSPACE/src/
77

8-
RUN git clone https://github.com/Unity-Technologies/ROS-TCP-Endpoint $ROS_WORKSPACE/src/ros_tcp_endpoint -b v0.6.0
8+
RUN git clone https://github.com/Unity-Technologies/ROS-TCP-Endpoint $ROS_WORKSPACE/src/ros_tcp_endpoint -b v0.7.0
99

1010
COPY ./ros_docker/set-up-workspace /setup.sh
1111
#COPY docker/tutorial /

0 commit comments

Comments
 (0)