radarsys_met Commit - r398:e746ceb18854

Update models.py (generator, pedestal, usrp tx, ursp rx, experiments

eynilupu -

r398:e746ceb18854

parent child

Context file:

r398:e746ceb18854

volumes/sirm/apps/generator/models.py +1 -5

                  def status_device(self):
                      try:
-                         #self.device.status = 0
-                         #payload = self.request('status')
                          payload = requests.get(self.device.url())
                          if payload:
                  def stop_device(self):
                      try:
-                         self.selector = 0
-                         self.save()
-                         payload = {"enable": self.selector}
+                         payload = {"enable": 0}
                          json_trmode_selector = json.dumps(payload)
                          base64_trmode_selector = base64.standard_b64encode(json_trmode_selector.encode('ascii'))

volumes/sirm/apps/main/models.py +6 -9

                      try:
                          proc_url = 'http://'+os.environ['PROC_SITE']+'/start'
-                         data['pedestal'] = self.pedestal.jsonify()
-                         data['usrp_rx'] = self.reception_rx.jsonify()
-                         data['usrp_tx'] = self.transmission_tx.jsonify()
-                         r = requests.post(proc_url, json=data)
-                         self.reception_rx.start_device()
-                         self.pedestal.start_device()
+                         data['usrp_rx'] = self.reception_rx.start_device()
+                         data['pedestal'] = self.pedestal.start_device()
                          self.generator_start()
-                         self.transmission_tx.start_device()
+                         data['usrp_tx'] = self.transmission_tx.start_device()
+                         requests.post(proc_url, json=data)
                      except:
                          return 0
                      try:
                          proc_url = 'http://'+os.environ['PROC_SITE']+'/stop'
-                         r = requests.get(proc_url)
+                         requests.get(proc_url)
                          self.reception_rx.stop_device()
                          self.pedestal.stop_device()
                          self.generator.stop_device()
                          self.transmission_tx.stop_device()
                      except:
                          return 0
-                     return 1
+                     return 2
                  def get_status(self):

volumes/sirm/apps/pedestal/models.py +11 -3

                      try:
                          command = self.device.url() + "stop"
                          r = requests.get(command)
+                         if self.mode == 'table':
+                             AX = {'az':'azimuth', 'el':'elevation'}
+                             axis = [AX[x.lower().strip()] for x in self.axis.split(',')]
+                             list_of_floats = [float(x.strip()) for x in self.angle.split(",")]
+                             self.reset_device(axis[0], list_of_floats[0])
                          if r:
                              self.device.status = 4
                              self.device.save()
                                  '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)
                          print(json_data)
                          url += base64_table.decode('ascii')
                          print(url)
                          r = requests.get(url)
+                         if self.mode == 'table':
+                             payload['table'] = list_of_floats
                          if r:
                              self.device.status = 3
                          self.device.save()
                          return False
-                     return True
+                     return payload
                  def get_absolute_url_import(self):
                      return reverse('url_import_pedestal_conf', args=[str(self.id)])

volumes/sirm/apps/usrp_rx/models.py +2 -5

                          self.device.save()
                          return False
-                     return True
+                     return payload
                  def get_absolute_url_import(self):
-                     return reverse('url_import_usrp_rx_conf', args=[str(self.id)])
+                     return reverse('url_import_usrp_rx_conf', args=[str(self.id)])
  No newline at end of file

volumes/sirm/apps/usrp_tx/models.py +1 -1

                          self.device.save()
                          return False
-                     return True
+                     return payload
                  def get_absolute_url_import(self):
                      return reverse('url_import_usrp_tx_conf', args=[str(self.id)])
  No newline at end of file

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages