X-Git-Url: https://defiant.homedns.org/gitweb/?p=arm_ros_conn.git;a=blobdiff_plain;f=scripts%2Farm_ros_conn.py;h=c4ab470bf71d21b4f110f36adba824f1b3db4fca;hp=9ca59f268c147b55cec9168b1b6ef49a448126c7;hb=2c6e57243361122f521f6a1aaa1e443af88a261a;hpb=88aa19cc672e02cf19405a39691ef9f63b1acef5

diff --git a/scripts/arm_ros_conn.py b/scripts/arm_ros_conn.py
index 9ca59f2..c4ab470 100755
--- a/scripts/arm_ros_conn.py
+++ b/scripts/arm_ros_conn.py
@@ -2,14 +2,35 @@
 # -*- coding: iso-8859-15 -*-
 
 import rospy
+import arm
+from sensor_msgs.msg import JointState
 
 class ARMRosConn():
 	def __init__(self):
 		rospy.init_node('arm')
 
-		rate = rospy.Rate(10)
+		arm.switch(0)
+		arm.switch(2)
+		arm.set_hall_mode(3, 0)
+		arm.set_hall_mode(5, 0)
+		arm.set_tolerance(3, 0)
+		arm.set_tolerance(5, 0)
+
+		self.pub_joint_states = rospy.Publisher("joint_states", JointState, queue_size=16)
+		self.run()
+
+	def run(self):
+		rate = rospy.Rate(20)
 		while not rospy.is_shutdown():
+			self.publish_joint_states()
 			rate.sleep()
+	
+	def publish_joint_states(self):
+		joint_state = JointState()
+		joint_state.header.stamp = rospy.Time.now()
+		joint_state.name = ["base_to_link1", "link_1_2_joint", "link_2_3_joint", "gripper_joint_1", "gripper_joint_2", "left_gripper_joint", "right_gripper_joint"]
+		joint_state.position = [arm.get_angle(0), arm.get_angle(1), arm.get_angle(2), arm.get_angle(3), arm.get_angle(4), arm.get_angle(5)/2, arm.get_angle(5)/2]
+		self.pub_joint_states.publish(joint_state)
 
 
 if __name__ == '__main__':