@@ -226,37 +226,31 class CGSConfiguration(Configuration): | |||||
226 | port=self.device.port_address |
|
226 | port=self.device.port_address | |
227 |
|
227 | |||
228 | #---Frequencies from form |
|
228 | #---Frequencies from form | |
229 | f0 = self.freq0 |
|
229 | frequencies = self.parms_to_dict() | |
230 | f1 = self.freq1 |
|
230 | post_data = {} | |
231 | f2 = self.freq2 |
|
231 | for data in frequencies: | |
232 | f3 = self.freq3 |
|
232 | if data in ['freq0','freq1','freq2','freq3']: | |
233 | post_data = {"f0":f0, "f1":f1, "f2":f2, "f3":f3} |
|
233 | post_data[data] = frequencies[data] | |
234 | route = "http://" + str(ip) + ":" + str(port) + "/frequencies/" |
|
234 | ||
|
235 | route = "http://" + str(ip) + ":" + str(port) + "/write/" | |||
235 |
|
236 | |||
236 | try: |
|
237 | try: | |
237 | r = requests.post(route, post_data, timeout=0.7) |
|
238 | r = requests.post(route, post_data, timeout=0.7) | |
238 | except: |
|
239 | except: | |
239 | self.message = "Could not write CGS parameters" |
|
240 | self.message = "Could not write CGS parameters" | |
|
241 | self.device.status = 0 | |||
|
242 | self.device.save() | |||
240 | return False |
|
243 | return False | |
241 |
|
244 | |||
242 | text = r.text |
|
245 | response = r.json() | |
243 | text = text.split(',') |
|
246 | self.message = response['message'] | |
244 |
|
247 | self.device.status = response['status'] | ||
245 | if len(text)>1: |
|
248 | self.device.save() | |
246 | title = text[0] |
|
|||
247 | status = text[1] |
|
|||
248 | if title == "okay": |
|
|||
249 | self.message = status |
|
|||
250 | self.device.status = 3 |
|
|||
251 | self.device.save() |
|
|||
252 | return True |
|
|||
253 | else: |
|
|||
254 | self.message = title + ", " + status |
|
|||
255 | self.device.status = 1 |
|
|||
256 | self.device.save() |
|
|||
257 | return False |
|
|||
258 |
|
249 | |||
259 | return False |
|
250 | if self.device.status==1: | |
|
251 | return False | |||
|
252 | ||||
|
253 | return True | |||
260 |
|
254 | |||
261 |
|
255 | |||
262 | class Meta: |
|
256 | class Meta: |
General Comments 0
You need to be logged in to leave comments.
Login now