From c3f97f2a55f51f93a11642d4b68568ff9cda60cd Mon Sep 17 00:00:00 2001
From: Jason <vuwij@me.com>
Date: Sat, 15 Feb 2020 01:40:23 -0500
Subject: [PATCH 1/2] Added line to package.xml

---
 package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.xml b/package.xml
index 72e0145..a119ae4 100644
--- a/package.xml
+++ b/package.xml
@@ -12,6 +12,7 @@
   <depend>gazebo_ros</depend>
   <depend>roscpp</depend>
   <depend>camera_info_manager</depend>
+  <depend>vision_opencv</depend>
   <exec_depend>depth_image_proc</exec_depend>
 
   <export>

From c2256dd96395f1f685a059782b5426a5c2358b80 Mon Sep 17 00:00:00 2001
From: Jason <vuwij@me.com>
Date: Sat, 4 Apr 2020 01:01:26 -0400
Subject: [PATCH 2/2] Fixed multi-robot issue

---
 package.xml             |  2 +-
 src/RealSensePlugin.cpp | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/package.xml b/package.xml
index a119ae4..0665055 100644
--- a/package.xml
+++ b/package.xml
@@ -12,7 +12,7 @@
   <depend>gazebo_ros</depend>
   <depend>roscpp</depend>
   <depend>camera_info_manager</depend>
-  <depend>vision_opencv</depend>
+  <depend>libopencv-dev</depend>
   <exec_depend>depth_image_proc</exec_depend>
 
   <export>
diff --git a/src/RealSensePlugin.cpp b/src/RealSensePlugin.cpp
index 29fc2cd..af9f3ab 100644
--- a/src/RealSensePlugin.cpp
+++ b/src/RealSensePlugin.cpp
@@ -66,18 +66,23 @@ void RealSensePlugin::Load(physics::ModelPtr _model, sdf::ElementPtr _sdf)
   // Sensors Manager
   sensors::SensorManager *smanager = sensors::SensorManager::Instance();
 
-  // Get Cameras Renderers
+  std::vector<std::string> DEPTH_CAMERA_FULL_NAME = this->rsModel->SensorScopedName(DEPTH_CAMERA_NAME);
+  std::vector<std::string> IRED1_CAMERA_FULL_NAME = this->rsModel->SensorScopedName(IRED1_CAMERA_NAME);
+  std::vector<std::string> IRED2_CAMERA_FULL_NAME = this->rsModel->SensorScopedName(IRED2_CAMERA_NAME);
+  std::vector<std::string> COLOR_CAMERA_FULL_NAME = this->rsModel->SensorScopedName(COLOR_CAMERA_NAME);
+
+    // Get Cameras Renderers
   this->depthCam =
       std::dynamic_pointer_cast<sensors::DepthCameraSensor>(
-          smanager->GetSensor(DEPTH_CAMERA_NAME))->DepthCamera();
+          smanager->GetSensor(DEPTH_CAMERA_FULL_NAME.front()))->DepthCamera();
   this->ired1Cam = std::dynamic_pointer_cast<sensors::CameraSensor>(
-                                smanager->GetSensor(IRED1_CAMERA_NAME))
+                                smanager->GetSensor(IRED1_CAMERA_FULL_NAME.front()))
                                 ->Camera();
   this->ired2Cam = std::dynamic_pointer_cast<sensors::CameraSensor>(
-                                smanager->GetSensor(IRED2_CAMERA_NAME))
+                                smanager->GetSensor(IRED2_CAMERA_FULL_NAME.front()))
                                 ->Camera();
   this->colorCam = std::dynamic_pointer_cast<sensors::CameraSensor>(
-                                smanager->GetSensor(COLOR_CAMERA_NAME))
+                                smanager->GetSensor(COLOR_CAMERA_FULL_NAME.front()))
                                 ->Camera();
 
   // Check if camera renderers have been found successfuly
@@ -129,11 +134,11 @@ void RealSensePlugin::Load(physics::ModelPtr _model, sdf::ElementPtr _sdf)
   this->depthPub = this->transportNode->Advertise<msgs::ImageStamped>(
           rsTopicRoot + DEPTH_CAMERA_TOPIC, 1, DEPTH_PUB_FREQ_HZ);
   this->ired1Pub = this->transportNode->Advertise<msgs::ImageStamped>(
-          rsTopicRoot + IRED1_CAMERA_TOPIC, 1, DEPTH_PUB_FREQ_HZ);
+          rsTopicRoot + IRED1_CAMERA_TOPIC, 1, IRED1_PUB_FREQ_HZ);
   this->ired2Pub = this->transportNode->Advertise<msgs::ImageStamped>(
-          rsTopicRoot + IRED2_CAMERA_TOPIC, 1, DEPTH_PUB_FREQ_HZ);
+          rsTopicRoot + IRED2_CAMERA_TOPIC, 1, IRED2_PUB_FREQ_HZ);
   this->colorPub = this->transportNode->Advertise<msgs::ImageStamped>(
-          rsTopicRoot + COLOR_CAMERA_TOPIC, 1, DEPTH_PUB_FREQ_HZ);
+          rsTopicRoot + COLOR_CAMERA_TOPIC, 1, COLOR_PUB_FREQ_HZ);
 
   // Listen to depth camera new frame event
   this->newDepthFrameConn = this->depthCam->ConnectNewDepthFrame(