kenaug74/mycobot_ros
1
0
Fork 0
mirror of https://github.com/elephantrobotics/mycobot_ros.git synced 2026-07-14 09:00:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update mecharm_270 M5 point

Browse source
This commit is contained in:
weijian 2022-12-07 11:10:08 +08:00
parent c682b6a942
commit d4b80b82fc
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mycobot_ai/ai_mecharm_270/scripts/combine_detect_obj_color.py
View file

@ -50,13 +50,11 @@ class Object_detect(Movement):
self.robot_raspi = os.popen("ls /dev/ttyAMA*").readline()[:-1] self.robot_raspi = os.popen("ls /dev/ttyAMA*").readline()[:-1]
self.robot_jes = os.popen("ls /dev/ttyTHS1").readline()[:-1] self.robot_jes = os.popen("ls /dev/ttyTHS1").readline()[:-1]
self.raspi = False self.raspi = False
if "dev" in self.robot_m5: if "dev" in self.robot_m5 or "dev" in self.robot_wio:
self.Pin = [2, 5] self.Pin = [2, 5]
# self.Pin = [5] # self.Pin = [5]
elif "dev" in self.robot_wio: elif "dev" in self.robot_wio:
# self.Pin = [20, 21] self.Pin = [20, 21]
self.Pin = [2, 5]
# self.Pin = [5]
for i in self.move_coords: for i in self.move_coords:
i[2] -= 20 i[2] -= 20
elif "dev" in self.robot_raspi or "dev" in self.robot_jes: elif "dev" in self.robot_raspi or "dev" in self.robot_jes:

5
mycobot_ai/ai_mecharm_270/scripts/combine_detect_obj_img_folder_opt.py
View file

@ -56,11 +56,10 @@ class Object_detect(Movement):
self.robot_wio = os.popen("ls /dev/ttyACM*").readline()[:-1] self.robot_wio = os.popen("ls /dev/ttyACM*").readline()[:-1]
self.robot_raspi = os.popen("ls /dev/ttyAMA*").readline()[:-1] self.robot_raspi = os.popen("ls /dev/ttyAMA*").readline()[:-1]
self.robot_jes = os.popen("ls /dev/ttyTHS1").readline()[:-1] self.robot_jes = os.popen("ls /dev/ttyTHS1").readline()[:-1]
if "dev" in self.robot_m5: if "dev" in self.robot_m5 or "dev" in self.robot_wio:
self.Pin = [2, 5] self.Pin = [2, 5]
elif "dev" in self.robot_wio: elif "dev" in self.robot_wio:
# self.Pin = [20, 21] self.Pin = [20, 21]
self.Pin = [2, 5]
for i in self.move_coords: for i in self.move_coords:
i[2] -= 20 i[2] -= 20
elif "dev" in self.robot_raspi or "dev" in self.robot_jes: elif "dev" in self.robot_raspi or "dev" in self.robot_jes: