From 8cd727ccf60dcb1f07b898c4878bae39fedf9823 Mon Sep 17 00:00:00 2001 From: "jie.xiao" Date: Tue, 3 Jul 2018 11:39:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E5=BA=93=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3=E5=8F=8A=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/install.sh | 8 ++++---- .../camera/ros_astra_camera/ros/astra_camera_nodelet.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/install.sh b/doc/install.sh index 62e746e..4032780 100755 --- a/doc/install.sh +++ b/doc/install.sh @@ -8,10 +8,10 @@ sudo udevadm trigger echo 'Installing required libs' sudo apt-get update -sudo apt-get install ros-indigo-ecl ros-indigo-ecl-threads ros-indigo-rgbd-launch -sudo apt-get install ros-indigo-image-common -sudo apt-get install ros-indigo-move-base-* -sudo apt-get install ros-indigo-depthimage-to-laserscan ros-indigo-map-server ros-indigo-amcl ros-indigo-gmapping ros-indigo-navigation* +sudo apt-get install ros-melodic-ecl ros-melodic-ecl-threads ros-melodic-rgbd-launch +sudo apt-get install ros-melodic-image-common +sudo apt-get install ros-melodic-move-base-* +sudo apt-get install ros-melodic-depthimage-to-laserscan ros-melodic-map-server ros-melodic-amcl ros-melodic-gmapping ros-melodic-navigation* sudo apt-get install libasound2-dev mplayer echo 'Spark driver is installed' diff --git a/spark_v05/spark_driver/camera/ros_astra_camera/ros/astra_camera_nodelet.cpp b/spark_v05/spark_driver/camera/ros_astra_camera/ros/astra_camera_nodelet.cpp index c1b9262..504e7da 100644 --- a/spark_v05/spark_driver/camera/ros_astra_camera/ros/astra_camera_nodelet.cpp +++ b/spark_v05/spark_driver/camera/ros_astra_camera/ros/astra_camera_nodelet.cpp @@ -55,4 +55,4 @@ class AstraDriverNodelet : public nodelet::Nodelet } #include -PLUGINLIB_DECLARE_CLASS(astra_camera, AstraDriverNodelet, astra_camera::AstraDriverNodelet, nodelet::Nodelet); +PLUGINLIB_EXPORT_CLASS(astra_camera::AstraDriverNodelet, nodelet::Nodelet); From e7fd1d37ae29946aecb361c8348c371c62f91474 Mon Sep 17 00:00:00 2001 From: "jie.xiao" Date: Tue, 3 Jul 2018 13:55:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9urdf=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=AF=94=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spark_description/urdf/base/spark_base.urdf | 12 ++++++------ .../spark_description/urdf/sensors/spark_camera.urdf | 4 ++-- .../spark_description/urdf/stack/spark_stack.urdf | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spark_v05/spark/spark_description/urdf/base/spark_base.urdf b/spark_v05/spark/spark_description/urdf/base/spark_base.urdf index b4db112..af0eda7 100644 --- a/spark_v05/spark/spark_description/urdf/base/spark_base.urdf +++ b/spark_v05/spark/spark_description/urdf/base/spark_base.urdf @@ -38,7 +38,7 @@ rpy="0 0 0" /> + filename="package://spark_description/meshes/spark/base/spark_base.DAE" scale="0.001 0.001 0.001" /> @@ -48,7 +48,7 @@ rpy="0 0 0" /> + filename="package://spark_description/meshes/spark/base/spark_base.DAE" scale="0.001 0.001 0.001" /> @@ -82,7 +82,7 @@ rpy="0 0 0" /> + filename="package://spark_description/meshes/spark/base/left_wheel.DAE" scale="0.001 0.001 0.001" /> @@ -92,7 +92,7 @@ rpy="0 0 0" /> + filename="package://spark_description/meshes/spark/base/left_wheel.DAE" scale="0.001 0.001 0.001" /> @@ -127,7 +127,7 @@ rpy="0 0 0" /> + filename="package://spark_description/meshes/spark/base/right_wheel.DAE" scale="0.001 0.001 0.001" /> @@ -137,7 +137,7 @@ rpy="0 0 0" /> + filename="package://spark_description/meshes/spark/base/right_wheel.DAE" scale="0.001 0.001 0.001" /> diff --git a/spark_v05/spark/spark_description/urdf/sensors/spark_camera.urdf b/spark_v05/spark/spark_description/urdf/sensors/spark_camera.urdf index 73d71aa..f6b1a74 100644 --- a/spark_v05/spark/spark_description/urdf/sensors/spark_camera.urdf +++ b/spark_v05/spark/spark_description/urdf/sensors/spark_camera.urdf @@ -26,7 +26,7 @@ xyz="0 0 0" rpy="0 0 0" /> - + @@ -34,7 +34,7 @@ xyz="0 0 0" rpy="0 0 0" /> - + diff --git a/spark_v05/spark/spark_description/urdf/stack/spark_stack.urdf b/spark_v05/spark/spark_description/urdf/stack/spark_stack.urdf index 0722d8c..057fea1 100644 --- a/spark_v05/spark/spark_description/urdf/stack/spark_stack.urdf +++ b/spark_v05/spark/spark_description/urdf/stack/spark_stack.urdf @@ -27,7 +27,7 @@ xyz="0 0 0" rpy="0 0 0" /> - + @@ -36,7 +36,7 @@ xyz="0 0 0" rpy="0 0 0" /> - + From 32c14468e4a14f35ad312258f9e6af40d0a08df5 Mon Sep 17 00:00:00 2001 From: "jie.xiao" Date: Tue, 3 Jul 2018 13:59:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=E6=96=87=E6=A1=A3=EF=BC=88=E5=AE=89=E8=A3=85=E6=AD=A5=E9=AA=A4?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 00a8ae8..91e8137 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ This repository contains the ROS wrapper of Sparks's driver plus various ROS app ### Prequirement -* System: Ubantu 14.04 -* ROS Version: Indigo(Desktop-Full Install) +* System: Ubantu 18.04 +* ROS Version: Melodic(Desktop-Full Install) ### Compile @@ -36,7 +36,7 @@ mkdir -p sparkws/src cd sparkws/src git clone https://github.com/NXROBO/spark.git cd spark -git checkout spark-05 +git checkout melodic-devel #install dependence package cd ../..