Skip to content

Commit 3928062

Browse files
authored
Merge pull request #6 from Blenders-FC/yolo11
Merge updated yolo11 vision
2 parents af97dc4 + 4985b3d commit 3928062

20 files changed

+353
-409
lines changed

CMakeLists.txt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ find_package(catkin REQUIRED COMPONENTS
1111
roscpp
1212
rospy
1313
std_msgs
14+
message_generation
1415
)
1516

1617
## System dependencies are found with CMake's conventions
@@ -47,11 +48,10 @@ find_package(catkin REQUIRED COMPONENTS
4748
## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...)
4849

4950
## Generate messages in the 'msg' folder
50-
# add_message_files(
51-
# FILES
52-
# Message1.msg
53-
# Message2.msg
54-
# )
51+
add_message_files(
52+
FILES
53+
referee.msg
54+
)
5555

5656
## Generate services in the 'srv' folder
5757
# add_service_files(
@@ -68,10 +68,10 @@ find_package(catkin REQUIRED COMPONENTS
6868
# )
6969

7070
## Generate added messages and services with any dependencies listed here
71-
# generate_messages(
72-
# DEPENDENCIES
73-
# std_msgs
74-
# )
71+
generate_messages(
72+
DEPENDENCIES
73+
std_msgs
74+
)
7575

7676
################################################
7777
## Declare ROS dynamic reconfigure parameters ##
@@ -107,6 +107,7 @@ catkin_package(
107107
# LIBRARIES vision_pkg
108108
# CATKIN_DEPENDS roscpp rospy std_msgs
109109
# DEPENDS system_lib
110+
CATKIN_DEPENDS message_runtime std_msgs
110111
)
111112

112113
###########

launch/vision.launch

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,19 @@
22
<launch>
33

44
<!-- Define robot_id with a default value (used if not inherited) -->
5-
<arg name="robot_id" default="1"/>
5+
<arg name="robot_id" default="4"/>
66
<param name="robot_id" value="$(arg robot_id)"/>
77

88
<!-- Camera Node -->
9-
<node pkg="usb_cam" type="usb_cam_node" name="usb_cam_node" output="screen"/>
9+
<!-- <node pkg="usb_cam" type="usb_cam_node" name="usb_cam_node" output="screen"/> -->
1010

1111
<!-- Vision Node -->
12-
<node pkg="vision_pkg" type="main_vision_node.py" name="main_vision_node" output="screen">
13-
<param name="robot_id" value="1"/>
14-
</node>
12+
<node pkg="vision_pkg" type="main_vision_node.py" name="main_vision_node" output="screen"/>
13+
<!-- <param name="robot_id" value="4"/>
14+
</node> -->
15+
16+
<!-- Referee Node -->
17+
<node pkg="vision_pkg" type="referee_node.py" name="referee_node" output="screen"/>
18+
1519

1620
</launch>

models/best-nv2-62.engine

6.88 MB
Binary file not shown.

models/best-nv2-62.onnx

10 MB
Binary file not shown.

models/best-nv2-62.pt

5.2 MB
Binary file not shown.

models/best-rhoban-v1.engine

6.97 MB
Binary file not shown.

models/best-rhoban-v1.onnx

10 MB
Binary file not shown.

models/best-rhoban-v1.pt

5.19 MB
Binary file not shown.

models/rhoban-v6.engine

6.97 MB
Binary file not shown.

models/rhoban-v6.onnx

10 MB
Binary file not shown.

0 commit comments

Comments
 (0)