restructured tutorial package and launch file added

LCAS · Oct 2, 2024 · 7fa8211 · 7fa8211
1 parent b6435bd
commit 7fa8211
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 0 deletions.
diff --git a/src/.keep b/src/.keep
diff --git a/rob2002_tutorial/LICENSE → src/rob2002_tutorial/LICENSE b/rob2002_tutorial/LICENSE → src/rob2002_tutorial/LICENSE
diff --git a/src/rob2002_tutorial/launch/detect_count.launch.py b/src/rob2002_tutorial/launch/detect_count.launch.py
@@ -0,0 +1,24 @@
+from launch import LaunchDescription
+from launch_ros.actions import Node
+
+def generate_launch_description():
+    ld = LaunchDescription()
+
+    detector_node = Node(
+            package='rob2002_tutorial',
+            executable='detector_basic',
+            output='screen',
+            emulate_tty=True,
+        )
+
+    counter_node = Node(
+            package='rob2002_tutorial',
+            executable='counter_basic',
+            output='screen',
+            emulate_tty=True,
+        )
+
+    ld.add_action(detector_node)
+    ld.add_action(counter_node)
+
+    return ld
diff --git a/rob2002_tutorial/package.xml → src/rob2002_tutorial/package.xml b/rob2002_tutorial/package.xml → src/rob2002_tutorial/package.xml
@@ -12,6 +12,7 @@
   <exec_depend>geometry_msgs</exec_depend>
   <exec_depend>sensor_msgs</exec_depend>
   <exec_depend>cv_bridge</exec_depend>
+  <exec_depend>ros2launch</exec_depend>
 
   <test_depend>ament_copyright</test_depend>
   <test_depend>ament_flake8</test_depend>

diff --git a/rob2002_tutorial/resource/rob2002_tutorial → ...ob2002_tutorial/resource/rob2002_tutorial b/rob2002_tutorial/resource/rob2002_tutorial → ...ob2002_tutorial/resource/rob2002_tutorial
diff --git a/...002_tutorial/rob2002_tutorial/__init__.py → ...002_tutorial/rob2002_tutorial/__init__.py b/...002_tutorial/rob2002_tutorial/__init__.py → ...002_tutorial/rob2002_tutorial/__init__.py
diff --git a/...utorial/rob2002_tutorial/counter_basic.py → ...utorial/rob2002_tutorial/counter_basic.py b/...utorial/rob2002_tutorial/counter_basic.py → ...utorial/rob2002_tutorial/counter_basic.py
diff --git a/...torial/rob2002_tutorial/detector_basic.py → ...torial/rob2002_tutorial/detector_basic.py b/...torial/rob2002_tutorial/detector_basic.py → ...torial/rob2002_tutorial/detector_basic.py
diff --git a/..._tutorial/rob2002_tutorial/mover_basic.py → ..._tutorial/rob2002_tutorial/mover_basic.py b/..._tutorial/rob2002_tutorial/mover_basic.py → ..._tutorial/rob2002_tutorial/mover_basic.py
diff --git a/..._tutorial/rob2002_tutorial/mover_laser.py → ..._tutorial/rob2002_tutorial/mover_laser.py b/..._tutorial/rob2002_tutorial/mover_laser.py → ..._tutorial/rob2002_tutorial/mover_laser.py
diff --git a/rob2002_tutorial/setup.cfg → src/rob2002_tutorial/setup.cfg b/rob2002_tutorial/setup.cfg → src/rob2002_tutorial/setup.cfg
diff --git a/rob2002_tutorial/setup.py → src/rob2002_tutorial/setup.py b/rob2002_tutorial/setup.py → src/rob2002_tutorial/setup.py
@@ -1,4 +1,6 @@
 from setuptools import find_packages, setup
+import os
+from glob import glob
 
 package_name = 'rob2002_tutorial'
 
@@ -10,6 +12,7 @@
         ('share/ament_index/resource_index/packages',
             ['resource/' + package_name]),
         ('share/' + package_name, ['package.xml']),
+        (os.path.join('share', package_name), glob('launch/*launch.py')),
     ],
     install_requires=['setuptools'],
     zip_safe=True,

diff --git a/rob2002_tutorial/test/test_copyright.py → src/rob2002_tutorial/test/test_copyright.py b/rob2002_tutorial/test/test_copyright.py → src/rob2002_tutorial/test/test_copyright.py
diff --git a/rob2002_tutorial/test/test_flake8.py → src/rob2002_tutorial/test/test_flake8.py b/rob2002_tutorial/test/test_flake8.py → src/rob2002_tutorial/test/test_flake8.py
diff --git a/rob2002_tutorial/test/test_pep257.py → src/rob2002_tutorial/test/test_pep257.py b/rob2002_tutorial/test/test_pep257.py → src/rob2002_tutorial/test/test_pep257.py