Merge branch 'noetic' of github.com:elephantrobotics/mycobot_ros into…

… pro630
elephantrobotics · Mar 5, 2024 · df7a68e · df7a68e
2 parents 14c38b9 + 28e6ecf
commit df7a68e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/mycobot_320/new_mycobot_320/scripts/mycobot_320_teleop_keyboard.py b/mycobot_320/new_mycobot_320/scripts/mycobot_320_teleop_keyboard.py
@@ -82,14 +82,14 @@ def teleop_keyboard():
         exit(1)
 
     init_pose = [0, 0, 0, 0, 0, 0, speed]
-    home_pose = [0, 8, -127, 40, 0, 0, speed]
+    home_pose = [0, 8, -127, 40, 90, 0, speed]
 
     # rsp = set_angles(*init_pose)
 
     while True:
         res = get_coords()
         # print(res)
-        if res.x > 1:
+        if res:
             break
         time.sleep(0.1)
 

diff --git a/mycobot_320/new_mycobot_320_pi/scripts/mycobot_320_teleop_keyboard.py b/mycobot_320/new_mycobot_320_pi/scripts/mycobot_320_teleop_keyboard.py
@@ -82,14 +82,13 @@ def teleop_keyboard():
         exit(1)
 
     init_pose = [0, 0, 0, 0, 0, 0, speed]
-    home_pose = [0, 8, -127, 40, 0, 0, speed]
+    home_pose = [0, 8, -127, 40, 90, 0, speed]
 
     # rsp = set_angles(*init_pose)
 
     while True:
         res = get_coords()
-        if res.x > 1:
-            print("joint1's angle : "+str(res.x)+"is not > 1,please calibrate the joint1's angle")
+        if res:
             break
         time.sleep(0.1)