From cca183391e32bec9fd2c53fae8cd8dc6361d39d9 2022-03-24 15:31:32 From: Edson Date: 2022-03-24 15:31:32 Subject: [PATCH] Update models.py Pedestal (reset_device) --- diff --git a/volumes/sirm/apps/pedestal/models.py b/volumes/sirm/apps/pedestal/models.py index de0cba6..c8e65ba 100644 --- a/volumes/sirm/apps/pedestal/models.py +++ b/volumes/sirm/apps/pedestal/models.py @@ -122,23 +122,33 @@ class PedestalConfiguration(Configuration): self.device.save() return True - def reset_device(self): + def reset_device(self, axi, angle): try: url = self.device.url() + "position?params=" - payload_el = {'axis': 'elevation', 'position': 0} + payload_el = {'axis': 'elevation'} + payload_az = {'axis': 'azimuth'} + + if axi == 'elevation': + payload_az['position'] = angle + payload_el['position'] = 0 + elif axi == 'azimuth': + payload_el['position'] = angle + payload_az['position'] = 0 + else: + payload_el['position'] = 0 + payload_az['position'] = 0 + json_data_el = json.dumps(payload_el) + json_data_az = json.dumps(payload_az) + base64_table_el = base64.standard_b64encode(json_data_el.encode('ascii')) + base64_table_az = base64.standard_b64encode(json_data_az.encode('ascii')) r = requests.get(url + base64_table_el.decode('ascii')) - - payload_az = {'axis': 'azimuth', 'position': 0} - 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')) - + if r: self.device.status = 3 self.device.save() @@ -192,7 +202,6 @@ class PedestalConfiguration(Configuration): 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 = [] @@ -214,6 +223,7 @@ class PedestalConfiguration(Configuration): 'top': self.max_value, 'table': coded_table_ascii } + self.reset_device(axis[0], list_of_floats[0]) time.sleep(15) json_data = json.dumps(payload)