Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/bringup_pkg/launch/scout_cctv_nav2.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def generate_launch_description():

nav2_launch = os.path.join(nav2_share, 'launch', 'bringup_launch.py')
default_nav2_params = os.path.join(package_share, 'config', 'nav2_params_cctv.yaml')
default_map = os.path.join(package_share, 'maps', 'scout_mini_map_3.yaml')
default_map = os.path.join(package_share, 'maps', 'map.yaml')

return LaunchDescription([
DeclareLaunchArgument(
Expand Down
Binary file not shown.
7 changes: 7 additions & 0 deletions src/bringup_pkg/maps/map.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
image: map.pgm
mode: trinary
resolution: 0.05
origin: [-40.2, -37.7, 0]
negate: 0
occupied_thresh: 0.65
free_thresh: 0.25
5 changes: 0 additions & 5 deletions src/bringup_pkg/maps/scout_mini_map.pgm

This file was deleted.

7 changes: 0 additions & 7 deletions src/bringup_pkg/maps/scout_mini_map.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions src/bringup_pkg/maps/scout_mini_map_2.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions src/bringup_pkg/maps/scout_mini_map_3.pgm

This file was deleted.

7 changes: 0 additions & 7 deletions src/bringup_pkg/maps/scout_mini_map_3.yaml

This file was deleted.

12 changes: 12 additions & 0 deletions src/perception_pkg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,24 @@ install(PROGRAMS
RENAME yolo_detector_node
)

install(PROGRAMS
scripts/cctv_pose_node.py
DESTINATION lib/${PROJECT_NAME}
RENAME cctv_pose_node
)

install(PROGRAMS
scripts/cctv_to_map_node.py
DESTINATION lib/${PROJECT_NAME}
RENAME cctv_to_map
)

install(PROGRAMS
scripts/person_direction_node
DESTINATION lib/${PROJECT_NAME}
RENAME person_direction_node
)

install(PROGRAMS
scripts/pixel_picker_node.py
DESTINATION lib/${PROJECT_NAME}
Expand Down
36 changes: 20 additions & 16 deletions src/perception_pkg/config/cctv_to_map.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,27 @@ cctv_to_map:
source_name: "CCTV"
image_points:
[
441.0, 366.0,
583.0, 200.0,
622.0, 152.0,
440.0, 157.0,
306.0, 163.0,
208.0, 199.0,
84.0, 243.0,
101.0, 411.0,
591.0, 158.0,
553.0, 170.0,
615.0, 196.0,
509.0, 225.0,
598.0, 324.0,
479.0, 408.0,
340.0, 334.0,
180.0, 386.0,
157.0, 294.0,
50.0, 304.0,
]
map_points: # METERS in map frame (NOT image pixels)
[
0.50, 0.30,
1.20, 0.90,
1.80, 1.40,
1.10, 1.60,
0.40, 1.55,
-0.20, 1.10,
-0.70, 0.60,
-0.60, -0.10,
26.111, -1.849,
25.512, -4.229,
26.567, -6.492,
25.334, -9.291,
26.394, -12.259,
25.879, -14.008,
24.602, -13.670,
23.980, -14.808,
22.777, -13.670,
22.205, -14.244,
]
13 changes: 13 additions & 0 deletions src/perception_pkg/launch/cctv_to_map.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,25 @@ def generate_launch_description():
output="screen",
parameters=[yolo_params],
),
Node(
package="perception_pkg",
executable="cctv_pose_node",
name="cctv_pose_node",
output="screen",
),
Node(
package="perception_pkg",
executable="cctv_to_map",
name="cctv_to_map",
output="screen",
parameters=[cctv_to_map_params],
),
Node(
package="perception_pkg",
executable="person_direction_node",
name="person_direction_node",
output="screen",
parameters=[cctv_to_map_params],
),
]
)
Binary file modified src/perception_pkg/resource/best.pt
Binary file not shown.
Binary file added src/perception_pkg/resource/yolov8n-pose.pt
Binary file not shown.
Empty file.
Loading