Merge pull request #407 from agri-gaia/cleanup-seerep-ros-comm

Cleanup SEEREP ROS nodes
agri-gaia · Aug 13, 2024 · 88e1e00 · 88e1e00
2 parents 5f87059 + 9a9ffa2
commit 88e1e00
Show file tree

Hide file tree

Showing 21 changed files with 83 additions and 765 deletions.
diff --git a/.devcontainer/.vscode/launch.json b/.devcontainer/.vscode/launch.json
@@ -2,56 +2,25 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "ROS: Launch hdf5dump",
+            "name": "ROS: Rostopic Dumper",
             "type": "ros",
             "request": "launch",
-            "target": "${workspaceFolder}/src/examples/cpp/seerep_ros_communication/launch/hdf5dump.launch",
-            "console": "integratedTerminal"
+            "target": "${workspaceFolder}/src/seerep_ros/seerep_ros_comm/launch/rostopic_dumper.launch"
         },
         {
-            "name": "ROS: Launch querier",
+            "name": "ROS: Rosbag Dumper",
             "type": "ros",
             "request": "launch",
-            "target": "${workspaceFolder}/src/examples/cpp/seerep_ros_communication/launch/querier.launch",
-            "console": "integratedTerminal"
+            "target": "${workspaceFolder}/src/seerep_ros/seerep_ros_comm/launch/rosbag_dumper.launch"
         },
         {
-            "name": "ROS: Launch client",
+            "name": "ROS: Point Dumper",
             "type": "ros",
             "request": "launch",
-            "target": "${workspaceFolder}/src/examples/cpp/seerep_ros_communication/launch/client.launch",
-            "console": "integratedTerminal"
+            "target": "${workspaceFolder}/src/seerep_ros/seerep_ros_comm/point_dumper.launch"
         },
         {
-            "name": "ROS: Launch client imageWithDetection",
-            "type": "ros",
-            "request": "launch",
-            "target": "${workspaceFolder}/src/examples/cpp/seerep_ros_communication/launch/clientImagesWithDetection.launch",
-            "console": "integratedTerminal"
-        },
-        {
-            "name": "ROS: rosbag dumper",
-            "type": "ros",
-            "request": "launch",
-            "target": "${workspaceFolder}/src/examples/cpp/seerep_ros_communication/launch/rosbagDumper.launch",
-            "console": "integratedTerminal"
-        },
-        {
-            "name": "ROS: json point dumper",
-            "type": "ros",
-            "request": "launch",
-            "target": "${workspaceFolder}/src/examples/cpp/seerep_ros_communication/launch/jsonPointDumper.launch",
-            "console": "integratedTerminal"
-        },
-        {
-            "name": "Python: Current File",
-            "type": "python",
-            "request": "launch",
-            "program": "${file}",
-            "console": "integratedTerminal"
-        },
-        {
-            "name": "seerep server",
+            "name": "Seerep Server",
             "type": "cppdbg",
             "request": "launch",
             "program": "${workspaceFolder}/devel/bin/seerep_server",
@@ -71,7 +40,7 @@
             "miDebuggerPath": "/usr/bin/gdb"
         },
         {
-            "name": "seerep test server",
+            "name": "Seerep Test Server",
             "type": "cppdbg",
             "request": "launch",
             "program": "${workspaceFolder}/devel/bin/seerep_server",

diff --git a/...cpp/seerep_ros_communication/include/seerep_ros_communication/clientImagesWithDetection.h b/...cpp/seerep_ros_communication/include/seerep_ros_communication/clientImagesWithDetection.h
diff --git a/examples/cpp/seerep_ros_communication/include/seerep_ros_communication/querier.h b/examples/cpp/seerep_ros_communication/include/seerep_ros_communication/querier.h
diff --git a/examples/cpp/seerep_ros_communication/launch/clientImagesWithDetection.launch b/examples/cpp/seerep_ros_communication/launch/clientImagesWithDetection.launch
diff --git a/examples/cpp/seerep_ros_communication/launch/querier.launch b/examples/cpp/seerep_ros_communication/launch/querier.launch
diff --git a/examples/cpp/seerep_ros_communication/launch/querierFb.launch b/examples/cpp/seerep_ros_communication/launch/querierFb.launch