##// END OF EJS Templates
Update models.py Pedestal (reset_device)
eynilupu -
r395:cca183391e32
parent child
Show More
@@ -122,23 +122,33 class PedestalConfiguration(Configuration):
122 self.device.save()
122 self.device.save()
123 return True
123 return True
124
124
125 def reset_device(self):
125 def reset_device(self, axi, angle):
126
126
127 try:
127 try:
128 url = self.device.url() + "position?params="
128 url = self.device.url() + "position?params="
129
129
130 payload_el = {'axis': 'elevation', 'position': 0}
130 payload_el = {'axis': 'elevation'}
131 payload_az = {'axis': 'azimuth'}
132
133 if axi == 'elevation':
134 payload_az['position'] = angle
135 payload_el['position'] = 0
136 elif axi == 'azimuth':
137 payload_el['position'] = angle
138 payload_az['position'] = 0
139 else:
140 payload_el['position'] = 0
141 payload_az['position'] = 0
142
131 json_data_el = json.dumps(payload_el)
143 json_data_el = json.dumps(payload_el)
144 json_data_az = json.dumps(payload_az)
145
132 base64_table_el = base64.standard_b64encode(json_data_el.encode('ascii'))
146 base64_table_el = base64.standard_b64encode(json_data_el.encode('ascii'))
147 base64_table_az = base64.standard_b64encode(json_data_az.encode('ascii'))
133
148
134 r = requests.get(url + base64_table_el.decode('ascii'))
149 r = requests.get(url + base64_table_el.decode('ascii'))
135
136 payload_az = {'axis': 'azimuth', 'position': 0}
137 json_data_az = json.dumps(payload_az)
138 base64_table_az = base64.standard_b64encode(json_data_az.encode('ascii'))
139
140 r = requests.get(url + base64_table_az.decode('ascii'))
150 r = requests.get(url + base64_table_az.decode('ascii'))
141
151
142 if r:
152 if r:
143 self.device.status = 3
153 self.device.status = 3
144 self.device.save()
154 self.device.save()
@@ -192,7 +202,6 class PedestalConfiguration(Configuration):
192 url = self.device.url() + "speed?params="
202 url = self.device.url() + "speed?params="
193 payload = {'axis': axis, 'speed': float(self.speed)}
203 payload = {'axis': axis, 'speed': float(self.speed)}
194 elif self.mode == 'table':
204 elif self.mode == 'table':
195 self.reset_device()
196 url = self.device.url() + "combinedtable?params="
205 url = self.device.url() + "combinedtable?params="
197 list_of_floats = [float(x.strip()) for x in self.angle.split(",")]
206 list_of_floats = [float(x.strip()) for x in self.angle.split(",")]
198 byte_table = []
207 byte_table = []
@@ -214,6 +223,7 class PedestalConfiguration(Configuration):
214 'top': self.max_value,
223 'top': self.max_value,
215 'table': coded_table_ascii
224 'table': coded_table_ascii
216 }
225 }
226 self.reset_device(axis[0], list_of_floats[0])
217 time.sleep(15)
227 time.sleep(15)
218
228
219 json_data = json.dumps(payload)
229 json_data = json.dumps(payload)
General Comments 0
You need to be logged in to leave comments. Login now