renamed cleanup to close, this is more common

This commit is contained in:
Olivier R-D
2015-04-10 12:39:19 +02:00
parent 747f07287d
commit 92a7c1812e
11 changed files with 25 additions and 62 deletions

View File

@ -114,7 +114,7 @@ class Service(object):
time.sleep(0.12)#URX secondday port accepts command at 10Hz, no need to go faster
def cleanup(self):
def close(self):
if self.joystick:
self.joystick.quit()
@ -135,5 +135,5 @@ if __name__ == "__main__":
try:
service.loop()
finally:
robot.cleanup()
service.cleanup()
robot.close()
service.close()

View File

@ -33,5 +33,5 @@ if __name__ == "__main__":
finally:
rob.cleanup()
rob.close()

View File

@ -23,5 +23,5 @@ if __name__ == "__main__":
rob.translate_tool((0, 0, -l), acc=a, vel=v)
rob.translate_tool((0, 0, l), acc=a, vel=v)
finally:
rob.cleanup()
rob.close()

View File

@ -87,7 +87,7 @@ if __name__ == '__main__':
try:
service.loop()
finally:
robot.cleanup()
robot.close()
spnav.spnav_close()

View File

@ -23,7 +23,7 @@ if __name__ == "__main__":
else:
do_wait = True
rob = urx.Robot("192.168.1.6", logLevel=logging.INFO)
rob = urx.Robot("192.168.1.6")
rob.set_tcp((0, 0, 0, 0, 0, 0))
rob.set_payload(0.5, (0, 0, 0))
try:
@ -99,5 +99,5 @@ if __name__ == "__main__":
finally:
rob.cleanup()
rob.close()

View File

@ -36,5 +36,5 @@ if __name__ == "__main__":
rob.movep(pose, acc=a, vel=v, radius=0, wait=True)
finally:
rob.cleanup()
rob.close()