diff --git a/script/local.py b/script/local.py index 90129bd..46b80e4 100644 --- a/script/local.py +++ b/script/local.py @@ -12,24 +12,25 @@ class RobotTCP(TcpDevice): TcpDevice.__init__(self, name, server) self.timeout = timeout self.retries = retries + self.header = None + self.trailer = "\n" def execute(self, system, command, *argv): - #print "Done" + cmd = self.header if (self.header != None) else self.header cmd = str(system) + "," + str(command) for arg in argv: cmd = cmd + "," + str(arg) - cmd = cmd + "\n" + if (self.trailer != None): cmd = cmd + self.trailer ret = "" try: - ret = self.sendReceive(cmd, None, "\n" , 0, self.timeout, self.retries).strip() + ret = self.sendReceive(cmd, None, self.trailer , 0, self.timeout, self.retries).strip() finally: self.getLogger().info(cmd + " ret = " + str(ret)) return ret - def mount(self, puck, sample): return self.execute('1', '1', puck, sample) -#add_device(RobotTCP("robot_tcp", "127.0.0.1:3333"), force = True) + add_device(RobotTCP("robot_tcp", "129.129.126.100:1000"), force = True)