diff --git a/volumes/sirm/apps/pedestal/models.py b/volumes/sirm/apps/pedestal/models.py index ec46104..de0cba6 100644 --- a/volumes/sirm/apps/pedestal/models.py +++ b/volumes/sirm/apps/pedestal/models.py @@ -80,8 +80,8 @@ class PedestalConfiguration(Configuration): return u'Speed: {}º/s {}'.format(self.speed, self.axis.upper()) if self.mode=='table': axis = [x.strip().upper() for x in self.axis.split(',')] - speeds = [int(x.strip()) for x in self.speed.split(',')] - table = [int(x.strip()) for x in self.angle.split(',')] + speeds = [float(x.strip()) for x in self.speed.split(',')] + table = [float(x.strip()) for x in self.angle.split(',')] return u'Table: Axis {}, Speed {}º/s, Steps {}'.format(axis, speeds, table) @property @@ -125,17 +125,17 @@ class PedestalConfiguration(Configuration): def reset_device(self): try: - url = self.device.url() + "aspeed?params=" + url = self.device.url() + "position?params=" payload_el = {'axis': 'elevation', 'position': 0} - json_data_el = json.dumps(payload) - base64_table_el = base64.standard_b64encode(json_data.encode('ascii')) + json_data_el = json.dumps(payload_el) + base64_table_el = base64.standard_b64encode(json_data_el.encode('ascii')) r = requests.get(url + base64_table_el.decode('ascii')) payload_az = {'axis': 'azimuth', 'position': 0} - json_data_az = json.dumps(payload) - base64_table_az = base64.standard_b64encode(json_data.encode('ascii')) + json_data_az = json.dumps(payload_az) + base64_table_az = base64.standard_b64encode(json_data_az.encode('ascii')) r = requests.get(url + base64_table_az.decode('ascii')) @@ -179,8 +179,6 @@ class PedestalConfiguration(Configuration): def start_device(self): - self.reset_device() - AX = {'az':'azimuth', 'el':'elevation'} axis = [AX[x.lower().strip()] for x in self.axis.split(',')] if len(axis)==1: @@ -188,12 +186,13 @@ class PedestalConfiguration(Configuration): try: if self.mode == 'position': - url = self.device.url() + "aspeed?params=" + url = self.device.url() + "position?params=" payload = {'axis': axis, 'position': float(self.angle)} elif self.mode == 'speed': - url = self.device.url() + "aspeed?params=" + url = self.device.url() + "speed?params=" payload = {'axis': axis, 'speed': float(self.speed)} elif self.mode == 'table': + self.reset_device() url = self.device.url() + "combinedtable?params=" list_of_floats = [float(x.strip()) for x in self.angle.split(",")] byte_table = [] @@ -211,10 +210,11 @@ class PedestalConfiguration(Configuration): 'arraylength': len(speed), 'axis': axis, 'speed': speed, - 'table': coded_table_ascii, + 'bottom': self.min_value, 'top': self.max_value, - 'bottom': self.min_value + 'table': coded_table_ascii } + time.sleep(15) json_data = json.dumps(payload) print(json_data)