diff --git a/mycobot_280/mycobot_280/scripts/listen_real.py b/mycobot_280/mycobot_280/scripts/listen_real.py old mode 100644 new mode 100755 index 5e4d9bc..1d38b61 --- a/mycobot_280/mycobot_280/scripts/listen_real.py +++ b/mycobot_280/mycobot_280/scripts/listen_real.py @@ -1,4 +1,5 @@ #!/usr/bin/env python2 +# encoding:utf-8 # license removed for brevity import time import math diff --git a/mycobot_ai/myCobot_280/res/takephoto.jpeg b/mycobot_ai/myCobot_280/res/takephoto.jpeg index 1798785..4d761e6 100644 Binary files a/mycobot_ai/myCobot_280/res/takephoto.jpeg and b/mycobot_ai/myCobot_280/res/takephoto.jpeg differ diff --git a/mycobot_ai/myCobot_280/scripts/combine_detect_obj_color .py b/mycobot_ai/myCobot_280/scripts/combine_detect_obj_color .py index a2f624c..d16dc18 100755 --- a/mycobot_ai/myCobot_280/scripts/combine_detect_obj_color .py +++ b/mycobot_ai/myCobot_280/scripts/combine_detect_obj_color .py @@ -19,7 +19,7 @@ __version__ = "1.0" class Object_detect(Movement): - def __init__(self, camera_x = 170, camera_y = -10): + def __init__(self, camera_x = 160, camera_y = -10): # inherit the parent class super(Object_detect, self).__init__() # get path of file @@ -76,9 +76,9 @@ class Object_detect(Movement): self.HSV = { "yellow": [np.array([11, 115, 70]), np.array([40, 255, 245])], "red": [np.array([0, 43, 46]), np.array([8, 255, 255])], - "green": [np.array([35, 43, 46]), np.array([77, 255, 255])], + "green": [np.array([35, 43, 46]), np.array([77, 255, 255])], # [77, 255, 255] "blue": [np.array([100, 43, 46]), np.array([124, 255, 255])], - "cyan": [np.array([78, 43, 46]), np.array([99, 255, 255])], + "cyan": [np.array([78, 43, 46]), np.array([99, 255, 255])], # np.array([78, 43, 46]), np.array([99, 255, 255]) } # use to calculate coord between cube and mycobot self.sum_x1 = self.sum_x2 = self.sum_y2 = self.sum_y1 = 0 diff --git a/mycobot_ai/myCobot_280/scripts/combine_detect_obj_img_folder_opt.py b/mycobot_ai/myCobot_280/scripts/combine_detect_obj_img_folder_opt.py index 72184b7..1eab21b 100644 --- a/mycobot_ai/myCobot_280/scripts/combine_detect_obj_img_folder_opt.py +++ b/mycobot_ai/myCobot_280/scripts/combine_detect_obj_img_folder_opt.py @@ -30,7 +30,7 @@ __version__ = "1.0" # Adaptive seeed class Object_detect(Movement): - def __init__(self, camera_x = 165, camera_y = -5): + def __init__(self, camera_x = 160, camera_y = -5): # inherit the parent class super(Object_detect, self).__init__() # get path of file