mirror of
https://github.com/elephantrobotics/mycobot_ros.git
synced 2026-07-14 09:00:53 +00:00
update port
This commit is contained in:
parent
a12eacca6b
commit
15e27b7435
3 changed files with 9 additions and 9 deletions
|
|
@ -14,8 +14,8 @@ def talker():
|
||||||
rospy.init_node("display", anonymous=True)
|
rospy.init_node("display", anonymous=True)
|
||||||
|
|
||||||
print("Try connect real Mercury...")
|
print("Try connect real Mercury...")
|
||||||
port1 = rospy.get_param("~port1", "/dev/ttyTHS1")
|
port1 = rospy.get_param("~port1", "/dev/ttyTHS0")
|
||||||
port2 = rospy.get_param("~port2", "/dev/ttyS0")
|
port2 = rospy.get_param("~port2", "/dev/ttyACM0")
|
||||||
baud = rospy.get_param("~baud", 115200)
|
baud = rospy.get_param("~baud", 115200)
|
||||||
print("left arm: {}, baud: {}\n".format(port1, baud))
|
print("left arm: {}, baud: {}\n".format(port1, baud))
|
||||||
print("right arm: {}, baud: {}\n".format(port2, baud))
|
print("right arm: {}, baud: {}\n".format(port2, baud))
|
||||||
|
|
@ -106,11 +106,11 @@ def talker():
|
||||||
|
|
||||||
right_coords = r.get_coords()
|
right_coords = r.get_coords()
|
||||||
|
|
||||||
eye_coords = r.get_angle(11)
|
eye_coords = [r.get_angle(11)]
|
||||||
|
|
||||||
head_coords = r.get_angle(12)
|
head_coords = [r.get_angle(12)]
|
||||||
|
|
||||||
body_coords = r.get_angle(13)
|
body_coords = [r.get_angle(13)]
|
||||||
|
|
||||||
# marker
|
# marker
|
||||||
marker_.header.stamp = rospy.Time.now()
|
marker_.header.stamp = rospy.Time.now()
|
||||||
|
|
|
||||||
|
|
@ -52,8 +52,8 @@ def listener():
|
||||||
rospy.init_node("control_slider", anonymous=True)
|
rospy.init_node("control_slider", anonymous=True)
|
||||||
|
|
||||||
rospy.Subscriber("joint_states", JointState, callback)
|
rospy.Subscriber("joint_states", JointState, callback)
|
||||||
port1 = rospy.get_param("~port1", "/dev/ttyTHS1")
|
port1 = rospy.get_param("~port1", "/dev/ttyTHS0")
|
||||||
port2 = rospy.get_param("~port2", "/dev/ttyS0")
|
port2 = rospy.get_param("~port2", "/dev/ttyACM0")
|
||||||
baud = rospy.get_param("~baud", 115200)
|
baud = rospy.get_param("~baud", 115200)
|
||||||
print('left arm: {}, {}'.format(port1, baud))
|
print('left arm: {}, {}'.format(port1, baud))
|
||||||
print('right arm: {}, {}'.format(port2, baud))
|
print('right arm: {}, {}'.format(port2, baud))
|
||||||
|
|
|
||||||
|
|
@ -52,8 +52,8 @@ def listener():
|
||||||
rospy.init_node("control_slider", anonymous=True)
|
rospy.init_node("control_slider", anonymous=True)
|
||||||
|
|
||||||
rospy.Subscriber("joint_states", JointState, callback)
|
rospy.Subscriber("joint_states", JointState, callback)
|
||||||
port1 = rospy.get_param("~port1", "/dev/ttyTHS1")
|
port1 = rospy.get_param("~port1", "/dev/ttyTHS0")
|
||||||
port2 = rospy.get_param("~port2", "/dev/ttyS0")
|
port2 = rospy.get_param("~port2", "/dev/ttyACM0")
|
||||||
baud = rospy.get_param("~baud", 115200)
|
baud = rospy.get_param("~baud", 115200)
|
||||||
print('left arm: {}, {}'.format(port1, baud))
|
print('left arm: {}, {}'.format(port1, baud))
|
||||||
print('right arm: {}, {}'.format(port2, baud))
|
print('right arm: {}, {}'.format(port2, baud))
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue