solve merge conflict

Author: ykarmesh

launch/camera_calibration.launch

@@ -1,5 +1,6 @@
 <launch>
 	<include file="position_control.launch"/>
+	<include file="$(find openface2_ros)/launch/openface2_ros.launch"/>
 	<include file="$(find realsense2_camera)/launch/rs_camera.launch">
         <arg name="enable_pointcloud" value="true"/>
     	</include>

scripts/controller.py

@@ -1,5 +1,7 @@
 import numpy as np
 import rospy
+import time
+from collections import deque
 
 from std_msgs.msg import Float64, Empty
 from trac_ik_python.trac_ik import IK
@@ -18,6 +20,8 @@ def __init__(self):
         rospy.Subscriber('/joint_states', JointState, self.get_joint_state)
         self.tf_listener = tf.TransformListener()
 
+        self.history = {'timestamp': deque(),
+                        'joint_feedback': deque()}
         # global variables
         self.current_joint_state = None
         self.current_gripper_state = None
@@ -59,6 +63,19 @@ def set_arm_joint_angles(self, joint_target):
         rospy.sleep(4)
 
     def get_joint_state(self, data):
+        # TODO: Change this when required
+        moveable_joints = [1,2,3]
+        # Add timestamp
+        self.history['timestamp'].append(time.time())
+        if(len(self.history['timestamp']) > 20):
+            self.history['timestamp'].popleft()
+
+        # Add Joint Feedback
+        joint_angles = np.array(data.position)[moveable_joints]
+        self.history['joint_feedback'].append(joint_angles)
+        if(len(self.history['joint_feedback']) > 20):
+            self.history['joint_feedback'].popleft()
+
         self.current_joint_state = data.position[0:5]
         self.current_gripper_state = data.position[7:9]
 

scripts/machine.py

@@ -4,6 +4,7 @@
 import rospy
 import smach
 import smach_ros
+import numpy as np
 
 from controller import Controller
 from geometry_msgs.msg import PoseStamped
@@ -12,6 +13,7 @@
 
 # Initialize controller
 ctrl = Controller()
+MIN_JOINT_MOTION_FOR_HAND_OVER = 0.1
 # define state Idle
 class Idle(smach.State):
     def __init__(self):
@@ -168,9 +170,17 @@ def __init__(self):
 
     def execute(self, userdata):
         ## Detect when to Open gripper
-        ctrl.open_gripper()
         rospy.loginfo('Executing state OpenGripper')
-        return 'opened'
+        while(True):
+            joint_len = len(ctrl.history['joint_feedback'][0])
+            joint_sum = np.zeros(ctrl.history['joint_feedback'][0].shape)
+            for joint_feedback in ctrl.history['joint_feedback']:
+                joint_sum += joint_feedback
+            avg_joint_sum = joint_sum/joint_len
+            if(np.sum(avg_joint_sum) < MIN_JOINT_MOTION_FOR_HAND_OVER):
+                ctrl.open_gripper()
+                return 'opened'
+
 
 def main():
     rospy.init_node('attention_bot')