From 7df94ea19fced16a85b4eb73259129347804d779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= <caguero@openrobotics.org>
Date: Fri, 12 Jan 2024 21:52:24 +0100
Subject: [PATCH 1/2] Update changelog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
---
 Changelog.md                     | 13 +++++++++++++
 vrx_gz/worlds/nbpark.sdf         |  7 +++++++
 vrx_gz/worlds/sydney_regatta.sdf | 21 +++++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 3a3197149..09cfe0a9e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,18 @@
 ## VRX 2
 
+### VRX 2.4.1
+
+1. Add configuration file for RoboBoat teleop
+    * [Pull Request 764](https://github.com/osrf/vrx/pull/764)
+
+### VRX 2.4.0
+
+1. Adding extra RoboBoat models
+    * [Pull Request 758](https://github.com/osrf/vrx/pull/758)
+    * [Pull Request 759](https://github.com/osrf/vrx/pull/759)
+1. Spawn robot and world separately
+    * [Pull Request 594](https://github.com/osrf/vrx/pull/594)
+
 ### VRX 2.3.3
 
 1. Initialize acoustic perception score
diff --git a/vrx_gz/worlds/nbpark.sdf b/vrx_gz/worlds/nbpark.sdf
index 412c391ec..539f9c6dd 100644
--- a/vrx_gz/worlds/nbpark.sdf
+++ b/vrx_gz/worlds/nbpark.sdf
@@ -391,6 +391,13 @@
       </plugin>
     </include>
 
+    <!-- RoboBoat 01 -->
+    <include>
+      <name>roboboat01</name>
+      <pose>-185 1088 0 0 0 0</pose>
+      <uri>roboboat01</uri>
+    </include>
+
     <!-- Load the plugin for the wind --> 
     <plugin
       filename="libUSVWind.so"
diff --git a/vrx_gz/worlds/sydney_regatta.sdf b/vrx_gz/worlds/sydney_regatta.sdf
index 112afc01e..1e6102f35 100644
--- a/vrx_gz/worlds/sydney_regatta.sdf
+++ b/vrx_gz/worlds/sydney_regatta.sdf
@@ -512,6 +512,27 @@
       </plugin>
     </include>
 
+    <!-- RoboBoat 01 -->
+    <!-- <include>
+      <name>roboboat01_2</name>
+      <pose>-528 184 0 0 0 0</pose>
+      <uri>roboboat01</uri>
+    </include> -->
+
+    <!-- RoboBoat 02 -->
+    <!-- <include>
+      <name>roboboat01_1</name>
+      <pose>-528 180 0 0 0 0</pose>
+      <uri>roboboat01</uri>
+    </include> -->
+
+    <!-- My custom roboboat -->
+    <!-- <include>
+      <name>my_roboboat</name>
+      <pose>-528 176 0 0 0 0</pose>
+      <uri>my_roboboat</uri>
+    </include> -->
+
     <!-- The posts for securing the WAM-V -->
     <include>
       <name>post_0</name>

From a53c598951433285abc985b0514b711346d41f88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= <caguero@openrobotics.org>
Date: Fri, 12 Jan 2024 21:53:42 +0100
Subject: [PATCH 2/2] Restore
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
---
 vrx_gz/worlds/nbpark.sdf         |  7 -------
 vrx_gz/worlds/sydney_regatta.sdf | 21 ---------------------
 2 files changed, 28 deletions(-)

diff --git a/vrx_gz/worlds/nbpark.sdf b/vrx_gz/worlds/nbpark.sdf
index 539f9c6dd..412c391ec 100644
--- a/vrx_gz/worlds/nbpark.sdf
+++ b/vrx_gz/worlds/nbpark.sdf
@@ -391,13 +391,6 @@
       </plugin>
     </include>
 
-    <!-- RoboBoat 01 -->
-    <include>
-      <name>roboboat01</name>
-      <pose>-185 1088 0 0 0 0</pose>
-      <uri>roboboat01</uri>
-    </include>
-
     <!-- Load the plugin for the wind --> 
     <plugin
       filename="libUSVWind.so"
diff --git a/vrx_gz/worlds/sydney_regatta.sdf b/vrx_gz/worlds/sydney_regatta.sdf
index 1e6102f35..112afc01e 100644
--- a/vrx_gz/worlds/sydney_regatta.sdf
+++ b/vrx_gz/worlds/sydney_regatta.sdf
@@ -512,27 +512,6 @@
       </plugin>
     </include>
 
-    <!-- RoboBoat 01 -->
-    <!-- <include>
-      <name>roboboat01_2</name>
-      <pose>-528 184 0 0 0 0</pose>
-      <uri>roboboat01</uri>
-    </include> -->
-
-    <!-- RoboBoat 02 -->
-    <!-- <include>
-      <name>roboboat01_1</name>
-      <pose>-528 180 0 0 0 0</pose>
-      <uri>roboboat01</uri>
-    </include> -->
-
-    <!-- My custom roboboat -->
-    <!-- <include>
-      <name>my_roboboat</name>
-      <pose>-528 176 0 0 0 0</pose>
-      <uri>my_roboboat</uri>
-    </include> -->
-
     <!-- The posts for securing the WAM-V -->
     <include>
       <name>post_0</name>