Hongmei Gou
2018-11-15 16:22:52 UTC
Signed-off-by: Hongmei Gou <***@ti.com>
---
.../files/0002-turtlebot-bringup-minimal-launch.patch | 15 +++++++--------
..._2.5.1.bb => mmwave-ros-autonomous-robotics_3.1.0.bb} | 16 +++++-----------
...kg-master_2.5.1.bb => mmwave-ros-pkg-master_3.1.0.bb} | 8 ++++----
3 files changed, 16 insertions(+), 23 deletions(-)
rename recipes-ros/ros-mmwave/{mmwave-ros-autonomous-robotics_2.5.1.bb => mmwave-ros-autonomous-robotics_3.1.0.bb} (83%)
rename recipes-ros/ros-mmwave/{mmwave-ros-pkg-master_2.5.1.bb => mmwave-ros-pkg-master_3.1.0.bb} (82%)
diff --git a/recipes-ros/ros-mmwave/files/0002-turtlebot-bringup-minimal-launch.patch b/recipes-ros/ros-mmwave/files/0002-turtlebot-bringup-minimal-launch.patch
index e09f750..77feccd 100644
--- a/recipes-ros/ros-mmwave/files/0002-turtlebot-bringup-minimal-launch.patch
+++ b/recipes-ros/ros-mmwave/files/0002-turtlebot-bringup-minimal-launch.patch
@@ -6,17 +6,16 @@
<arg name="base" default="kobuki" doc="mobile base type [create, roomba]"/>
- <arg name="battery" default="$(env TURTLEBOT_BATTERY)" doc="kernel provided locatio for battery info, use /proc/acpi/battery/BAT0 in 2.6 or earlier kernels." />
- <arg name="stacks" default="$(env TURTLEBOT_STACKS)" doc="stack type displayed in visualisation/simulation [circles, hexagons]"/>
-- <arg name="3d_sensor" default="radar" doc="3d sensor types [kinect, asux_xtion_pro, radar]"/>
++ <arg name="stacks" default="hexagons" doc="stack type displayed in visualisation/simulation [circles, hexagons]"/>
+ <arg name="3d_sensor" default="radar" doc="3d sensor types [kinect, asux_xtion_pro, radar]"/>
- <arg name="simulation" default="$(env TURTLEBOT_SIMULATION)" doc="set flags to indicate this turtle is run in simulation mode."/>
- <arg name="serialport" default="$(env TURTLEBOT_SERIAL_PORT)" doc="used by create to configure the port it is connected on [/dev/ttyUSB0, /dev/ttyS0]"/>
-+ <arg name="stacks" default="hexagons" doc="stack type displayed in visualisation/simulation [circles, hexagons]"/>
-+ <arg name="3d_sensor" default="radar" doc="3d sensor types [kinect, asux_xtion_pro, radar]"/>
-+ <arg name="simulation" default="false" doc="set flags to indicate this turtle is run in simulation mode."/>
-+ <arg name="serialport" default="/dev/kobuki" doc="used by create to configure the port it is connected on [/dev/ttyUSB0, /dev/ttyS0]"/>
-
++ <arg name="simulation" default="false" doc="set flags to indicate this turtle is run in simulation mode."/>
++ <arg name="serialport" default="/dev/kobuki" doc="used by create to configure the port it is connected on [/dev/ttyUSB0, /dev/ttyS0]"/>
+ <arg name="mmwave_device" default="1443" doc="TI mmWave sensor device type [1443, 1642, 6843]"/>
+
<param name="/use_sim_time" value="$(arg simulation)"/>
-
-@@ -18,7 +17,4 @@
+@@ -20,7 +19,4 @@
<arg name="base" value="$(arg base)" />
<arg name="serialport" value="$(arg serialport)" />
</include>
diff --git a/recipes-ros/ros-mmwave/mmwave-ros-autonomous-robotics_2.5.1.bb b/recipes-ros/ros-mmwave/mmwave-ros-autonomous-robotics_3.1.0.bb
similarity index 83%
rename from recipes-ros/ros-mmwave/mmwave-ros-autonomous-robotics_2.5.1.bb
rename to recipes-ros/ros-mmwave/mmwave-ros-autonomous-robotics_3.1.0.bb
index 010002f..bfbfaa5 100644
--- a/recipes-ros/ros-mmwave/mmwave-ros-autonomous-robotics_2.5.1.bb
+++ b/recipes-ros/ros-mmwave/mmwave-ros-autonomous-robotics_3.1.0.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "This package contains mmwave autonomous robotics demos"
SECTION = "devel"
LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://docs/Autonomous_Robotics_with_ROS_for_mmWave_manifest.pdf;md5=052cbb2cc0847a82abb159996f974c35"
-SRC_URI[base.md5sum] = "561921297c73a7ead40bf7486ee8f4f9"
-SRC_URI[base.sha256sum] = "768661b88bd31f083660287045dc49a9441d15cf10b0c48e7d29377a23864191"
-SRC_URI = "http://dev.ti.com/tirex/content/mmwave_industrial_toolbox_2_5_1/labs/lab0008-autonomous-robotics-ros/lab0008_autonomous_robotics_ros/ti_mmwave_ros_map_nav_v1p1.gz;name=base;subdir=${P}"
+LIC_FILES_CHKSUM = "file://docs/Autonomous_Robotics_with_ROS_for_mmWave_manifest.pdf;md5=d0fe8e43974f93eb11715ab1a9f58bea"
+SRC_URI[base.md5sum] = "eb8af8e629c365004a6eb4f70464ddc3"
+SRC_URI[base.sha256sum] = "95553c507f27bd8f68eb6a5f4d5cfa4bb3784b9d61f02d21f7c61a86d8186a1f"
+SRC_URI = "http://dev.ti.com/tirex/content/mmwave_industrial_toolbox_3_1_0/labs/lab0008-autonomous-robotics-ros/lab0008_autonomous_robotics_ros/ti_mmwave_ros_map_nav_v1p2.tar.gz;name=base;subdir=${P}"
SRC_URI += "file://0001-turtlebot-bringup-description-launch-xml.patch;patchdir=${WORKDIR}/${P}/turtlebot/turtlebot/turtlebot_bringup \
file://0002-turtlebot-bringup-minimal-launch.patch;patchdir=${WORKDIR}/${P}/turtlebot/turtlebot/turtlebot_bringup \
@@ -16,18 +16,12 @@ SRC_URI += "file://0001-turtlebot-bringup-description-launch-xml.patch;patchdir=
S = "${WORKDIR}/${P}/turtlebot_mmwave_launchers"
-PR = "r3"
+PR = "r0"
inherit catkin
RDEPENDS_${PN} += "bash"
-tar_xf() {
- tar xf ${WORKDIR}/ti_mmwave_ros_map_nav_v1p1 -C ${WORKDIR}/${P}
-}
-
-do_unpack[postfuncs] += "tar_xf"
-
do_install_append() {
install -d ${D}${ros_datadir}/turtlebot_mmwave_launchers
cp -r ${S}/launch ${D}${ros_datadir}/turtlebot_mmwave_launchers
diff --git a/recipes-ros/ros-mmwave/mmwave-ros-pkg-master_2.5.1.bb b/recipes-ros/ros-mmwave/mmwave-ros-pkg-master_3.1.0.bb
similarity index 82%
rename from recipes-ros/ros-mmwave/mmwave-ros-pkg-master_2.5.1.bb
rename to recipes-ros/ros-mmwave/mmwave-ros-pkg-master_3.1.0.bb
index 143dd78..f92b82c 100644
--- a/recipes-ros/ros-mmwave/mmwave-ros-pkg-master_2.5.1.bb
+++ b/recipes-ros/ros-mmwave/mmwave-ros-pkg-master_3.1.0.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "This package contains ROS driver for mmWave TI sensor."
SECTION = "devel"
LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://docs/TI_mmWave_ROS_Driver_manifest.pdf;md5=2f41c03cb07673fdbb8bc449e1d179ae"
-SRC_URI[base.md5sum] = "58594aee8e222ff7b259067ad7da0094"
-SRC_URI[base.sha256sum] = "06a93099e85ef47ad70f96db86a0601ace59512d8cc5c5ea0609285c1497dca1"
-SRC_URI = "http://dev.ti.com/tirex/content/mmwave_industrial_toolbox_2_5_1/labs/lab0006-ros-driver/lab0006_ros_driver_pjt/ti_mmwave_rospkg_v1p4.zip;name=base;subdir=${P}"
+LIC_FILES_CHKSUM = "file://docs/TI_mmWave_ROS_Driver_manifest.pdf;md5=1f2c3f56972fee1e60c320f371c34595"
+SRC_URI[base.md5sum] = "822e5f91acbcfc2b68ba2d440ec9be82"
+SRC_URI[base.sha256sum] = "d4c8d7c204972656096d458938c19d6b3277ef435bbdbb735076d9597d7a880c"
+SRC_URI = "http://dev.ti.com/tirex/content/mmwave_industrial_toolbox_3_1_0/labs/lab0006-ros-driver/lab0006_ros_driver_pjt/ti_mmwave_rospkg_v1p5.zip;name=base;subdir=${P}"
SRC_URI += "file://append_launch \
file://append_cfg \
file://setup.bash \
---
.../files/0002-turtlebot-bringup-minimal-launch.patch | 15 +++++++--------
..._2.5.1.bb => mmwave-ros-autonomous-robotics_3.1.0.bb} | 16 +++++-----------
...kg-master_2.5.1.bb => mmwave-ros-pkg-master_3.1.0.bb} | 8 ++++----
3 files changed, 16 insertions(+), 23 deletions(-)
rename recipes-ros/ros-mmwave/{mmwave-ros-autonomous-robotics_2.5.1.bb => mmwave-ros-autonomous-robotics_3.1.0.bb} (83%)
rename recipes-ros/ros-mmwave/{mmwave-ros-pkg-master_2.5.1.bb => mmwave-ros-pkg-master_3.1.0.bb} (82%)
diff --git a/recipes-ros/ros-mmwave/files/0002-turtlebot-bringup-minimal-launch.patch b/recipes-ros/ros-mmwave/files/0002-turtlebot-bringup-minimal-launch.patch
index e09f750..77feccd 100644
--- a/recipes-ros/ros-mmwave/files/0002-turtlebot-bringup-minimal-launch.patch
+++ b/recipes-ros/ros-mmwave/files/0002-turtlebot-bringup-minimal-launch.patch
@@ -6,17 +6,16 @@
<arg name="base" default="kobuki" doc="mobile base type [create, roomba]"/>
- <arg name="battery" default="$(env TURTLEBOT_BATTERY)" doc="kernel provided locatio for battery info, use /proc/acpi/battery/BAT0 in 2.6 or earlier kernels." />
- <arg name="stacks" default="$(env TURTLEBOT_STACKS)" doc="stack type displayed in visualisation/simulation [circles, hexagons]"/>
-- <arg name="3d_sensor" default="radar" doc="3d sensor types [kinect, asux_xtion_pro, radar]"/>
++ <arg name="stacks" default="hexagons" doc="stack type displayed in visualisation/simulation [circles, hexagons]"/>
+ <arg name="3d_sensor" default="radar" doc="3d sensor types [kinect, asux_xtion_pro, radar]"/>
- <arg name="simulation" default="$(env TURTLEBOT_SIMULATION)" doc="set flags to indicate this turtle is run in simulation mode."/>
- <arg name="serialport" default="$(env TURTLEBOT_SERIAL_PORT)" doc="used by create to configure the port it is connected on [/dev/ttyUSB0, /dev/ttyS0]"/>
-+ <arg name="stacks" default="hexagons" doc="stack type displayed in visualisation/simulation [circles, hexagons]"/>
-+ <arg name="3d_sensor" default="radar" doc="3d sensor types [kinect, asux_xtion_pro, radar]"/>
-+ <arg name="simulation" default="false" doc="set flags to indicate this turtle is run in simulation mode."/>
-+ <arg name="serialport" default="/dev/kobuki" doc="used by create to configure the port it is connected on [/dev/ttyUSB0, /dev/ttyS0]"/>
-
++ <arg name="simulation" default="false" doc="set flags to indicate this turtle is run in simulation mode."/>
++ <arg name="serialport" default="/dev/kobuki" doc="used by create to configure the port it is connected on [/dev/ttyUSB0, /dev/ttyS0]"/>
+ <arg name="mmwave_device" default="1443" doc="TI mmWave sensor device type [1443, 1642, 6843]"/>
+
<param name="/use_sim_time" value="$(arg simulation)"/>
-
-@@ -18,7 +17,4 @@
+@@ -20,7 +19,4 @@
<arg name="base" value="$(arg base)" />
<arg name="serialport" value="$(arg serialport)" />
</include>
diff --git a/recipes-ros/ros-mmwave/mmwave-ros-autonomous-robotics_2.5.1.bb b/recipes-ros/ros-mmwave/mmwave-ros-autonomous-robotics_3.1.0.bb
similarity index 83%
rename from recipes-ros/ros-mmwave/mmwave-ros-autonomous-robotics_2.5.1.bb
rename to recipes-ros/ros-mmwave/mmwave-ros-autonomous-robotics_3.1.0.bb
index 010002f..bfbfaa5 100644
--- a/recipes-ros/ros-mmwave/mmwave-ros-autonomous-robotics_2.5.1.bb
+++ b/recipes-ros/ros-mmwave/mmwave-ros-autonomous-robotics_3.1.0.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "This package contains mmwave autonomous robotics demos"
SECTION = "devel"
LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://docs/Autonomous_Robotics_with_ROS_for_mmWave_manifest.pdf;md5=052cbb2cc0847a82abb159996f974c35"
-SRC_URI[base.md5sum] = "561921297c73a7ead40bf7486ee8f4f9"
-SRC_URI[base.sha256sum] = "768661b88bd31f083660287045dc49a9441d15cf10b0c48e7d29377a23864191"
-SRC_URI = "http://dev.ti.com/tirex/content/mmwave_industrial_toolbox_2_5_1/labs/lab0008-autonomous-robotics-ros/lab0008_autonomous_robotics_ros/ti_mmwave_ros_map_nav_v1p1.gz;name=base;subdir=${P}"
+LIC_FILES_CHKSUM = "file://docs/Autonomous_Robotics_with_ROS_for_mmWave_manifest.pdf;md5=d0fe8e43974f93eb11715ab1a9f58bea"
+SRC_URI[base.md5sum] = "eb8af8e629c365004a6eb4f70464ddc3"
+SRC_URI[base.sha256sum] = "95553c507f27bd8f68eb6a5f4d5cfa4bb3784b9d61f02d21f7c61a86d8186a1f"
+SRC_URI = "http://dev.ti.com/tirex/content/mmwave_industrial_toolbox_3_1_0/labs/lab0008-autonomous-robotics-ros/lab0008_autonomous_robotics_ros/ti_mmwave_ros_map_nav_v1p2.tar.gz;name=base;subdir=${P}"
SRC_URI += "file://0001-turtlebot-bringup-description-launch-xml.patch;patchdir=${WORKDIR}/${P}/turtlebot/turtlebot/turtlebot_bringup \
file://0002-turtlebot-bringup-minimal-launch.patch;patchdir=${WORKDIR}/${P}/turtlebot/turtlebot/turtlebot_bringup \
@@ -16,18 +16,12 @@ SRC_URI += "file://0001-turtlebot-bringup-description-launch-xml.patch;patchdir=
S = "${WORKDIR}/${P}/turtlebot_mmwave_launchers"
-PR = "r3"
+PR = "r0"
inherit catkin
RDEPENDS_${PN} += "bash"
-tar_xf() {
- tar xf ${WORKDIR}/ti_mmwave_ros_map_nav_v1p1 -C ${WORKDIR}/${P}
-}
-
-do_unpack[postfuncs] += "tar_xf"
-
do_install_append() {
install -d ${D}${ros_datadir}/turtlebot_mmwave_launchers
cp -r ${S}/launch ${D}${ros_datadir}/turtlebot_mmwave_launchers
diff --git a/recipes-ros/ros-mmwave/mmwave-ros-pkg-master_2.5.1.bb b/recipes-ros/ros-mmwave/mmwave-ros-pkg-master_3.1.0.bb
similarity index 82%
rename from recipes-ros/ros-mmwave/mmwave-ros-pkg-master_2.5.1.bb
rename to recipes-ros/ros-mmwave/mmwave-ros-pkg-master_3.1.0.bb
index 143dd78..f92b82c 100644
--- a/recipes-ros/ros-mmwave/mmwave-ros-pkg-master_2.5.1.bb
+++ b/recipes-ros/ros-mmwave/mmwave-ros-pkg-master_3.1.0.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "This package contains ROS driver for mmWave TI sensor."
SECTION = "devel"
LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://docs/TI_mmWave_ROS_Driver_manifest.pdf;md5=2f41c03cb07673fdbb8bc449e1d179ae"
-SRC_URI[base.md5sum] = "58594aee8e222ff7b259067ad7da0094"
-SRC_URI[base.sha256sum] = "06a93099e85ef47ad70f96db86a0601ace59512d8cc5c5ea0609285c1497dca1"
-SRC_URI = "http://dev.ti.com/tirex/content/mmwave_industrial_toolbox_2_5_1/labs/lab0006-ros-driver/lab0006_ros_driver_pjt/ti_mmwave_rospkg_v1p4.zip;name=base;subdir=${P}"
+LIC_FILES_CHKSUM = "file://docs/TI_mmWave_ROS_Driver_manifest.pdf;md5=1f2c3f56972fee1e60c320f371c34595"
+SRC_URI[base.md5sum] = "822e5f91acbcfc2b68ba2d440ec9be82"
+SRC_URI[base.sha256sum] = "d4c8d7c204972656096d458938c19d6b3277ef435bbdbb735076d9597d7a880c"
+SRC_URI = "http://dev.ti.com/tirex/content/mmwave_industrial_toolbox_3_1_0/labs/lab0006-ros-driver/lab0006_ros_driver_pjt/ti_mmwave_rospkg_v1p5.zip;name=base;subdir=${P}"
SRC_URI += "file://append_launch \
file://append_cfg \
file://setup.bash \
--
1.9.1
1.9.1