Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
b0307cf
pool exploration package structure
jorgenfj Jan 8, 2026
d4e2a79
change package maintainer
sinaaans Jan 8, 2026
96a97b3
Started OccupancyGrid
sinaaans Jan 9, 2026
c4b69cc
Separated node and map logic
sinaaans Feb 1, 2026
1d5627c
created vortex::pool_exploration namespace
sinaaans Feb 12, 2026
e68fa82
started frame transform map->odom
sinaaans Feb 12, 2026
cbca6c8
Added dependencies
sinaaans Feb 12, 2026
01c2371
created rhoTetaToSegment, started setLineSegmentInMapFrame functions
sinaaans Feb 14, 2026
2017902
Updated dependenices and setup
sinaaans Feb 18, 2026
4aa7652
bresenham algoritm for one line
sinaaans Feb 19, 2026
47af019
added function to set lines in occupancy grid
sinaaans Feb 22, 2026
f542faf
Created functions that checks line intersections requirements
sinaaans Feb 22, 2026
9825c63
docking platform estimate and corner selection
sinaaans Mar 3, 2026
caa18e0
changed variable type in functions to ROS independent
sinaaans Mar 3, 2026
6266b78
created publisher, subscribed, fixed transform logic
sinaaans Mar 3, 2026
6b206af
added dependencies
sinaaans Mar 3, 2026
a5a9261
changed back to 2D message, created service for the docking estimate
sinaaans Mar 4, 2026
520d8f2
added launch and config files
sinaaans Mar 5, 2026
78676ee
reorganized structure
sinaaans Mar 5, 2026
04f8885
fixed parameters, added sonar_frame
sinaaans Mar 5, 2026
cfe49cb
changed .yaml name
sinaaans Mar 5, 2026
60c48c9
reorganized structure
sinaaans Mar 5, 2026
dd49955
added base_link frame, separated grid and waypoint publishing, moved …
sinaaans Mar 5, 2026
87a76ca
added frame
sinaaans Mar 5, 2026
a314daf
Created subscriber to drone position
sinaaans Mar 5, 2026
985921f
separated grid and docking estimate logic, moved comments to .hpp, ch…
sinaaans Mar 7, 2026
1cd11c8
separated grid and docking estimate logic, moved comments to .hpp, ch…
sinaaans Mar 7, 2026
55eae13
changed some names and organized with both grid and docking logic
sinaaans Mar 7, 2026
2a76e74
changed some names and organized with both grid and docking logic
sinaaans Mar 7, 2026
5355c14
separated and commented out grid part of code, made config struct and…
sinaaans Mar 7, 2026
4d1d8cb
switched to vortex_utils drone pos struct
sinaaans Mar 12, 2026
9323ef1
switched to vortex_utils drone pos struct
sinaaans Mar 12, 2026
c66115f
compute_inward_normal instead and better corner estimation
sinaaans Mar 18, 2026
7c7dc13
updated parametrs for testing
sinaaans Mar 18, 2026
05e0ff1
converts from pixel til sonar and created test marker
sinaaans Mar 18, 2026
56fab7e
Added line_filtering package for testing
sinaaans Mar 18, 2026
a7a50fb
Added sonar info
sinaaans Mar 19, 2026
48fc2c1
Merge branch 'main' into 630-task-pool-grid-exploration
vortexuser Mar 19, 2026
1523f90
Merge branch 'main' into 630-task-pool-grid-exploration
vortexuser Mar 19, 2026
d798785
added functions for testing
vortexuser Mar 19, 2026
4c2ed90
switched to SonarIndo struct
sinaaans Mar 22, 2026
ff39ce3
Tests for docking estimate
sinaaans Mar 22, 2026
d7cb784
test for pool grid
sinaaans Mar 22, 2026
ce44708
Create pool grid
sinaaans Mar 22, 2026
f12a674
improved line segment point logic
sinaaans Mar 22, 2026
4da7f04
moved grid functionality
sinaaans Mar 22, 2026
6c56906
name improvements
sinaaans Mar 22, 2026
dfca38f
switched to vortex_utils LineSegment2D
sinaaans Mar 22, 2026
4804fb0
improved corner estimates
sinaaans Mar 22, 2026
4290ce4
new tests
sinaaans Mar 23, 2026
955db39
added variables
sinaaans Mar 23, 2026
fa303ae
corner classification projection coordinate
sinaaans Mar 23, 2026
6e0bd74
added documentation
sinaaans Mar 23, 2026
b08c3eb
name improvements and reorganizing
sinaaans Mar 23, 2026
f3924e8
updated paramters
vortexuser Mar 23, 2026
55395ca
better right wall comparison
vortexuser Mar 23, 2026
3d54b0b
improved parameter setup and organised
vortexuser Mar 23, 2026
d915d47
added documentation
sinaaans Mar 24, 2026
e6bbc9b
updated
sinaaans Mar 24, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions filtering/line_filtering/config/line_filtering.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/**:
ros__parameters:
line_sub_topic: "/line_detection/line_segments"
sonar_info_sub_topic: "/orca/sonar_info"
sonar_info_sub_topic: "/moby/fls/sonar_info"
line_pub_topic: "/filtered_lines"
marker_pub_topic: "/filtered_lines_markers"

target_frame: "odom"
sonar_frame: "Orca/FLS"
target_frame: "moby/odom"
sonar_frame: "moby/sonar_link"

timer_rate_ms: 200

Expand Down
96 changes: 96 additions & 0 deletions mission/tacc/docking_task/pool_exploration/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
cmake_minimum_required(VERSION 3.8)
project(pool_exploration)

if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 20)
endif()

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic)
endif()

# find dependencies
find_package(ament_cmake REQUIRED)
find_package(rclcpp REQUIRED)
find_package(rclcpp_action REQUIRED)
find_package(fmt REQUIRED)
find_package(spdlog REQUIRED)
find_package(geometry_msgs REQUIRED)
find_package(Eigen3 REQUIRED)
find_package(vortex_msgs REQUIRED)
find_package(vortex_utils REQUIRED)
find_package(vortex_utils_ros REQUIRED)
find_package(nav_msgs REQUIRED)
find_package(rclcpp_components REQUIRED)
find_package(tf2_geometry_msgs REQUIRED)
find_package(tf2_eigen REQUIRED)
find_package(message_filters REQUIRED)
find_package(visualization_msgs)
# uncomment the following section in order to fill in
# further dependencies manually.
# find_package(<dependency> REQUIRED)

include_directories(include)

install(DIRECTORY
config
launch
DESTINATION share/${PROJECT_NAME}/
)

set(LIB_NAME ${PROJECT_NAME}_lib)
add_library(${LIB_NAME} SHARED
src/pool_exploration.cpp
src/pool_exploration_ros.cpp
)

ament_target_dependencies(${LIB_NAME} PUBLIC
rclcpp
rclcpp_components
rclcpp_action
tf2_geometry_msgs
tf2_eigen
geometry_msgs
vortex_msgs
nav_msgs
vortex_utils
vortex_utils_ros
Eigen3
spdlog
fmt
message_filters
#for testing:
visualization_msgs
)

rclcpp_components_register_node(
${LIB_NAME}
PLUGIN "PoolExplorationNode"
EXECUTABLE ${PROJECT_NAME}_node
)

ament_export_targets(export_${LIB_NAME})

install(TARGETS ${LIB_NAME}
EXPORT export_${LIB_NAME}
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin
)

install(
DIRECTORY include/
DESTINATION include
)

install(DIRECTORY
launch
config
DESTINATION share/${PROJECT_NAME}/
)

if(BUILD_TESTING)
add_subdirectory(test)
endif()

ament_package()
6 changes: 6 additions & 0 deletions mission/tacc/docking_task/pool_exploration/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
colcon build --packages-up-to pool_exploration --symlink-install --cmake-args -DCMAKE_EXPORT_COMPILE_COMMANDS=1


Utvide til venstre hjørne også

Evt filtrere ut doble linjer tidligere
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/**:
ros__parameters:
# Topics
line_sub_topic: "/line_detection/line_segments"
pose_sub_topic: "/pose"
sonar_info_sub_topic: "/moby/fls/sonar_info"
debug_topic: "/debug"

# Publish
publish_rate_ms: 200

# Frames / TF
odom_frame: "moby/odom"
base_frame: "moby/base_link"
sonar_frame: "moby/sonar_link"

# Corner/docking params
min_wall_distance_m: 0.5
max_wall_distance_m: 10.0

far_wall_heading_angle_threshold: 1.6 # gammel?
parallel_heading_angle_threshold_rad: 0.4
perpendicular_heading_angle_threshold_rad: 1.35

min_corner_angle_rad: 1.50
max_corner_angle_rad: 1.70
right_wall_offset_m: 2.5 #flytter langs høyre veggen
far_wall_offset_m: 4.0 #flytter langs far wall

right_wall_max_y_m: 0.4
far_wall_min_x_m: 0.5

right_dist: -0.1 # ENDRE NAVN ?
choose_right_corner: 1

# Waypoint
switching_threshold: 0.5
overwrite_prior_waypoints: true
take_priority: true

# FOR MAP LOGIC
map_pub_topic: "/map"
map_frame: "map"

# Map / grid
size_x: 1000.0
size_y: 1000.0
resolution: 0.1
frame_id: "map"

# Map cells
unknown_cell: -1
occupied_cell: 100

enu_to_ned: false
Loading
Loading