Merge pull request opencv#9 from skalldri/master

Stuart Alldritt · web-flow · commit 76b07050da64 · 2019-06-21T11:58:25.000-07:00
Rename repo to match ROS naming convention
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Licensed under the MIT License.
 
 cmake_minimum_required(VERSION 2.8.3)
-project(azure-kinect-ros-driver LANGUAGES C CXX)
+project(azure_kinect_ros_driver LANGUAGES C CXX)
 
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -29,10 +29,10 @@ Enhancements. Also check for Closed Issues before opening a new one.
 
 ## Finding issues you can help with
 
-Looking for something to work on? Issues marked [``Good First Issue``](https://github.com/microsoft/Azure-Kinect-ROS-Driver/labels/good%20first%20issue) 
+Looking for something to work on? Issues marked [``Good First Issue``](https://github.com/microsoft/Azure_Kinect_ROS_Driver/labels/good%20first%20issue) 
 are a good place to start.
 
-You can also check the [``Help Wanted``](https://github.com/microsoft/Azure-Kinect-ROS-Driver/labels/help%20wanted) tag to 
+You can also check the [``Help Wanted``](https://github.com/microsoft/Azure_Kinect_ROS_Driver/labels/help%20wanted) tag to 
 find other issues to help with. If you're interested in working on a fix, leave a comment to let everyone know and to help 
 avoid duplicated effort from others.
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-name: Azure-Kinect-ROS-Driver-$(SourceBranchName)-$(Date:yyyyMMdd)-$(Rev:rrr)
+name: Azure_Kinect_ROS_Driver-$(SourceBranchName)-$(Date:yyyyMMdd)-$(Rev:rrr)
 
 trigger:
   batch: false
diff --git a/include/azure_kinect_ros_driver/k4a_calibration_transform_data.h b/include/azure_kinect_ros_driver/k4a_calibration_transform_data.h
diff --git a/include/azure_kinect_ros_driver/k4a_ros_bridge_nodelet.h b/include/azure_kinect_ros_driver/k4a_ros_bridge_nodelet.h
@@ -14,7 +14,7 @@
 
 // Project headers
 //
-#include "azure-kinect-ros-driver/k4a_ros_device.h"
+#include "azure_kinect_ros_driver/k4a_ros_device.h"
 
 namespace Azure_Kinect_ROS_Driver
 {
diff --git a/include/azure_kinect_ros_driver/k4a_ros_device.h b/include/azure_kinect_ros_driver/k4a_ros_device.h
@@ -22,8 +22,8 @@
 
 // Project headers
 //
-#include "azure-kinect-ros-driver/k4a_ros_device_params.h"
-#include "azure-kinect-ros-driver/k4a_calibration_transform_data.h"
+#include "azure_kinect_ros_driver/k4a_ros_device_params.h"
+#include "azure_kinect_ros_driver/k4a_calibration_transform_data.h"
 
 class K4AROSDevice
 {
diff --git a/include/azure_kinect_ros_driver/k4a_ros_device_params.h b/include/azure_kinect_ros_driver/k4a_ros_device_params.h
diff --git a/include/azure_kinect_ros_driver/k4a_ros_types.h b/include/azure_kinect_ros_driver/k4a_ros_types.h
diff --git a/launch/driver.launch b/launch/driver.launch
@@ -8,7 +8,7 @@
   <arg name="rgb_point_cloud"   default="true" />           <!-- Colorize the point cloud using the RBG camera. Requires color_enabled and depth_enabled -->
   <arg name="required"         default="false" />          <!-- Argument which specified if the entire launch file should terminate if the node dies -->
 
-  <node pkg="azure-kinect-ros-driver" type="node" name="node" output="screen" required="$(arg required)">
+  <node pkg="azure_kinect_ros_driver" type="node" name="node" output="screen" required="$(arg required)">
     <param name="depth_enabled"     type="bool"   value="$(arg depth_enabled)" /> 
     <param name="depth_mode"        type="string" value="$(arg depth_mode)" /> 
     <param name="color_enabled"     type="bool"   value="$(arg color_enabled)" /> 
diff --git a/launch/slam_rtabmap.launch b/launch/slam_rtabmap.launch
@@ -3,7 +3,7 @@
   <group ns="k4a" >
 
     <!-- TODO: move into a nodelet and combine with image_proc nodelet -->
-    <include file="$(find azure-kinect-ros-driver)/launch/driver.launch" >
+    <include file="$(find azure_kinect_ros_driver)/launch/driver.launch" >
       <arg name="depth_enabled"     value="true" />
       <arg name="depth_mode"        value="NFOV_UNBINNED" />
       <arg name="color_enabled"     value="true" />
diff --git a/nodelet_plugins.xml b/nodelet_plugins.xml
@@ -1,5 +1,5 @@
-<library path="lib/libazure-kinect-ros-driver_nodelet">
-  <class name="Azure-Kinect-ROS-Driver/K4AROSBridgeNodelet" type="Azure_Kinect_ROS_Driver::K4AROSBridgeNodelet" base_class_type="nodelet::Nodelet">
+<library path="lib/libazure_kinect_ros_driver_nodelet">
+  <class name="Azure_Kinect_ROS_Driver/K4AROSBridgeNodelet" type="Azure_Kinect_ROS_Driver::K4AROSBridgeNodelet" base_class_type="nodelet::Nodelet">
   <description>
     A nodelet version of the Azure Kinect ROS Driver.
   </description>
diff --git a/package.xml b/package.xml
@@ -4,7 +4,7 @@
  Licensed under the MIT License.
  -->
 <package format="2">
-  <name>azure-kinect-ros-driver</name>
+  <name>azure_kinect_ros_driver</name>
   <version>0.9.0</version>
   <description>The Azure Kinect Sensor Driver for ROS.</description>
   <maintainer email="stalldri@microsoft.com">Stuart Alldritt</maintainer>
diff --git a/src/k4a_calibration_transform_data.cpp b/src/k4a_calibration_transform_data.cpp
@@ -3,7 +3,7 @@
 
 // Associated header
 //
-#include "azure-kinect-ros-driver/k4a_calibration_transform_data.h"
+#include "azure_kinect_ros_driver/k4a_calibration_transform_data.h"
 
 // System headers
 //
@@ -16,7 +16,7 @@
 
 // Project headers
 //
-#include "azure-kinect-ros-driver/k4a_ros_types.h"
+#include "azure_kinect_ros_driver/k4a_ros_types.h"
 
 void K4ACalibrationTransformData::initialize(const k4a::device &device,
                                                      const k4a_depth_mode_t depth_mode,
diff --git a/src/k4a_ros_bridge_node.cpp b/src/k4a_ros_bridge_node.cpp
@@ -12,7 +12,7 @@
 
 // Project headers
 //
-#include "azure-kinect-ros-driver/k4a_ros_device.h"
+#include "azure_kinect_ros_driver/k4a_ros_device.h"
 
 int main(int argc, char **argv)
 {
diff --git a/src/k4a_ros_bridge_nodelet.cpp b/src/k4a_ros_bridge_nodelet.cpp
@@ -3,7 +3,7 @@
 
 // Associated header
 //
-#include "azure-kinect-ros-driver/k4a_ros_bridge_nodelet.h"
+#include "azure_kinect_ros_driver/k4a_ros_bridge_nodelet.h"
 
 // System headers
 //
@@ -34,7 +34,7 @@ namespace Azure_Kinect_ROS_Driver
     {
         NODELET_INFO("K4A ROS Nodelet Start");
 
-        /*k4a_device = std::unique_ptr<K4AROSDevice>(new K4AROSDevice(getNodeHandle(), getPrivateNodeHandle()));
+        k4a_device = std::unique_ptr<K4AROSDevice>(new K4AROSDevice(getNodeHandle(), getPrivateNodeHandle()));
 
         if (k4a_device->startCameras() !=  K4A_RESULT_SUCCEEDED)
         {
@@ -50,6 +50,6 @@ namespace Azure_Kinect_ROS_Driver
             throw nodelet::Exception("Could not start K4A_ROS_Device!");
         }
 
-        NODELET_INFO("IMU started");*/
+        NODELET_INFO("IMU started");
     }
 }
diff --git a/src/k4a_ros_device.cpp b/src/k4a_ros_device.cpp
@@ -3,7 +3,7 @@
 
 // Associated header
 //
-#include "azure-kinect-ros-driver/k4a_ros_device.h"
+#include "azure_kinect_ros_driver/k4a_ros_device.h"
 
 // System headers
 //
@@ -20,7 +20,7 @@
 
 // Project headers
 //
-#include "azure-kinect-ros-driver/k4a_ros_types.h"
+#include "azure_kinect_ros_driver/k4a_ros_types.h"
 
 using namespace ros;
 using namespace sensor_msgs;
diff --git a/src/k4a_ros_device_params.cpp b/src/k4a_ros_device_params.cpp
@@ -3,7 +3,7 @@
 
 // Associated header
 //
-#include "azure-kinect-ros-driver/k4a_ros_device_params.h"
+#include "azure_kinect_ros_driver/k4a_ros_device_params.h"
 
 // System headers
 //

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`// Project headers`
`16`	`16`	`//`
`17`		`-#include "azure-kinect-ros-driver/k4a_ros_device.h"`
	`17`	`+#include "azure_kinect_ros_driver/k4a_ros_device.h"`
`18`	`18`
`19`	`19`	`namespace Azure_Kinect_ROS_Driver`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@`
`22`	`22`
`23`	`23`	`// Project headers`
`24`	`24`	`//`
`25`		`-#include "azure-kinect-ros-driver/k4a_ros_device_params.h"`
`26`		`-#include "azure-kinect-ros-driver/k4a_calibration_transform_data.h"`
	`25`	`+#include "azure_kinect_ros_driver/k4a_ros_device_params.h"`
	`26`	`+#include "azure_kinect_ros_driver/k4a_calibration_transform_data.h"`
`27`	`27`
`28`	`28`	`class K4AROSDevice`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`// Project headers`
`14`	`14`	`//`
`15`		`-#include "azure-kinect-ros-driver/k4a_ros_device.h"`
	`15`	`+#include "azure_kinect_ros_driver/k4a_ros_device.h"`
`16`	`16`
`17`	`17`	`int main(int argc, char **argv)`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`// Associated header`
`5`	`5`	`//`
`6`		`-#include "azure-kinect-ros-driver/k4a_ros_bridge_nodelet.h"`
	`6`	`+#include "azure_kinect_ros_driver/k4a_ros_bridge_nodelet.h"`
`7`	`7`
`8`	`8`	`// System headers`
`9`	`9`	`//`
`@@ -34,7 +34,7 @@ namespace Azure_Kinect_ROS_Driver`
`34`	`34`	`{`
`35`	`35`	`NODELET_INFO("K4A ROS Nodelet Start");`
`36`	`36`
`37`		`- /*k4a_device = std::unique_ptr<K4AROSDevice>(new K4AROSDevice(getNodeHandle(), getPrivateNodeHandle()));`
	`37`	`+ k4a_device = std::unique_ptr<K4AROSDevice>(new K4AROSDevice(getNodeHandle(), getPrivateNodeHandle()));`
`38`	`38`
`39`	`39`	`if (k4a_device->startCameras() != K4A_RESULT_SUCCEEDED)`
`40`	`40`	`{`
`@@ -50,6 +50,6 @@ namespace Azure_Kinect_ROS_Driver`
`50`	`50`	`throw nodelet::Exception("Could not start K4A_ROS_Device!");`
`51`	`51`	`}`
`52`	`52`
`53`		`- NODELET_INFO("IMU started");*/`
	`53`	`+ NODELET_INFO("IMU started");`
`54`	`54`	`}`
`55`	`55`	`}`