BRSRI/bellande_humanoid_robot_intelligence_control_system_architecture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed the package name from ball_detector to op3_ball_detector

Browse Source
This commit is contained in:
Kayman
2018-04-18 11:32:12 +09:00
parent 1c1871ec43
commit 454128b199
28 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
op3_demo/CMakeLists.txt
View File

@ -18,7 +18,7 @@ find_package(catkin REQUIRED COMPONENTS
op3_action_module_msgs
cmake_modules
robotis_math
ball_detector
op3_ball_detector
)
find_package(Boost REQUIRED COMPONENTS thread)
@ -71,7 +71,7 @@ catkin_package(
op3_action_module_msgs
cmake_modules
robotis_math
ball_detector
op3_ball_detector
DEPENDS Boost EIGEN3
)

2
op3_demo/include/op3_demo/ball_follower.h
View File

@ -29,7 +29,7 @@
#include <yaml-cpp/yaml.h>
#include "robotis_controller_msgs/JointCtrlModule.h"
#include "ball_detector/CircleSetStamped.h"
#include "op3_ball_detector/CircleSetStamped.h"
#include "op3_walking_module_msgs/WalkingParam.h"
#include "op3_walking_module_msgs/GetWalkingParam.h"

4
op3_demo/include/op3_demo/ball_tracker.h
View File

@ -29,7 +29,7 @@
#include <yaml-cpp/yaml.h>
#include "robotis_controller_msgs/JointCtrlModule.h"
#include "ball_detector/CircleSetStamped.h"
#include "op3_ball_detector/CircleSetStamped.h"
#include "op3_walking_module_msgs/WalkingParam.h"
#include "op3_walking_module_msgs/GetWalkingParam.h"
@ -79,7 +79,7 @@ protected:
const int WAITING_THRESHOLD;
const bool DEBUG_PRINT;
void ballPositionCallback(const ball_detector::CircleSetStamped::ConstPtr &msg);
void ballPositionCallback(const op3_ball_detector::CircleSetStamped::ConstPtr &msg);
void ballTrackerCommandCallback(const std_msgs::String::ConstPtr &msg);
void publishHeadJoint(double pan, double tilt);
void scanBall();

2
op3_demo/launch/demo.launch
View File

@ -4,7 +4,7 @@
<include file="$(find op3_manager)/launch/op3_manager.launch"/>
<!-- Camera and Ball detector -->
<include file="$(find ball_detector)/launch/ball_detector_from_usb_cam.launch"/>
<include file="$(find op3_ball_detector)/launch/ball_detector_from_usb_cam.launch"/>
<!-- face tracking -->
<include file="$(find op3_demo)/launch/face_detection_op3.launch" />

2
op3_demo/launch/self_test.launch
View File

@ -5,7 +5,7 @@
<include file="$(find op3_manager)/launch/op3_manager.launch"/>
<!-- Camera and Ball detector -->
<include file="$(find ball_detector)/launch/ball_detector_from_usb_cam.launch"/>
<include file="$(find op3_ball_detector)/launch/ball_detector_from_usb_cam.launch"/>
<!-- face tracking -->
<include file="$(find op3_demo)/launch/face_detection_op3.launch" />

2
op3_demo/package.xml
View File

@ -24,7 +24,7 @@
<depend>op3_action_module_msgs</depend>
<depend>cmake_modules</depend>
<depend>robotis_math</depend>
<depend>ball_detector</depend>
<depend>op3_ball_detector</depend>
<depend>boost</depend>
<depend>eigen</depend>
<depend>yaml-cpp</depend>

2
op3_demo/src/soccer/ball_tracker.cpp
View File

@ -59,7 +59,7 @@ BallTracker::~BallTracker()
}
void BallTracker::ballPositionCallback(const ball_detector::CircleSetStamped::ConstPtr &msg)
void BallTracker::ballPositionCallback(const op3_ball_detector::CircleSetStamped::ConstPtr &msg)
{
for (int idx = 0; idx < msg->circles.size(); idx++)
{