From 788c4bb6c1398bebdf7abbf162bc43ce6ffe9571 Mon Sep 17 00:00:00 2001 From: Anbit Date: Wed, 12 Nov 2025 15:07:36 +0100 Subject: [PATCH 1/3] Add: New service for switching of los methode --- action/LOSGuidance.action | 1 + log/COLCON_IGNORE | 0 log/latest | 1 + log/latest_list | 1 + log/list_2025-11-12_15-03-37/logger_all.log | 19 +++++++++++++++++++ srv/SetLosMode.srv | 6 ++++++ 6 files changed, 28 insertions(+) create mode 100644 log/COLCON_IGNORE create mode 120000 log/latest create mode 120000 log/latest_list create mode 100644 log/list_2025-11-12_15-03-37/logger_all.log create mode 100644 srv/SetLosMode.srv diff --git a/action/LOSGuidance.action b/action/LOSGuidance.action index ae9b695..792320e 100644 --- a/action/LOSGuidance.action +++ b/action/LOSGuidance.action @@ -1,5 +1,6 @@ # Goal geometry_msgs/PointStamped goal +# vortex_msgs/LosActiveMethod method --- # Result diff --git a/log/COLCON_IGNORE b/log/COLCON_IGNORE new file mode 100644 index 0000000..e69de29 diff --git a/log/latest b/log/latest new file mode 120000 index 0000000..1715667 --- /dev/null +++ b/log/latest @@ -0,0 +1 @@ +latest_list \ No newline at end of file diff --git a/log/latest_list b/log/latest_list new file mode 120000 index 0000000..51d297c --- /dev/null +++ b/log/latest_list @@ -0,0 +1 @@ +list_2025-11-12_15-03-37 \ No newline at end of file diff --git a/log/list_2025-11-12_15-03-37/logger_all.log b/log/list_2025-11-12_15-03-37/logger_all.log new file mode 100644 index 0000000..4a295dd --- /dev/null +++ b/log/list_2025-11-12_15-03-37/logger_all.log @@ -0,0 +1,19 @@ +[0.087s] DEBUG:colcon:Command line arguments: ['/usr/bin/colcon', 'list', '-p', '--base-paths', '/home/anbitadhi/ros2_ws/src/vortex-msgs', '--log-base', '/dev/null'] +[0.087s] DEBUG:colcon:Parsed command line arguments: Namespace(log_base=None, log_level=None, verb_name='list', build_base='build', ignore_user_meta=False, metas=['./colcon.meta'], base_paths=['/home/anbitadhi/ros2_ws/src/vortex-msgs', '--log-base', '/dev/null'], packages_ignore=None, packages_ignore_regex=None, paths=None, packages_up_to=None, packages_up_to_regex=None, packages_above=None, packages_above_and_dependencies=None, packages_above_depth=None, packages_select_by_dep=None, packages_skip_by_dep=None, packages_skip_up_to=None, packages_select_build_failed=False, packages_skip_build_finished=False, packages_select_test_failures=False, packages_skip_test_passed=False, packages_select=None, packages_skip=None, packages_select_regex=None, packages_skip_regex=None, packages_start=None, packages_end=None, allow_overriding=[], topological_order=False, names_only=False, paths_only=True, topological_graph=False, topological_graph_dot=False, topological_graph_density=False, topological_graph_legend=False, topological_graph_dot_cluster=False, topological_graph_dot_include_skipped=False, verb_parser=, verb_extension=, main=>) +[0.199s] Level 1:colcon.colcon_core.package_discovery:discover_packages(colcon_meta) check parameters +[0.199s] Level 1:colcon.colcon_core.package_discovery:discover_packages(recursive) check parameters +[0.199s] Level 1:colcon.colcon_core.package_discovery:discover_packages(ignore) check parameters +[0.199s] Level 1:colcon.colcon_core.package_discovery:discover_packages(path) check parameters +[0.199s] Level 1:colcon.colcon_core.package_discovery:discover_packages(recursive) discover +[0.199s] INFO:colcon.colcon_core.package_discovery:Crawling recursively for packages in '/home/anbitadhi/ros2_ws/src/vortex-msgs', '/home/anbitadhi/ros2_ws/src/vortex-msgs/--log-base', '/dev/null' +[0.199s] Level 1:colcon.colcon_core.package_identification:_identify(/home/anbitadhi/ros2_ws/src/vortex-msgs) by extensions ['ignore', 'ignore_ament_install'] +[0.199s] Level 1:colcon.colcon_core.package_identification:_identify(/home/anbitadhi/ros2_ws/src/vortex-msgs) by extension 'ignore' +[0.199s] Level 1:colcon.colcon_core.package_identification:_identify(/home/anbitadhi/ros2_ws/src/vortex-msgs) by extension 'ignore_ament_install' +[0.199s] Level 1:colcon.colcon_core.package_identification:_identify(/home/anbitadhi/ros2_ws/src/vortex-msgs) by extensions ['colcon_pkg'] +[0.199s] Level 1:colcon.colcon_core.package_identification:_identify(/home/anbitadhi/ros2_ws/src/vortex-msgs) by extension 'colcon_pkg' +[0.199s] Level 1:colcon.colcon_core.package_identification:_identify(/home/anbitadhi/ros2_ws/src/vortex-msgs) by extensions ['colcon_meta'] +[0.199s] Level 1:colcon.colcon_core.package_identification:_identify(/home/anbitadhi/ros2_ws/src/vortex-msgs) by extension 'colcon_meta' +[0.199s] Level 1:colcon.colcon_core.package_identification:_identify(/home/anbitadhi/ros2_ws/src/vortex-msgs) by extensions ['ros'] +[0.199s] Level 1:colcon.colcon_core.package_identification:_identify(/home/anbitadhi/ros2_ws/src/vortex-msgs) by extension 'ros' +[0.211s] DEBUG:colcon.colcon_core.package_identification:Package '/home/anbitadhi/ros2_ws/src/vortex-msgs' with type 'ros.ament_cmake' and name 'vortex_msgs' +[0.211s] Level 1:colcon.colcon_core.package_discovery:discover_packages(recursive) using defaults diff --git a/srv/SetLosMode.srv b/srv/SetLosMode.srv new file mode 100644 index 0000000..c5a5b9a --- /dev/null +++ b/srv/SetLosMode.srv @@ -0,0 +1,6 @@ +#request +int8 mode # 0=PROPORTIONAL, 1=INTEGRAL, 2=ADAPTIVE + + --- +#response +bool success \ No newline at end of file From b09b8626d9a6be7ba57e1c94201d31ce86aa4de3 Mon Sep 17 00:00:00 2001 From: Anbit Date: Wed, 12 Nov 2025 16:32:13 +0100 Subject: [PATCH 2/3] Fix: fix syntax and cmake error --- CMakeLists.txt | 1 + srv/SetLosMode.srv | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e061c5..19a5401 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,6 +32,7 @@ set(msg_files set(srv_files "srv/MissionParameters.srv" "srv/Waypoint.srv" + "srv/SetLosMode.srv" ) set(action_files diff --git a/srv/SetLosMode.srv b/srv/SetLosMode.srv index c5a5b9a..c9cf507 100644 --- a/srv/SetLosMode.srv +++ b/srv/SetLosMode.srv @@ -1,6 +1,5 @@ -#request +#request int8 mode # 0=PROPORTIONAL, 1=INTEGRAL, 2=ADAPTIVE - - --- -#response +--- +#response bool success \ No newline at end of file From 20768443705ffdcd93efa946477cee6e5a4a9704 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 12 Nov 2025 16:15:34 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- msg/Landmark.msg | 2 +- srv/SetLosMode.srv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/msg/Landmark.msg b/msg/Landmark.msg index d583b84..d23f7e1 100644 --- a/msg/Landmark.msg +++ b/msg/Landmark.msg @@ -17,4 +17,4 @@ uint16 PIPELINE_END = 4 # Landmark subtype: uint16 ARUCO_BOARD_CAMERA = 1 -uint16 ARUCO_BOARD_SONAR = 2 \ No newline at end of file +uint16 ARUCO_BOARD_SONAR = 2 diff --git a/srv/SetLosMode.srv b/srv/SetLosMode.srv index c9cf507..ccd0ece 100644 --- a/srv/SetLosMode.srv +++ b/srv/SetLosMode.srv @@ -2,4 +2,4 @@ int8 mode # 0=PROPORTIONAL, 1=INTEGRAL, 2=ADAPTIVE --- #response -bool success \ No newline at end of file +bool success