radarsys Commit - r326:f70d4e6cdcb2 · Jicamarca Repository

Add support to read abs module status

Juan C. Espinoza -

r326:f70d4e6cdcb2

parent child

Context file:

r326:f70d4e6cdcb2

Collapse all files

apps/abs/models.py +18 -15

              from django.db import models
-             from apps.main.models import Configuration
+             from apps.main.models import Configuration, User
              from django.core.urlresolvers import reverse
-             # Create your models here.
              from celery.execute import send_task
              from datetime import datetime
              import ast
              import struct
              import os, sys, time
-             import multiprocessing
              antenna_default = json.dumps({
                                  "antenna_up": [[0.0,0.0,0.0,0.0,0.5,0.5,0.5,0.5],
                                                  [0.0,0.0,0.0,0.0,0.5,0.5,0.5,0.5],
              class ABSConfiguration(Configuration):
                  active_beam     = models.PositiveSmallIntegerField(verbose_name='Active Beam', default=0)
-                 module_status   = models.CharField(verbose_name='Module Status', max_length=10000, default=json.dumps(status_default))
+                 module_status   = models.CharField(verbose_name='Module Status', max_length=10000, default=status_default)
                  operation_mode  = models.PositiveSmallIntegerField(verbose_name='Operation Mode', choices=OPERATION_MODES, default = 0)
                  operation_value = models.FloatField(verbose_name='Periodic (seconds)', default="10", null=True, blank=True)
                  module_messages = models.CharField(verbose_name='Modules Messages', max_length=10000, default=json.dumps(default_messages))
                      self.device.status = 3
                      self.module_status = ''.join(status)
                      self.save()
+                     for u in User.objects.all():
+                         u.profile.abs_active = self
+                         u.save()
                      return True
                      # Create the datagram socket
                      sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
                      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)
+                     sock.sendto(message, multicast_group)
                      print('Sending ' + message)
                      return sock
                          try:
                              address = None
                              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'
+                             x = int(address[0][10:])-1
+                             if data[0] == '1':
+                                 remote = fromChar2Binary(data[1])
+                                 local = ABSBeam.objects.get(pk=self.active_beam).module_6bits(x)
+                                 if local == remote:
+                                     status[x] = '3'
+                                     print('Module: {} connected...igual'.format(address))
+                                 else:
+                                     status[x] = '2'
+                                     print('Module: {} connected...diferente'.format(address))
+                             elif data[0] == '0':
+                                 status[x] = '1'
                              n += 1
-                             print('Module: {} connected'.format(address))
                          except:
                              print('Module: {} error'.format(address))
                              pass

apps/abs/templates/abs_conf.html +8 -14

                .legend td {
                  padding: 2px;
                  text-align: center;
+                 font-weight: bold;
                }
              </style>
                    {% if beam.id == active_beam %}
                    <table class="legend">
                      <tr>
-                       <th colspan="2">Legend</th>
+                       <th>Legend</th>
                      </tr>
                      <tr>
-                       <td class="text-danger">
-                         <i>RED</i>
-                       </td>
-                       <td>Disconnected</td>
+                       <td class="text-warning">Connected</td>
                      </tr>
                      <tr>
-                       <td class="text-warning">
-                         <i>ORANGE</i>
-                       </td>
-                       <td>Connected</td>
+                       <td class="text-success">Running</td>
                      </tr>
                      <tr>
-                       <td class="text-success">
-                         <i>GREEN</i>
-                       </td>
-                       <td>Running
-                       </td>
+                       <td class="text-info">Mismath</td>
+                     </tr>
+                     <tr>
+                       <td class="text-danger">Disconnected</td>
                      </tr>
                    </table>
                    {% else %}

apps/abs/views.py +19 -1

              from django.http import HttpResponse
              from django.core.urlresolvers import reverse
              from django.views.decorators.csrf import csrf_exempt
+             from django.utils.safestring import mark_safe
              from datetime import datetime
              from time import sleep
                      if status == '3':    #Running background-color: #00cc00;
                          all_status['{}'.format(i+1)] = 2
                          color_status['{}'.format(i+1)] = 'class=text-success'#'bgcolor=#00cc00'
+                     elif status == '2':
+                         all_status['{}'.format(i+1)] = 1
+                         color_status['{}'.format(i+1)] = 'class=text-info'
                      elif status == '1':  #Connected background-color: #ee902c;
                          all_status['{}'.format(i+1)] = 1
                          color_status['{}'.format(i+1)] = 'class=text-warning'#'bgcolor=#ee902c'
              def send_beam(request, id_conf, id_beam):
                  conf = get_object_or_404(ABSConfiguration, pk=id_conf)
+                 abs = request.user.profile.abs_active
+                 if abs<>conf:
+                     url = '#' if abs is None else abs.get_absolute_url()
+                     label = 'None' if abs is None else abs.label
+                     messages.warning(
+                         request,
+                         mark_safe('The current configuration has not been written in the modules, the active configuration is <a href="{}">{}</a>'.format(
+                             url,
+                             label
+                             ))
+                         )
+                     return redirect(conf.get_absolute_url())
                  beam = get_object_or_404(ABSBeam, pk=id_beam)
-                 beams_list    = ABSBeam.objects.filter(abs_conf=conf)
+                 beams_list = ABSBeam.objects.filter(abs_conf=conf)
                  conf.active_beam = id_beam
                  i = 0

apps/main/fixtures/main_initial_data.json +8 0

                      },
                      "model": "auth.user",
                      "pk": 1
+                 },
+                 {
+                     "fields": {
+                         "user": 1,
+                         "theme": "spacelab"
+                     },
+                     "model": "main.profile",
+                     "pk": 1
                  }
              ]
  No newline at end of file

apps/main/models.py +3 -1

              class Profile(models.Model):
                  user = models.OneToOneField(User, on_delete=models.CASCADE)
-                 theme = models.CharField(max_length=30, default='yeti')
+                 theme = models.CharField(max_length=30, default='spacelab')
+                 abs_active = models.ForeignKey('Configuration', null=True, blank=True, verbose_name='Current ABS')
              @receiver(post_save, sender=User)
              def create_user_profile(sender, instance, created, **kwargs):

apps/main/views.py +15 0

                  return redirect(conf.get_absolute_url())
+             @login_required
              def dev_conf_status(request, id_conf):
                  conf = get_object_or_404(Configuration, pk=id_conf)
+                 if conf.device.device_type.name == 'abs':
+                     abs = request.user.profile.abs_active
+                     if abs<>conf:
+                         url = '#' if abs is None else abs.get_absolute_url()
+                         label = 'None' if abs is None else abs.label
+                         messages.warning(
+                             request,
+                             mark_safe('The current configuration has not been written in the modules, the active configuration is <a href="{}">{}</a>'.format(
+                                 url,
+                                 label
+                                 ))
+                             )
+                         return redirect(conf.get_absolute_url())
                  if conf.status_device():
                      messages.success(request, conf.message)
                  else:

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