Skip to content

Commit

Permalink
move back new methods to URRobot class
Browse files Browse the repository at this point in the history
  • Loading branch information
oroulet committed Mar 18, 2013
1 parent f36f904 commit e9b8f0c
Showing 1 changed file with 15 additions and 9 deletions.
24 changes: 15 additions & 9 deletions urx/urx.py
Expand Up @@ -378,6 +378,18 @@ def cleanup(self):
if self.rtmon:
self.rtmon.stop()

def set_freedrive(self, val):
if val:
self.sendProgram("set robotmode freedrive")
else:
self.sendProgram("set robotmode run")

def set_simulation(self, val):
if val:
self.sendProgram("set sim")
else:
self.sendProgram("set real")



class Robot(object):
Expand Down Expand Up @@ -516,17 +528,11 @@ def get_analog_in(self, nb):
return self.robot.getAnalogInput(nb)

def set_freedrive(self, val):
if val:
self.robot.sendProgram("set robotmode freedrive")
else:
self.robot.sendProgram("set robotmode run")
self.robot.set_freedrive(val)

def set_simulation(self, val):
if val:
self.robot.sendProgram("set sim")
else:
self.robot.sendProgram("set real")

self.robot.set_simulation(val)

def movej(self, joints, acc=0.1, vel=0.05, wait=True, relative=False):
"""
wrapper around the movej command in URRobot
Expand Down

0 comments on commit e9b8f0c

Please sign in to comment.