From 9842ff20570e446ac38dd8347d7f1bd45c33d19e Mon Sep 17 00:00:00 2001 From: weijian Date: Fri, 9 Dec 2022 10:01:40 +0800 Subject: [PATCH] update pump --- mycobot_ai/aikit_280_pi/scripts/aikit_color.py | 8 ++++---- mycobot_ai/aikit_280_pi/scripts/aikit_encode.py | 6 +++--- mycobot_ai/aikit_280_pi/scripts/aikit_img.py | 8 ++++---- mycobot_ai/aikit_280_pi/scripts/aikit_shape.py | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mycobot_ai/aikit_280_pi/scripts/aikit_color.py b/mycobot_ai/aikit_280_pi/scripts/aikit_color.py index 60eb267..69c6032 100644 --- a/mycobot_ai/aikit_280_pi/scripts/aikit_color.py +++ b/mycobot_ai/aikit_280_pi/scripts/aikit_color.py @@ -133,23 +133,23 @@ class Object_detect(Movement): # pump_control pi def gpio_status(self, flag): if flag: - # self.GPIO.output(20, 0) + self.GPIO.output(20, 0) self.GPIO.output(21, 0) else: - # self.GPIO.output(20, 1) + self.GPIO.output(20, 1) self.GPIO.output(21, 1) # 开启吸泵 m5 def pump_on(self): # 让2号位工作 - # self.mc.set_basic_output(2, 0) + self.mc.set_basic_output(2, 0) # 让5号位工作 self.mc.set_basic_output(5, 0) # 停止吸泵 m5 def pump_off(self): # 让2号位停止工作 - # self.mc.set_basic_output(2, 1) + self.mc.set_basic_output(2, 1) # 让5号位停止工作 self.mc.set_basic_output(5, 1) diff --git a/mycobot_ai/aikit_280_pi/scripts/aikit_encode.py b/mycobot_ai/aikit_280_pi/scripts/aikit_encode.py index 37acb8a..8fc1c6a 100644 --- a/mycobot_ai/aikit_280_pi/scripts/aikit_encode.py +++ b/mycobot_ai/aikit_280_pi/scripts/aikit_encode.py @@ -20,7 +20,7 @@ class Detect_marker(): #initialize MyCobot self.mc = MyCobot(PI_PORT, PI_BAUD) GPIO.setmode(GPIO.BCM) - # GPIO.setup(20, GPIO.OUT) + GPIO.setup(20, GPIO.OUT) GPIO.setup(21, GPIO.OUT) # set cache of real coord self.cache_x = self.cache_y = 0 @@ -74,10 +74,10 @@ class Detect_marker(): # 控制吸泵 def pub_pump(self, flag): if flag: - # GPIO.output(20, 0) + GPIO.output(20, 0) GPIO.output(21, 0) else: - # GPIO.output(20, 1) + GPIO.output(20, 1) GPIO.output(21, 1) # Grasping motion diff --git a/mycobot_ai/aikit_280_pi/scripts/aikit_img.py b/mycobot_ai/aikit_280_pi/scripts/aikit_img.py index 275d10e..16ff5ef 100644 --- a/mycobot_ai/aikit_280_pi/scripts/aikit_img.py +++ b/mycobot_ai/aikit_280_pi/scripts/aikit_img.py @@ -121,23 +121,23 @@ class Object_detect(Movement): # pump_control pi def gpio_status(self, flag): if flag: - # self.GPIO.output(20, 0) + self.GPIO.output(20, 0) self.GPIO.output(21, 0) else: - # self.GPIO.output(20, 1) + self.GPIO.output(20, 1) self.GPIO.output(21, 1) # 开启吸泵 m5 def pump_on(self): # 让2号位工作 - # self.mc.set_basic_output(2, 0) + self.mc.set_basic_output(2, 0) # 让5号位工作 self.mc.set_basic_output(5, 0) # 停止吸泵 m5 def pump_off(self): # 让2号位停止工作 - # self.mc.set_basic_output(2, 1) + self.mc.set_basic_output(2, 1) # 让5号位停止工作 self.mc.set_basic_output(5, 1) diff --git a/mycobot_ai/aikit_280_pi/scripts/aikit_shape.py b/mycobot_ai/aikit_280_pi/scripts/aikit_shape.py index 7eadefe..cfdf0f3 100644 --- a/mycobot_ai/aikit_280_pi/scripts/aikit_shape.py +++ b/mycobot_ai/aikit_280_pi/scripts/aikit_shape.py @@ -97,23 +97,23 @@ class Object_detect(): # pump_control pi def gpio_status(self, flag): if flag: - # self.GPIO.output(20, 0) + self.GPIO.output(20, 0) self.GPIO.output(21, 0) else: - # self.GPIO.output(20, 1) + self.GPIO.output(20, 1) self.GPIO.output(21, 1) # 开启吸泵 m5 def pump_on(self): # 让2号位工作 - # self.mc.set_basic_output(2, 0) + self.mc.set_basic_output(2, 0) # 让5号位工作 self.mc.set_basic_output(5, 0) # 停止吸泵 m5 def pump_off(self): # 让2号位停止工作 - # self.mc.set_basic_output(2, 1) + self.mc.set_basic_output(2, 1) # 让5号位停止工作 self.mc.set_basic_output(5, 1)