latest pushes

This commit is contained in:
Ronaldson Bellande 2024-07-23 22:34:35 -04:00
parent 3018c828c6
commit 45f825d413
2 changed files with 221 additions and 253 deletions

View File

@ -18,16 +18,24 @@
import os
import sys
import math
from std_msgs.msg import String
from sensor_msgs.msg import JointState
from std_msgs.msg import String
from geometry_msgs.msg import Point
from humanoid_robot_intelligence_control_system_walking_module_msgs.msg import WalkingParam
from humanoid_robot_intelligence_control_system_walking_module_msgs.srv import GetWalkingParam
from humanoid_robot_intelligence_control_system_detection.follower import calculate_distance_to_face, calculate_footstep, calculate_delta_time
from humanoid_robot_intelligence_control_system_detection.follower_config import FollowerConfig, FollowerInitializeConfig
class FaceFollower:
def __init__(self, ros_version):
self.ros_version = ros_version
self.initialize_config = FollowerInitializeConfig()
self.config = FollowerConfig()
self.initialize_ros()
self.setup_ros_communication()
def initialize_ros(self):
if self.ros_version == '1':
rospy.init_node('face_follower')
self.get_param = rospy.get_param
@ -37,38 +45,9 @@ class FaceFollower:
self.node = rclpy.create_node('face_follower')
self.get_param = self.node.get_parameter
self.logger = self.node.get_logger()
self.initialize_parameters()
self.setup_ros_communication()
def initialize_parameters(self):
self.FOV_WIDTH = 35.2 * math.pi / 180
self.FOV_HEIGHT = 21.6 * math.pi / 180
self.count_not_found = 0
self.count_to_approach = 0
self.on_following = False
self.approach_face_position = "NotFound"
self.CAMERA_HEIGHT = 0.46
self.NOT_FOUND_THRESHOLD = 50
self.MAX_FB_STEP = 40.0 * 0.001
self.MAX_RL_TURN = 15.0 * math.pi / 180
self.IN_PLACE_FB_STEP = -3.0 * 0.001
self.MIN_FB_STEP = 5.0 * 0.001
self.MIN_RL_TURN = 5.0 * math.pi / 180
self.UNIT_FB_STEP = 1.0 * 0.001
self.UNIT_RL_TURN = 0.5 * math.pi / 180
self.SPOT_FB_OFFSET = 0.0 * 0.001
self.SPOT_RL_OFFSET = 0.0 * 0.001
self.SPOT_ANGLE_OFFSET = 0.0
self.hip_pitch_offset = 7.0
self.current_pan = -10
self.current_tilt = -10
self.current_x_move = 0.005
self.current_r_angle = 0
self.curr_period_time = 0.6
self.accum_period_time = 0.0
self.DEBUG_PRINT = False
self.config.update_from_params(self.get_param)
self.initialize_config.update_from_params(self.get_param)
def setup_ros_communication(self):
if self.ros_version == '1':
@ -80,8 +59,8 @@ class FaceFollower:
"/humanoid_robot_intelligence_control_system/walking/set_params", WalkingParam, queue_size=1)
self.get_walking_param_client = rospy.ServiceProxy(
"/humanoid_robot_intelligence_control_system/walking/get_params", GetWalkingParam)
self.face_position_sub = rospy.Subscriber(
"/face_detector/face_position", Point, self.face_position_callback)
self.face_detection_sub = rospy.Subscriber(
"/face_detection_result", Point, self.face_detection_callback)
self.prev_time = rospy.Time.now()
else:
self.current_joint_states_sub = self.node.create_subscription(
@ -92,127 +71,103 @@ class FaceFollower:
WalkingParam, "/humanoid_robot_intelligence_control_system/walking/set_params", 1)
self.get_walking_param_client = self.node.create_client(
GetWalkingParam, "/humanoid_robot_intelligence_control_system/walking/get_params")
self.face_position_sub = self.node.create_subscription(
Point, "/face_detector/face_position", self.face_position_callback, 10)
self.face_detection_sub = self.node.create_subscription(
Point, "/face_detection_result", self.face_detection_callback, 10)
self.prev_time = self.node.get_clock().now()
self.current_walking_param = WalkingParam()
def start_following(self):
self.on_following = True
self.logger.info("Start Face following")
self.initialize_config.on_tracking = True
self.logger.info("Start face following")
self.set_walking_command("start")
result = self.get_walking_param()
if result:
self.hip_pitch_offset = self.current_walking_param.hip_pitch_offset
self.curr_period_time = self.current_walking_param.period_time
self.config.hip_pitch_offset = self.current_walking_param.hip_pitch_offset
self.config.curr_period_time = self.current_walking_param.period_time
else:
self.hip_pitch_offset = 7.0 * math.pi / 180
self.curr_period_time = 0.6
self.config.hip_pitch_offset = 7.0 * math.pi / 180
self.config.curr_period_time = 0.6
def stop_following(self):
self.on_following = False
self.count_to_approach = 0
self.logger.info("Stop Face following")
self.initialize_config.on_tracking = False
self.initialize_config.count_to_approach = 0
self.logger.info("Stop face following")
self.set_walking_command("stop")
def current_joint_states_callback(self, msg):
for i, name in enumerate(msg.name):
if name == "head_pan":
self.current_pan = msg.position[i]
self.initialize_config.current_pan = msg.position[i]
elif name == "head_tilt":
self.current_tilt = msg.position[i]
def face_position_callback(self, msg):
if self.on_following:
self.process_following(msg.x, msg.y, msg.z)
def calc_footstep(self, target_distance, target_angle, delta_time):
next_movement = self.current_x_move
target_distance = max(0, target_distance)
fb_goal = min(target_distance * 0.1, self.MAX_FB_STEP)
self.accum_period_time += delta_time
if self.accum_period_time > (self.curr_period_time / 4):
self.accum_period_time = 0.0
if (target_distance * 0.1 / 2) < self.current_x_move:
next_movement -= self.UNIT_FB_STEP
else:
next_movement += self.UNIT_FB_STEP
fb_goal = min(next_movement, fb_goal)
fb_move = max(fb_goal, self.MIN_FB_STEP)
rl_goal = 0.0
if abs(target_angle) * 180 / math.pi > 5.0:
rl_offset = abs(target_angle) * 0.2
rl_goal = min(rl_offset, self.MAX_RL_TURN)
rl_goal = max(rl_goal, self.MIN_RL_TURN)
rl_angle = min(abs(self.current_r_angle) + self.UNIT_RL_TURN, rl_goal)
if target_angle < 0:
rl_angle *= -1
else:
rl_angle = 0
return fb_move, rl_angle
self.initialize_config.current_tilt = msg.position[i]
def process_following(self, x_angle, y_angle, face_size):
if self.ros_version == '1':
curr_time = rospy.Time.now()
delta_time = (curr_time - self.prev_time).to_sec()
else:
curr_time = self.node.get_clock().now()
delta_time = (curr_time - self.prev_time).nanoseconds / 1e9
curr_time = rospy.Time.now() if self.ros_version == '1' else self.node.get_clock().now()
delta_time = calculate_delta_time(curr_time, self.prev_time)
self.prev_time = curr_time
self.count_not_found = 0
self.initialize_config.count_not_found = 0
if self.current_tilt == -10 and self.current_pan == -10:
if self.initialize_config.current_tilt == -10 and self.initialize_config.current_pan == -10:
self.logger.error("Failed to get current angle of head joints.")
self.set_walking_command("stop")
self.on_following = False
self.approach_face_position = "NotFound"
self.initialize_config.on_tracking = False
self.initialize_config.approach_face_position = "NotFound"
return False
self.approach_face_position = "OutOfRange"
self.initialize_config.approach_face_position = "OutOfRange"
distance_to_face = self.CAMERA_HEIGHT * math.tan(math.pi * 0.5 + self.current_tilt - self.hip_pitch_offset - face_size)
distance_to_face = abs(distance_to_face)
distance_to_face = calculate_distance_to_face(
self.config.CAMERA_HEIGHT, self.initialize_config.current_tilt, self.config.hip_pitch_offset, face_size)
distance_to_approach = 0.5 # Adjust this value as needed
distance_to_approach = 0.22
if (distance_to_face < distance_to_approach) and (abs(x_angle) < 25.0):
self.count_to_approach += 1
if self.count_to_approach > 20:
self.initialize_config.count_to_approach += 1
if self.initialize_config.count_to_approach > 20:
self.set_walking_command("stop")
self.on_following = False
self.approach_face_position = "OnLeft" if x_angle > 0 else "OnRight"
self.initialize_config.on_tracking = False
self.initialize_config.approach_face_position = "OnLeft" if x_angle > 0 else "OnRight"
return True
elif self.count_to_approach > 15:
self.set_walking_param(self.IN_PLACE_FB_STEP, 0, 0)
elif self.initialize_config.count_to_approach > 15:
self.set_walking_param(self.config.IN_PLACE_FB_STEP, 0, 0)
return False
else:
self.count_to_approach = 0
self.initialize_config.count_to_approach = 0
distance_to_walk = distance_to_face - distance_to_approach
fb_move, rl_angle = self.calc_footstep(distance_to_walk, self.current_pan, delta_time)
fb_move, rl_angle = calculate_footstep(
self.initialize_config.current_x_move, distance_to_walk, self.initialize_config.current_r_angle, self.initialize_config.current_pan, delta_time, self.config)
self.set_walking_param(fb_move, 0, rl_angle)
return False
def decide_face_position(self, x_angle, y_angle):
if self.initialize_config.current_tilt == -10 and self.initialize_config.current_pan == -10:
self.initialize_config.approach_face_position = "NotFound"
return
face_x_angle = self.initialize_config.current_pan + x_angle
self.initialize_config.approach_face_position = "OnLeft" if face_x_angle > 0 else "OnRight"
def wait_following(self):
self.initialize_config.count_not_found += 1
if self.initialize_config.count_not_found > self.config.NOT_FOUND_THRESHOLD * 0.5:
self.set_walking_param(0.0, 0.0, 0.0)
def set_walking_command(self, command):
if command == "start":
self.get_walking_param()
self.set_walking_param(self.IN_PLACE_FB_STEP, 0, 0, True)
self.set_walking_param(self.config.IN_PLACE_FB_STEP, 0, 0, True)
msg = String()
msg.data = command
self.set_walking_command_pub.publish(msg)
def set_walking_param(self, x_move, y_move, rotation_angle, balance=False):
self.current_walking_param.balance_enable = balance
self.current_walking_param.x_move_amplitude = x_move + self.SPOT_FB_OFFSET
self.current_walking_param.y_move_amplitude = y_move + self.SPOT_RL_OFFSET
self.current_walking_param.angle_move_amplitude = rotation_angle + self.SPOT_ANGLE_OFFSET
self.current_walking_param.x_move_amplitude = x_move + self.config.SPOT_FB_OFFSET
self.current_walking_param.y_move_amplitude = y_move + self.config.SPOT_RL_OFFSET
self.current_walking_param.angle_move_amplitude = rotation_angle + self.config.SPOT_ANGLE_OFFSET
self.set_walking_param_pub.publish(self.current_walking_param)
self.current_x_move = x_move
self.current_r_angle = rotation_angle
self.initialize_config.current_x_move = x_move
self.initialize_config.current_r_angle = rotation_angle
def get_walking_param(self):
if self.ros_version == '1':
@ -233,19 +188,20 @@ class FaceFollower:
self.logger.error('Service call failed %r' % (future.exception(),))
return False
def face_detection_callback(self, msg):
if self.initialize_config.on_tracking:
x_angle = msg.x
y_angle = msg.y
face_size = msg.z
self.process_following(x_angle, y_angle, face_size)
else:
self.wait_following()
def run(self):
if self.ros_version == '1':
rate = rospy.Rate(30)
while not rospy.is_shutdown():
if self.on_following:
self.process_following(self.current_pan, self.current_tilt, 0.1)
rate.sleep()
rospy.spin()
else:
while rclpy.ok():
if self.on_following:
self.process_following(self.current_pan, self.current_tilt, 0.1)
rclpy.spin_once(self.node, timeout_sec=0.03)
rclpy.spin(self.node)
def main(ros_version):
try:
@ -259,26 +215,21 @@ def main(ros_version):
rclpy.shutdown()
print(f"An error occurred: {e}")
if __name__ == '__main__':
ros_version = os.getenv("ROS_VERSION")
if ros_version == "1":
import rospy
try:
import rospy
main(ros_version)
except rospy.ROSInterruptException:
print("Error in ROS1 main")
elif ros_version == "2":
import rclpy
try:
import rclpy
from rclpy.node import Node
main(ros_version)
except KeyboardInterrupt:
rclpy.shutdown()
print("Error in ROS1 main")
print("Error in ROS2 main")
else:
print("Unsupported ROS version. Please set the ROS_VERSION environment variable to '1' for ROS 1 or '2' for ROS 2.")
sys.exit(1)

View File

@ -15,193 +15,181 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
import rospy
import os
import sys
import math
from sensor_msgs.msg import JointState
from std_msgs.msg import String
from geometry_msgs.msg import Point
from humanoid_robot_intelligence_control_system_walking_module_msgs.msg import WalkingParam
from humanoid_robot_intelligence_control_system_walking_module_msgs.srv import GetWalkingParam
from geometry_msgs.msg import Point
from humanoid_robot_intelligence_control_system_detection.follower import calculate_distance_to_object, calculate_footstep, calculate_delta_time
from humanoid_robot_intelligence_control_system_detection.follower_config import FollowerConfig, FollowerInitializeConfig
class ObjectFollower:
def __init__(self):
rospy.init_node('object_follower')
def __init__(self, ros_version):
self.ros_version = ros_version
self.initialize_config = FollowerInitializeConfig()
self.config = FollowerConfig()
self.initialize_ros()
self.setup_ros_communication()
def initialize_ros(self):
if self.ros_version == '1':
rospy.init_node('object_follower')
self.get_param = rospy.get_param
self.logger = rospy
else:
rclpy.init()
self.node = rclpy.create_node('object_follower')
self.get_param = self.node.get_parameter
self.logger = self.node.get_logger()
self.FOV_WIDTH = 35.2 * math.pi / 180
self.FOV_HEIGHT = 21.6 * math.pi / 180
self.count_not_found = 0
self.count_to_approach = 0
self.on_tracking = False
self.approach_object_position = "NotFound"
self.CAMERA_HEIGHT = 0.46
self.NOT_FOUND_THRESHOLD = 50
self.MAX_FB_STEP = 40.0 * 0.001
self.MAX_RL_TURN = 15.0 * math.pi / 180
self.IN_PLACE_FB_STEP = -3.0 * 0.001
self.MIN_FB_STEP = 5.0 * 0.001
self.MIN_RL_TURN = 5.0 * math.pi / 180
self.UNIT_FB_STEP = 1.0 * 0.001
self.UNIT_RL_TURN = 0.5 * math.pi / 180
self.SPOT_FB_OFFSET = 0.0 * 0.001
self.SPOT_RL_OFFSET = 0.0 * 0.001
self.SPOT_ANGLE_OFFSET = 0.0
self.hip_pitch_offset = 7.0
self.current_pan = -10
self.current_tilt = -10
self.current_x_move = 0.005
self.current_r_angle = 0
self.curr_period_time = 0.6
self.accum_period_time = 0.0
self.DEBUG_PRINT = False
self.config.update_from_params(self.get_param)
self.initialize_config.update_from_params(self.get_param)
self.current_joint_states_sub = rospy.Subscriber(
"/humanoid_robot_intelligence_control_system/goal_joint_states", JointState, self.current_joint_states_callback)
self.set_walking_command_pub = rospy.Publisher(
"/humanoid_robot_intelligence_control_system/walking/command", String, queue_size=1)
self.set_walking_param_pub = rospy.Publisher(
"/humanoid_robot_intelligence_control_system/walking/set_params", WalkingParam, queue_size=1)
self.get_walking_param_client = rospy.ServiceProxy(
"/humanoid_robot_intelligence_control_system/walking/get_params", GetWalkingParam)
# Subscribe to object detection results
self.object_detection_sub = rospy.Subscriber(
"/object_detection_result", Point, self.object_detection_callback)
self.prev_time = rospy.Time.now()
self.current_walking_param = WalkingParam()
def setup_ros_communication(self):
if self.ros_version == '1':
self.current_joint_states_sub = rospy.Subscriber(
"/humanoid_robot_intelligence_control_system/goal_joint_states", JointState, self.current_joint_states_callback)
self.set_walking_command_pub = rospy.Publisher(
"/humanoid_robot_intelligence_control_system/walking/command", String, queue_size=1)
self.set_walking_param_pub = rospy.Publisher(
"/humanoid_robot_intelligence_control_system/walking/set_params", WalkingParam, queue_size=1)
self.get_walking_param_client = rospy.ServiceProxy(
"/humanoid_robot_intelligence_control_system/walking/get_params", GetWalkingParam)
self.object_detection_sub = rospy.Subscriber(
"/object_detection_result", Point, self.object_detection_callback)
self.prev_time = rospy.Time.now()
else:
self.current_joint_states_sub = self.node.create_subscription(
JointState, "/humanoid_robot_intelligence_control_system/goal_joint_states", self.current_joint_states_callback, 10)
self.set_walking_command_pub = self.node.create_publisher(
String, "/humanoid_robot_intelligence_control_system/walking/command", 1)
self.set_walking_param_pub = self.node.create_publisher(
WalkingParam, "/humanoid_robot_intelligence_control_system/walking/set_params", 1)
self.get_walking_param_client = self.node.create_client(
GetWalkingParam, "/humanoid_robot_intelligence_control_system/walking/get_params")
self.object_detection_sub = self.node.create_subscription(
Point, "/object_detection_result", self.object_detection_callback, 10)
self.prev_time = self.node.get_clock().now()
def start_following(self):
self.on_tracking = True
rospy.loginfo("Start Object following")
self.initialize_config.on_tracking = True
self.logger.info("Start Object following")
self.set_walking_command("start")
result = self.get_walking_param()
if result:
self.hip_pitch_offset = self.current_walking_param.hip_pitch_offset
self.curr_period_time = self.current_walking_param.period_time
self.config.hip_pitch_offset = self.current_walking_param.hip_pitch_offset
self.config.curr_period_time = self.current_walking_param.period_time
else:
self.hip_pitch_offset = 7.0 * math.pi / 180
self.curr_period_time = 0.6
self.config.hip_pitch_offset = 7.0 * math.pi / 180
self.config.curr_period_time = 0.6
def stop_following(self):
self.on_tracking = False
self.count_to_approach = 0
rospy.loginfo("Stop Object following")
self.initialize_config.on_tracking = False
self.initialize_config.count_to_approach = 0
self.logger.info("Stop Object following")
self.set_walking_command("stop")
def current_joint_states_callback(self, msg):
for i, name in enumerate(msg.name):
if name == "head_pan":
self.current_pan = msg.position[i]
self.initialize_config.current_pan = msg.position[i]
elif name == "head_tilt":
self.current_tilt = msg.position[i]
def calc_footstep(self, target_distance, target_angle, delta_time):
next_movement = self.current_x_move
target_distance = max(0, target_distance)
fb_goal = min(target_distance * 0.1, self.MAX_FB_STEP)
self.accum_period_time += delta_time
if self.accum_period_time > (self.curr_period_time / 4):
self.accum_period_time = 0.0
if (target_distance * 0.1 / 2) < self.current_x_move:
next_movement -= self.UNIT_FB_STEP
else:
next_movement += self.UNIT_FB_STEP
fb_goal = min(next_movement, fb_goal)
fb_move = max(fb_goal, self.MIN_FB_STEP)
rl_goal = 0.0
if abs(target_angle) * 180 / math.pi > 5.0:
rl_offset = abs(target_angle) * 0.2
rl_goal = min(rl_offset, self.MAX_RL_TURN)
rl_goal = max(rl_goal, self.MIN_RL_TURN)
rl_angle = min(abs(self.current_r_angle) + self.UNIT_RL_TURN, rl_goal)
if target_angle < 0:
rl_angle *= -1
else:
rl_angle = 0
return fb_move, rl_angle
self.initialize_config.current_tilt = msg.position[i]
def process_following(self, x_angle, y_angle, object_size):
curr_time = rospy.Time.now()
delta_time = (curr_time - self.prev_time).to_sec()
curr_time = rospy.Time.now() if self.ros_version == '1' else self.node.get_clock().now()
delta_time = calculate_delta_time(curr_time, self.prev_time)
self.prev_time = curr_time
self.count_not_found = 0
self.initialize_config.count_not_found = 0
if self.current_tilt == -10 and self.current_pan == -10:
rospy.logerr("Failed to get current angle of head joints.")
if self.initialize_config.current_tilt == -10 and self.initialize_config.current_pan == -10:
self.logger.error("Failed to get current angle of head joints.")
self.set_walking_command("stop")
self.on_tracking = False
self.approach_object_position = "NotFound"
self.initialize_config.on_tracking = False
self.initialize_config.approach_object_position = "NotFound"
return False
self.approach_object_position = "OutOfRange"
self.initialize_config.approach_object_position = "OutOfRange"
distance_to_object = self.CAMERA_HEIGHT * math.tan(math.pi * 0.5 + self.current_tilt - self.hip_pitch_offset - object_size)
distance_to_object = abs(distance_to_object)
distance_to_object = calculate_distance_to_object(
self.config.CAMERA_HEIGHT, self.initialize_config.current_tilt, self.config.hip_pitch_offset, object_size)
distance_to_approach = 0.22
if (distance_to_object < distance_to_approach) and (abs(x_angle) < 25.0):
self.count_to_approach += 1
if self.count_to_approach > 20:
self.initialize_config.count_to_approach += 1
if self.initialize_config.count_to_approach > 20:
self.set_walking_command("stop")
self.on_tracking = False
self.approach_object_position = "OnLeft" if x_angle > 0 else "OnRight"
self.initialize_config.on_tracking = False
self.initialize_config.approach_object_position = "OnLeft" if x_angle > 0 else "OnRight"
return True
elif self.count_to_approach > 15:
self.set_walking_param(self.IN_PLACE_FB_STEP, 0, 0)
elif self.initialize_config.count_to_approach > 15:
self.set_walking_param(self.config.IN_PLACE_FB_STEP, 0, 0)
return False
else:
self.count_to_approach = 0
self.initialize_config.count_to_approach = 0
distance_to_walk = distance_to_object - distance_to_approach
fb_move, rl_angle = self.calc_footstep(distance_to_walk, self.current_pan, delta_time)
fb_move, rl_angle = calculate_footstep(
self.initialize_config.current_x_move, distance_to_walk, self.initialize_config.current_r_angle, self.initialize_config.current_pan, delta_time, self.config)
self.set_walking_param(fb_move, 0, rl_angle)
return False
def decide_object_position(self, x_angle, y_angle):
if self.current_tilt == -10 and self.current_pan == -10:
self.approach_object_position = "NotFound"
if self.initialize_config.current_tilt == -10 and self.initialize_config.current_pan == -10:
self.initialize_config.approach_object_position = "NotFound"
return
object_x_angle = self.current_pan + x_angle
self.approach_object_position = "OnLeft" if object_x_angle > 0 else "OnRight"
object_x_angle = self.initialize_config.current_pan + x_angle
self.initialize_config.approach_object_position = "OnLeft" if object_x_angle > 0 else "OnRight"
def wait_following(self):
self.count_not_found += 1
if self.count_not_found > self.NOT_FOUND_THRESHOLD * 0.5:
self.initialize_config.count_not_found += 1
if self.initialize_config.count_not_found > self.config.NOT_FOUND_THRESHOLD * 0.5:
self.set_walking_param(0.0, 0.0, 0.0)
def set_walking_command(self, command):
if command == "start":
self.get_walking_param()
self.set_walking_param(self.IN_PLACE_FB_STEP, 0, 0, True)
self.set_walking_param(self.config.IN_PLACE_FB_STEP, 0, 0, True)
msg = String()
msg.data = command
self.set_walking_command_pub.publish(msg)
def set_walking_param(self, x_move, y_move, rotation_angle, balance=False):
self.current_walking_param.balance_enable = balance
self.current_walking_param.x_move_amplitude = x_move + self.SPOT_FB_OFFSET
self.current_walking_param.y_move_amplitude = y_move + self.SPOT_RL_OFFSET
self.current_walking_param.angle_move_amplitude = rotation_angle + self.SPOT_ANGLE_OFFSET
self.current_walking_param.x_move_amplitude = x_move + self.config.SPOT_FB_OFFSET
self.current_walking_param.y_move_amplitude = y_move + self.config.SPOT_RL_OFFSET
self.current_walking_param.angle_move_amplitude = rotation_angle + self.config.SPOT_ANGLE_OFFSET
self.set_walking_param_pub.publish(self.current_walking_param)
self.current_x_move = x_move
self.current_r_angle = rotation_angle
self.initialize_config.current_x_move = x_move
self.initialize_config.current_r_angle = rotation_angle
def get_walking_param(self):
try:
response = self.get_walking_param_client()
self.current_walking_param = response.parameters
return True
except rospy.ServiceException as e:
rospy.logerr("Failed to get walking parameters: %s" % e)
return False
if self.ros_version == '1':
try:
response = self.get_walking_param_client()
self.current_walking_param = response.parameters
return True
except rospy.ServiceException as e:
self.logger.error("Failed to get walking parameters: %s" % e)
return False
else:
future = self.get_walking_param_client.call_async(GetWalkingParam.Request())
rclpy.spin_until_future_complete(self.node, future)
if future.result() is not None:
self.current_walking_param = future.result().parameters
return True
else:
self.logger.error('Service call failed %r' % (future.exception(),))
return False
def object_detection_callback(self, msg):
if self.on_tracking:
if self.initialize_config.on_tracking:
x_angle = msg.x
y_angle = msg.y
object_size = msg.z
@ -209,10 +197,39 @@ class ObjectFollower:
else:
self.wait_following()
if __name__ == '__main__':
def run(self):
if self.ros_version == '1':
rospy.spin()
else:
rclpy.spin(self.node)
def main(ros_version):
try:
follower = ObjectFollower()
follower = ObjectFollower(ros_version)
follower.start_following()
rospy.spin()
except rospy.ROSInterruptException:
pass
follower.run()
except Exception as e:
if ros_version == '1':
rospy.logerr(f"An error occurred: {e}")
else:
rclpy.shutdown()
print(f"An error occurred: {e}")
if __name__ == '__main__':
ros_version = os.getenv("ROS_VERSION")
if ros_version == "1":
import rospy
try:
main(ros_version)
except rospy.ROSInterruptException:
print("Error in ROS1 main")
elif ros_version == "2":
import rclpy
try:
main(ros_version)
except KeyboardInterrupt:
rclpy.shutdown()
print("Error in ROS2 main")
else:
print("Unsupported ROS version. Please set the ROS_VERSION environment variable to '1' for ROS 1 or '2' for ROS 2.")
sys.exit(1)