diff --git a/.DS_Store b/.DS_Store index 8002f19..1618053 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/test/.DS_Store b/test/.DS_Store new file mode 100644 index 0000000..01ad190 Binary files /dev/null and b/test/.DS_Store differ diff --git a/workspace/src/joint_angles.py b/workspace/src/joint_angles.py index 22ac257..4119484 100644 --- a/workspace/src/joint_angles.py +++ b/workspace/src/joint_angles.py @@ -8,7 +8,11 @@ def main(): osc_startup() # Make client channels to send packets +<<<<<<< HEAD osc_udp_client("localhost", 8000, "osc_client") +======= + osc_udp_client("192.168.1.24", 8000, "osc_client") +>>>>>>> c77d75859fda8ac862323fbd1993c35f7f931973 # Example joint positions to send joint_positions1 = [0.0,0.0, 0.0, 0.0, 0.0, 0.0] diff --git a/workspace/src/joint_control/joint_control/__pycache__/plugdata_cart_fix.cpython-310.pyc b/workspace/src/joint_control/joint_control/__pycache__/plugdata_cart_fix.cpython-310.pyc index d00234d..18a329e 100644 Binary files a/workspace/src/joint_control/joint_control/__pycache__/plugdata_cart_fix.cpython-310.pyc and b/workspace/src/joint_control/joint_control/__pycache__/plugdata_cart_fix.cpython-310.pyc differ diff --git a/workspace/src/joint_control/joint_control/plugdata_cart_fix.py b/workspace/src/joint_control/joint_control/plugdata_cart_fix.py index 0f4b914..538c064 100644 --- a/workspace/src/joint_control/joint_control/plugdata_cart_fix.py +++ b/workspace/src/joint_control/joint_control/plugdata_cart_fix.py @@ -195,7 +195,7 @@ class ScaledJointTrajectoryPublisher(Node): continue point = JointTrajectoryPoint() point.positions = list(sol[0]) - duration *= 2 + duration *= 5 duration += prev_duration prev_duration = duration point.time_from_start.sec = int(duration)