radarsys Commit - r317:3c0c2e8703c8 · Jicamarca Repository

Merge branch 'master' of http://jro-dev.igp.gob.pe/rhodecode/radarsys

Juan C. Espinoza -

r317:3c0c2e8703c8

parent child

Context file:

r317:3c0c2e8703c8

Collapse all files

apps/abs/models.py +24 -12

                          return False
                      #-------------Write each abs module-----------
                      if beams:
-                         message = 'SNDF{:02d}'.format(nbeams)
+                         block_id = 0
+                         message = 'SNDF{:03d}{:02d}{:02d}'.format(nbeams, nbeams, block_id)
                          for i, status in enumerate(self.module_status):
                              message += ''.join([fromBinary2Char(beam.module_6bits(i)) for beam in beams])
                          status = ['0'] * 64
                          sock = self.send_multicast(message)
-                         for i in range(64):
+                         for i in range(32):
                              try:
                                  data, address = sock.recvfrom(1024)
+                                 print address, data
                                  if data == '1':
                                      status[int(address[0][10:])-1] = '3'
                                  elif data == '0':
                                      status[int(address[0][10:])-1] = '1'
-                             except:
+                             except Exception as e:
+                                 print 'Error {}'.format(e)
                                  n += 1
                          sock.close()
                      else:
                      for i, status in  enumerate(self.module_status):
                          if status != '0':
                              num += 1
-                             print('status {}:{}'.format(i+1, status))
+                             #print('status {}:{}'.format(i+1, status))
                      return num
                  def send_multicast(self, message):
                      multicast_group = ('224.3.29.71', 10000)
                      # Create the datagram socket
                      sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-                     sock.settimeout(0.01)
+                     sock.settimeout(1)
+                     # sock.bind((local_ip, 10000))
                      local_ip = os.environ.get('LOCAL_IP', '127.0.0.1')
+                     local_ip = '192.168.1.128'
                      sock.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_IF, socket.inet_aton(local_ip))
                      sent = sock.sendto(message, multicast_group)
                      print('Sending ' + message)
                      n = 0
                      status = ['0'] * 64
-                     for i in range(64):
+                     for i in range(32):
+                         #if True:
                          try:
+                             address = None
                              data, address = sock.recvfrom(1024)
+                             print address, data
                              if data == '1':
                                  status[int(address[0][10:])-1] = '3'
                              elif data == '0':
                              n += 1
                              print('Module: {} connected'.format(address))
                          except:
+                             print('Module: {} error'.format(address))
                              pass
                      sock.close()
                      """
                      # Se manda a cero RC para poder realizar cambio de beam
-                     confs = Configuration.objects.filter(experiment = self.experiment).filter(type=0)
+                     if self.experiment is None:
+                         confs = []
+                     else:
+                         confs = Configuration.objects.filter(experiment = self.experiment).filter(type=0)
                      confdds  = ''
                      confjars = ''
                      confrc   = ''
                      #TO STOP DEVICES: DDS-JARS-RC
                      for i in range(0,len(confs)):
                          if i==0:
                                      confrc = conf
                                      confrc.stop_device()
                                      break
                      if beam_pos > 0:
                          beam_pos = beam_pos - 1
                      else:
                      status = ['0'] * 64
                      message = 'CHGB{}'.format(beam_pos)
                      sock = self.send_multicast(message)
-                     for i in range(64):
+                     for i in range(32):
                          try:
                              data, address = sock.recvfrom(1024)
                              print address, data
                                  status[int(address[0][10:])-1] = '3'
                              elif data == '0':
                                  status[int(address[0][10:])-1] = '1'
-                         except:
+                         except  Exception as e:
+                             print 'Error {}'.format(e)
                              pass
                      sock.close()
                      """
                      This function reads antenna pattern and choose 6bits (upbits-downbits) for one abs module
                      """
+                     module += 1
                      if module > 64:
                          beam_bits = ""
                          return beam_bits

apps/abs/urls.py +1 0

              urlpatterns = (
                  url(r'^(?P<id_conf>-?\d+)/$', views.abs_conf, name='url_abs_conf'),
                  url(r'^(?P<id_conf>-?\d+)/edit/$', views.abs_conf_edit, name='url_edit_abs_conf'),
+                 url(r'^alert/$', views.abs_conf_alert, name='url_alert_abs_conf'),
                  url(r'^(?P<id_conf>-?\d+)/import/$', views.import_file, name='url_import_abs_conf'),
                  #url(r'^(?P<id_conf>-?\d+)/status/', views.abs_conf, {'status_request':True},name='url_status_abs_conf'),
                  url(r'^(?P<id_conf>-?\d+)/change_beam/(?P<id_beam>-?\d+)/$', views.send_beam, name='url_send_beam'),

apps/abs/views.py +11 -2

              from django.conf import settings
              from django.http import HttpResponse
              from django.core.urlresolvers import reverse
+             from django.views.decorators.csrf import csrf_exempt
              from datetime import datetime
              from time import sleep
                  return render(request, 'abs_conf_edit.html', kwargs)
+             @csrf_exempt
+             def abs_conf_alert(request):
+                 if request.method == 'POST':
+                     print request.POST
+                     return HttpResponse(json.dumps({'result':1}), content_type='application/json')
+                 else:
+                     return redirect('index')
              def import_file(request, id_conf):
                  if request.method=='POST':
                      if beam:
                          try:
-                             beam.remove_beamfromlist()
                              beam.delete()
                              messages.success(request, 'Beam: "%s" has been deleted.'  % beam)
                          except:
                  fig.savefig(buf, format='png')
                  response = HttpResponse(buf.getvalue(), content_type='image/png')
                  return response
-  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